diff --git a/timer_act2/Includes/Driver_GPIO.c b/timer_act2/Includes/Driver_GPIO.c index ed3d348..27652df 100644 --- a/timer_act2/Includes/Driver_GPIO.c +++ b/timer_act2/Includes/Driver_GPIO.c @@ -43,18 +43,6 @@ void MyGPIO_Init(MyGPIO_Struct_TypeDef * GPIOStructPtr) { GPIOStructPtr->GPIO->CRL |= (GPIOStructPtr->GPIO_Conf << (GPIOStructPtr->GPIO_Pin * 4)); } } - - GPIOStructPtr->GPIO->CRL &= ~(0xF << (GPIOStructPtr->GPIO_Pin*4)); - - //on met la bonne conf - if (GPIOStructPtr->GPIO_Conf == In_PullUp) { - //on est en pull up -> on met à 1 par défaut - GPIOStructPtr->GPIO->CRL |= (In_PullDown << (GPIOStructPtr->GPIO_Pin*4)); - MyGPIO_Set(GPIOStructPtr->GPIO, GPIOStructPtr->GPIO_Pin); - } - else { - GPIOStructPtr->GPIO->CRL |= (GPIOStructPtr->GPIO_Conf << (GPIOStructPtr->GPIO_Pin * 4)); - } } diff --git a/timer_act2/Includes/Driver_TIMER.c b/timer_act2/Includes/Driver_TIMER.c index 1d590b0..defb02c 100644 --- a/timer_act2/Includes/Driver_TIMER.c +++ b/timer_act2/Includes/Driver_TIMER.c @@ -105,19 +105,19 @@ void MyTimer_PWM(TIM_TypeDef * Timer, char Channel) { case 2 : Timer->CCMR1 &= ~TIM_CCMR1_OC2M_0; Timer->CCMR1 |= TIM_CCMR1_OC2M_1| TIM_CCMR1_OC2M_2; - Timer->CCMR1 |= TIM_CCMR1_OC1PE ; + Timer->CCMR1 |= TIM_CCMR1_OC2PE ; Timer->CCER |= TIM_CCER_CC2E; break ; case 3 : Timer->CCMR2 &= ~TIM_CCMR2_OC3M_0; Timer->CCMR2 |= TIM_CCMR2_OC3M_1| TIM_CCMR2_OC3M_2; - Timer->CCMR2 |= TIM_CCMR1_OC1PE ; + Timer->CCMR2 |= TIM_CCMR2_OC3PE ; Timer->CCER |= TIM_CCER_CC3E; break ; case 4 : Timer->CCMR2 &= ~TIM_CCMR2_OC4M_0; Timer->CCMR2 |= TIM_CCMR2_OC4M_1| TIM_CCMR2_OC4M_2; - Timer->CCMR2 |= TIM_CCMR1_OC1PE ; + Timer->CCMR2 |= TIM_CCMR2_OC4PE ; Timer->CCER |= TIM_CCER_CC4E; break ; } diff --git a/timer_act2/Listings/startup_stm32f10x_md.lst b/timer_act2/Listings/startup_stm32f10x_md.lst index a7f0aa1..e0cfc58 100644 --- a/timer_act2/Listings/startup_stm32f10x_md.lst +++ b/timer_act2/Listings/startup_stm32f10x_md.lst @@ -465,13 +465,13 @@ ARM Macro Assembler Page 8 00000000 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw ork --depend=.\objects\startup_stm32f10x_md.d -o.\objects\startup_stm32f10x_md. -o -I.\RTE\Device\STM32F103RB -I.\RTE\_Simulation -IC:\Users\chauz\AppData\Local -\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Ar -m\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --predefine="__EVAL SETA 1" --p -redefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 533" --predefi -ne="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --predefine="_RTE_ SETA 1" ---list=.\listings\startup_stm32f10x_md.lst RTE\Device\STM32F103RB\startup_stm32 -f10x_md.s +o -I.\RTE\Device\STM32F103RB -I.\RTE\_carteSTM -IC:\Users\chauz\AppData\Local\A +rm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\ +Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --predefine="__EVAL SETA 1" --pre +define="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 533" --predefine +="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --predefine="_RTE_ SETA 1" -- +list=.\listings\startup_stm32f10x_md.lst RTE\Device\STM32F103RB\startup_stm32f1 +0x_md.s diff --git a/timer_act2/Listings/timer_act2.map b/timer_act2/Listings/timer_act2.map index b0216e9..880a72e 100644 --- a/timer_act2/Listings/timer_act2.map +++ b/timer_act2/Listings/timer_act2.map @@ -10,6 +10,7 @@ Section Cross References principal.o(i.main) refers to driver_gpio.o(i.MyGPIO_Activate) for MyGPIO_Activate principal.o(i.main) refers to driver_timer.o(i.MyTimer_Base_Init) for MyTimer_Base_Init principal.o(i.main) refers to driver_gpio.o(i.MyGPIO_Init) for MyGPIO_Init + principal.o(i.main) refers to driver_gpio.o(i.MyGPIO_Set) for MyGPIO_Set principal.o(i.main) refers to driver_timer.o(i.MyTimer_PWM) for MyTimer_PWM principal.o(i.main) refers to driver_timer.o(i.MyTimer_PWM_set_cycle) for MyTimer_PWM_set_cycle principal.o(i.main) refers to principal.o(.data) for MonTimer @@ -150,23 +151,23 @@ Image Symbol Table i.Activate_TIM 0x0800025c Section 0 driver_timer.o(i.Activate_TIM) i.MyGPIO_Activate 0x08000284 Section 0 driver_gpio.o(i.MyGPIO_Activate) i.MyGPIO_Init 0x0800029c Section 0 driver_gpio.o(i.MyGPIO_Init) - i.MyGPIO_Set 0x08000388 Section 0 driver_gpio.o(i.MyGPIO_Set) - i.MyTimer_Base_Init 0x08000390 Section 0 driver_timer.o(i.MyTimer_Base_Init) - i.MyTimer_PWM 0x080003a4 Section 0 driver_timer.o(i.MyTimer_PWM) - i.MyTimer_PWM_set_cycle 0x08000464 Section 0 driver_timer.o(i.MyTimer_PWM_set_cycle) - i.SetSysClock 0x080004e8 Section 0 system_stm32f10x.o(i.SetSysClock) - SetSysClock 0x080004e9 Thumb Code 8 system_stm32f10x.o(i.SetSysClock) - i.SetSysClockTo72 0x080004f0 Section 0 system_stm32f10x.o(i.SetSysClockTo72) - SetSysClockTo72 0x080004f1 Thumb Code 214 system_stm32f10x.o(i.SetSysClockTo72) - i.SystemInit 0x080005d0 Section 0 system_stm32f10x.o(i.SystemInit) - i.TIM1_TRG_COM_IRQHandler 0x08000630 Section 0 driver_timer.o(i.TIM1_TRG_COM_IRQHandler) - i.TIM2_IRQHandler 0x08000654 Section 0 driver_timer.o(i.TIM2_IRQHandler) - i.TIM3_IRQHandler 0x08000678 Section 0 driver_timer.o(i.TIM3_IRQHandler) - i.TIM4_IRQHandler 0x0800069c Section 0 driver_timer.o(i.TIM4_IRQHandler) - i.__scatterload_copy 0x080006c0 Section 14 handlers.o(i.__scatterload_copy) - i.__scatterload_null 0x080006ce Section 2 handlers.o(i.__scatterload_null) - i.__scatterload_zeroinit 0x080006d0 Section 14 handlers.o(i.__scatterload_zeroinit) - i.main 0x080006e0 Section 0 principal.o(i.main) + i.MyGPIO_Set 0x08000342 Section 0 driver_gpio.o(i.MyGPIO_Set) + i.MyTimer_Base_Init 0x0800034a Section 0 driver_timer.o(i.MyTimer_Base_Init) + i.MyTimer_PWM 0x0800035c Section 0 driver_timer.o(i.MyTimer_PWM) + i.MyTimer_PWM_set_cycle 0x0800041c Section 0 driver_timer.o(i.MyTimer_PWM_set_cycle) + i.SetSysClock 0x080004a0 Section 0 system_stm32f10x.o(i.SetSysClock) + SetSysClock 0x080004a1 Thumb Code 8 system_stm32f10x.o(i.SetSysClock) + i.SetSysClockTo72 0x080004a8 Section 0 system_stm32f10x.o(i.SetSysClockTo72) + SetSysClockTo72 0x080004a9 Thumb Code 214 system_stm32f10x.o(i.SetSysClockTo72) + i.SystemInit 0x08000588 Section 0 system_stm32f10x.o(i.SystemInit) + i.TIM1_TRG_COM_IRQHandler 0x080005e8 Section 0 driver_timer.o(i.TIM1_TRG_COM_IRQHandler) + i.TIM2_IRQHandler 0x0800060c Section 0 driver_timer.o(i.TIM2_IRQHandler) + i.TIM3_IRQHandler 0x08000630 Section 0 driver_timer.o(i.TIM3_IRQHandler) + i.TIM4_IRQHandler 0x08000654 Section 0 driver_timer.o(i.TIM4_IRQHandler) + i.__scatterload_copy 0x08000678 Section 14 handlers.o(i.__scatterload_copy) + i.__scatterload_null 0x08000686 Section 2 handlers.o(i.__scatterload_null) + i.__scatterload_zeroinit 0x08000688 Section 14 handlers.o(i.__scatterload_zeroinit) + i.main 0x08000698 Section 0 principal.o(i.main) .data 0x20000000 Section 24 principal.o(.data) .data 0x20000018 Section 16 driver_timer.o(.data) STACK 0x20000028 Section 1024 startup_stm32f10x_md.o(STACK) @@ -255,22 +256,22 @@ Image Symbol Table __scatterload_rt2 0x08000239 Thumb Code 0 init.o(.text) Activate_TIM 0x0800025d Thumb Code 36 driver_timer.o(i.Activate_TIM) MyGPIO_Activate 0x08000285 Thumb Code 18 driver_gpio.o(i.MyGPIO_Activate) - MyGPIO_Init 0x0800029d Thumb Code 236 driver_gpio.o(i.MyGPIO_Init) - MyGPIO_Set 0x08000389 Thumb Code 8 driver_gpio.o(i.MyGPIO_Set) - MyTimer_Base_Init 0x08000391 Thumb Code 18 driver_timer.o(i.MyTimer_Base_Init) - MyTimer_PWM 0x080003a5 Thumb Code 188 driver_timer.o(i.MyTimer_PWM) - MyTimer_PWM_set_cycle 0x08000465 Thumb Code 132 driver_timer.o(i.MyTimer_PWM_set_cycle) - SystemInit 0x080005d1 Thumb Code 78 system_stm32f10x.o(i.SystemInit) - TIM1_TRG_COM_IRQHandler 0x08000631 Thumb Code 28 driver_timer.o(i.TIM1_TRG_COM_IRQHandler) - TIM2_IRQHandler 0x08000655 Thumb Code 32 driver_timer.o(i.TIM2_IRQHandler) - TIM3_IRQHandler 0x08000679 Thumb Code 28 driver_timer.o(i.TIM3_IRQHandler) - TIM4_IRQHandler 0x0800069d Thumb Code 28 driver_timer.o(i.TIM4_IRQHandler) - __scatterload_copy 0x080006c1 Thumb Code 14 handlers.o(i.__scatterload_copy) - __scatterload_null 0x080006cf Thumb Code 2 handlers.o(i.__scatterload_null) - __scatterload_zeroinit 0x080006d1 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) - main 0x080006e1 Thumb Code 98 principal.o(i.main) - Region$$Table$$Base 0x08000754 Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x08000774 Number 0 anon$$obj.o(Region$$Table) + MyGPIO_Init 0x0800029d Thumb Code 166 driver_gpio.o(i.MyGPIO_Init) + MyGPIO_Set 0x08000343 Thumb Code 8 driver_gpio.o(i.MyGPIO_Set) + MyTimer_Base_Init 0x0800034b Thumb Code 18 driver_timer.o(i.MyTimer_Base_Init) + MyTimer_PWM 0x0800035d Thumb Code 188 driver_timer.o(i.MyTimer_PWM) + MyTimer_PWM_set_cycle 0x0800041d Thumb Code 132 driver_timer.o(i.MyTimer_PWM_set_cycle) + SystemInit 0x08000589 Thumb Code 78 system_stm32f10x.o(i.SystemInit) + TIM1_TRG_COM_IRQHandler 0x080005e9 Thumb Code 28 driver_timer.o(i.TIM1_TRG_COM_IRQHandler) + TIM2_IRQHandler 0x0800060d Thumb Code 32 driver_timer.o(i.TIM2_IRQHandler) + TIM3_IRQHandler 0x08000631 Thumb Code 28 driver_timer.o(i.TIM3_IRQHandler) + TIM4_IRQHandler 0x08000655 Thumb Code 28 driver_timer.o(i.TIM4_IRQHandler) + __scatterload_copy 0x08000679 Thumb Code 14 handlers.o(i.__scatterload_copy) + __scatterload_null 0x08000687 Thumb Code 2 handlers.o(i.__scatterload_null) + __scatterload_zeroinit 0x08000689 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) + main 0x08000699 Thumb Code 124 principal.o(i.main) + Region$$Table$$Base 0x0800072c Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x0800074c Number 0 anon$$obj.o(Region$$Table) MonTimer 0x20000000 Data 8 principal.o(.data) greenLed 0x20000008 Data 8 principal.o(.data) sortiePWM 0x20000010 Data 8 principal.o(.data) @@ -288,9 +289,9 @@ Memory Map of the image Image Entry point : 0x08000105 - Load Region LR_1 (Base: 0x08000000, Size: 0x0000079c, Max: 0xffffffff, ABSOLUTE) + Load Region LR_1 (Base: 0x08000000, Size: 0x00000774, Max: 0xffffffff, ABSOLUTE) - Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000774, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x0000074c, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -315,36 +316,35 @@ Memory Map of the image 0x08000238 0x08000238 0x00000024 Code RO 299 .text mc_w.l(init.o) 0x0800025c 0x0800025c 0x00000028 Code RO 129 i.Activate_TIM driver_timer.o 0x08000284 0x08000284 0x00000018 Code RO 72 i.MyGPIO_Activate driver_gpio.o - 0x0800029c 0x0800029c 0x000000ec Code RO 73 i.MyGPIO_Init driver_gpio.o - 0x08000388 0x08000388 0x00000008 Code RO 76 i.MyGPIO_Set driver_gpio.o - 0x08000390 0x08000390 0x00000012 Code RO 131 i.MyTimer_Base_Init driver_timer.o - 0x080003a2 0x080003a2 0x00000002 PAD - 0x080003a4 0x080003a4 0x000000c0 Code RO 132 i.MyTimer_PWM driver_timer.o - 0x08000464 0x08000464 0x00000084 Code RO 133 i.MyTimer_PWM_set_cycle driver_timer.o - 0x080004e8 0x080004e8 0x00000008 Code RO 228 i.SetSysClock system_stm32f10x.o - 0x080004f0 0x080004f0 0x000000e0 Code RO 229 i.SetSysClockTo72 system_stm32f10x.o - 0x080005d0 0x080005d0 0x00000060 Code RO 231 i.SystemInit system_stm32f10x.o - 0x08000630 0x08000630 0x00000024 Code RO 134 i.TIM1_TRG_COM_IRQHandler driver_timer.o - 0x08000654 0x08000654 0x00000024 Code RO 135 i.TIM2_IRQHandler driver_timer.o - 0x08000678 0x08000678 0x00000024 Code RO 136 i.TIM3_IRQHandler driver_timer.o - 0x0800069c 0x0800069c 0x00000024 Code RO 137 i.TIM4_IRQHandler driver_timer.o - 0x080006c0 0x080006c0 0x0000000e Code RO 303 i.__scatterload_copy mc_w.l(handlers.o) - 0x080006ce 0x080006ce 0x00000002 Code RO 304 i.__scatterload_null mc_w.l(handlers.o) - 0x080006d0 0x080006d0 0x0000000e Code RO 305 i.__scatterload_zeroinit mc_w.l(handlers.o) - 0x080006de 0x080006de 0x00000002 PAD - 0x080006e0 0x080006e0 0x00000074 Code RO 5 i.main principal.o - 0x08000754 0x08000754 0x00000020 Data RO 301 Region$$Table anon$$obj.o + 0x0800029c 0x0800029c 0x000000a6 Code RO 73 i.MyGPIO_Init driver_gpio.o + 0x08000342 0x08000342 0x00000008 Code RO 76 i.MyGPIO_Set driver_gpio.o + 0x0800034a 0x0800034a 0x00000012 Code RO 131 i.MyTimer_Base_Init driver_timer.o + 0x0800035c 0x0800035c 0x000000c0 Code RO 132 i.MyTimer_PWM driver_timer.o + 0x0800041c 0x0800041c 0x00000084 Code RO 133 i.MyTimer_PWM_set_cycle driver_timer.o + 0x080004a0 0x080004a0 0x00000008 Code RO 228 i.SetSysClock system_stm32f10x.o + 0x080004a8 0x080004a8 0x000000e0 Code RO 229 i.SetSysClockTo72 system_stm32f10x.o + 0x08000588 0x08000588 0x00000060 Code RO 231 i.SystemInit system_stm32f10x.o + 0x080005e8 0x080005e8 0x00000024 Code RO 134 i.TIM1_TRG_COM_IRQHandler driver_timer.o + 0x0800060c 0x0800060c 0x00000024 Code RO 135 i.TIM2_IRQHandler driver_timer.o + 0x08000630 0x08000630 0x00000024 Code RO 136 i.TIM3_IRQHandler driver_timer.o + 0x08000654 0x08000654 0x00000024 Code RO 137 i.TIM4_IRQHandler driver_timer.o + 0x08000678 0x08000678 0x0000000e Code RO 303 i.__scatterload_copy mc_w.l(handlers.o) + 0x08000686 0x08000686 0x00000002 Code RO 304 i.__scatterload_null mc_w.l(handlers.o) + 0x08000688 0x08000688 0x0000000e Code RO 305 i.__scatterload_zeroinit mc_w.l(handlers.o) + 0x08000696 0x08000696 0x00000002 PAD + 0x08000698 0x08000698 0x00000094 Code RO 5 i.main principal.o + 0x0800072c 0x0800072c 0x00000020 Data RO 301 Region$$Table anon$$obj.o - Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000774, Size: 0x00000028, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x0800074c, Size: 0x00000028, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 0x08000774 0x00000018 Data RW 6 .data principal.o - 0x20000018 0x0800078c 0x00000010 Data RW 140 .data driver_timer.o + 0x20000000 0x0800074c 0x00000018 Data RW 6 .data principal.o + 0x20000018 0x08000764 0x00000010 Data RW 140 .data driver_timer.o - Execution Region ER_ZI (Exec base: 0x20000028, Load base: 0x0800079c, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_ZI (Exec base: 0x20000028, Load base: 0x08000774, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -358,16 +358,16 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name - 268 6 0 0 0 2517 driver_gpio.o + 198 6 0 0 0 2489 driver_gpio.o 526 36 0 16 0 5511 driver_timer.o - 116 18 0 24 0 208365 principal.o + 148 24 0 24 0 208381 principal.o 36 8 236 0 1024 840 startup_stm32f10x_md.o 328 28 0 0 0 2101 system_stm32f10x.o ---------------------------------------------------------------------- - 1276 96 268 40 1024 219334 Object Totals + 1236 102 268 40 1024 219322 Object Totals 0 0 32 0 0 0 (incl. Generated) - 2 0 0 0 0 0 (incl. Padding) + 0 0 0 0 0 0 (incl. Padding) ---------------------------------------------------------------------- @@ -411,15 +411,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 1640 112 268 40 1024 219154 Grand Totals - 1640 112 268 40 1024 219154 ELF Image Totals - 1640 112 268 40 0 0 ROM Totals + 1600 118 268 40 1024 219142 Grand Totals + 1600 118 268 40 1024 219142 ELF Image Totals + 1600 118 268 40 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 1908 ( 1.86kB) + Total RO Size (Code + RO Data) 1868 ( 1.82kB) Total RW Size (RW Data + ZI Data) 1064 ( 1.04kB) - Total ROM Size (Code + RO Data + RW Data) 1948 ( 1.90kB) + Total ROM Size (Code + RO Data + RW Data) 1908 ( 1.86kB) ============================================================================== diff --git a/timer_act2/Objects/driver_gpio.crf b/timer_act2/Objects/driver_gpio.crf index 46c48ce..ca286d9 100644 Binary files a/timer_act2/Objects/driver_gpio.crf and b/timer_act2/Objects/driver_gpio.crf differ diff --git a/timer_act2/Objects/driver_gpio.d b/timer_act2/Objects/driver_gpio.d index 8b1d315..6b958f3 100644 --- a/timer_act2/Objects/driver_gpio.d +++ b/timer_act2/Objects/driver_gpio.d @@ -1,7 +1,7 @@ .\objects\driver_gpio.o: Includes\Driver_GPIO.c .\objects\driver_gpio.o: Includes\Driver_GPIO.h .\objects\driver_gpio.o: C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\objects\driver_gpio.o: .\RTE\_Simulation\RTE_Components.h +.\objects\driver_gpio.o: .\RTE\_carteSTM\RTE_Components.h .\objects\driver_gpio.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h .\objects\driver_gpio.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h .\objects\driver_gpio.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h diff --git a/timer_act2/Objects/driver_gpio.o b/timer_act2/Objects/driver_gpio.o index 91a298a..3296406 100644 Binary files a/timer_act2/Objects/driver_gpio.o and b/timer_act2/Objects/driver_gpio.o differ diff --git a/timer_act2/Objects/driver_timer.crf b/timer_act2/Objects/driver_timer.crf index 2501a02..e2b0e9d 100644 Binary files a/timer_act2/Objects/driver_timer.crf and b/timer_act2/Objects/driver_timer.crf differ diff --git a/timer_act2/Objects/driver_timer.d b/timer_act2/Objects/driver_timer.d index a276289..d563af9 100644 --- a/timer_act2/Objects/driver_timer.d +++ b/timer_act2/Objects/driver_timer.d @@ -1,7 +1,7 @@ .\objects\driver_timer.o: Includes\Driver_TIMER.c .\objects\driver_timer.o: Includes\Driver_TIMER.h .\objects\driver_timer.o: C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\objects\driver_timer.o: .\RTE\_Simulation\RTE_Components.h +.\objects\driver_timer.o: .\RTE\_carteSTM\RTE_Components.h .\objects\driver_timer.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h .\objects\driver_timer.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h .\objects\driver_timer.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h diff --git a/timer_act2/Objects/driver_timer.o b/timer_act2/Objects/driver_timer.o index 34a5b69..b0d6abe 100644 Binary files a/timer_act2/Objects/driver_timer.o and b/timer_act2/Objects/driver_timer.o differ diff --git a/timer_act2/Objects/principal.crf b/timer_act2/Objects/principal.crf index 6ce9c42..3c11fc7 100644 Binary files a/timer_act2/Objects/principal.crf and b/timer_act2/Objects/principal.crf differ diff --git a/timer_act2/Objects/principal.d b/timer_act2/Objects/principal.d index a2555cf..002908d 100644 --- a/timer_act2/Objects/principal.d +++ b/timer_act2/Objects/principal.d @@ -1,6 +1,6 @@ .\objects\principal.o: Source\principal.c .\objects\principal.o: C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\objects\principal.o: .\RTE\_Simulation\RTE_Components.h +.\objects\principal.o: .\RTE\_carteSTM\RTE_Components.h .\objects\principal.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h .\objects\principal.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h .\objects\principal.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h diff --git a/timer_act2/Objects/principal.o b/timer_act2/Objects/principal.o index 196f943..3c312cf 100644 Binary files a/timer_act2/Objects/principal.o and b/timer_act2/Objects/principal.o differ diff --git a/timer_act2/Objects/startup_stm32f10x_md.o b/timer_act2/Objects/startup_stm32f10x_md.o index af001dc..85b7e0f 100644 Binary files a/timer_act2/Objects/startup_stm32f10x_md.o and b/timer_act2/Objects/startup_stm32f10x_md.o differ diff --git a/timer_act2/Objects/system_stm32f10x.crf b/timer_act2/Objects/system_stm32f10x.crf index b799b35..266d917 100644 Binary files a/timer_act2/Objects/system_stm32f10x.crf and b/timer_act2/Objects/system_stm32f10x.crf differ diff --git a/timer_act2/Objects/system_stm32f10x.d b/timer_act2/Objects/system_stm32f10x.d index 1ded146..8528c7f 100644 --- a/timer_act2/Objects/system_stm32f10x.d +++ b/timer_act2/Objects/system_stm32f10x.d @@ -1,6 +1,6 @@ .\objects\system_stm32f10x.o: RTE\Device\STM32F103RB\system_stm32f10x.c .\objects\system_stm32f10x.o: C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\objects\system_stm32f10x.o: .\RTE\_Simulation\RTE_Components.h +.\objects\system_stm32f10x.o: .\RTE\_carteSTM\RTE_Components.h .\objects\system_stm32f10x.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h .\objects\system_stm32f10x.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h .\objects\system_stm32f10x.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h diff --git a/timer_act2/Objects/system_stm32f10x.o b/timer_act2/Objects/system_stm32f10x.o index 9a6ba51..468444e 100644 Binary files a/timer_act2/Objects/system_stm32f10x.o and b/timer_act2/Objects/system_stm32f10x.o differ diff --git a/timer_act2/Objects/timer_act2.axf b/timer_act2/Objects/timer_act2.axf index 84fc523..0e26254 100644 Binary files a/timer_act2/Objects/timer_act2.axf and b/timer_act2/Objects/timer_act2.axf differ diff --git a/timer_act2/Objects/timer_act2.build_log.htm b/timer_act2/Objects/timer_act2.build_log.htm index 1dbdebf..406e9c0 100644 --- a/timer_act2/Objects/timer_act2.build_log.htm +++ b/timer_act2/Objects/timer_act2.build_log.htm @@ -17,7 +17,7 @@ Library Manager: ArmAr.exe V5.06 update 7 (build 960) Hex Converter: FromElf.exe V5.06 update 7 (build 960) CPU DLL: SARMCM3.DLL V5.33.0.0 Dialog DLL: DARMSTM.DLL V1.68.0.0 -Target DLL: UL2CM3.DLL V1.163.9.0 +Target DLL: STLink\ST-LINKIII-KEIL_SWO.dll V3.0.8.0 Dialog DLL: TARMSTM.DLL V1.66.0.0

Project:

@@ -26,14 +26,14 @@ Project File Date: 09/20/2021

Output:

*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin' -Rebuild target 'Simulation' +Rebuild target 'carteSTM' assembling startup_stm32f10x_md.s... +compiling system_stm32f10x.c... +compiling Driver_GPIO.c... compiling principal.c... compiling Driver_TIMER.c... -compiling Driver_GPIO.c... -compiling system_stm32f10x.c... linking... -Program Size: Code=1640 RO-data=268 RW-data=40 ZI-data=1024 +Program Size: Code=1600 RO-data=268 RW-data=40 ZI-data=1024 ".\Objects\timer_act2.axf" - 0 Error(s), 0 Warning(s).

Software Packages used:

@@ -52,7 +52,7 @@ Package Vendor: Keil

Collection of Component include folders:

.\RTE\Device\STM32F103RB - .\RTE\_Simulation + .\RTE\_carteSTM C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include @@ -65,7 +65,7 @@ Package Vendor: Keil Source file: Device\Source\system_stm32f10x.c Include file: RTE_Driver\Config\RTE_Device.h Source file: Device\Source\ARM\STM32F1xx_OPT.s -Build Time Elapsed: 00:00:01 +Build Time Elapsed: 00:00:00 diff --git a/timer_act2/Objects/timer_act2.htm b/timer_act2/Objects/timer_act2.htm index 32b6fab..9cd108f 100644 --- a/timer_act2/Objects/timer_act2.htm +++ b/timer_act2/Objects/timer_act2.htm @@ -3,7 +3,7 @@ Static Call Graph - [.\Objects\timer_act2.axf]

Static Call Graph for image .\Objects\timer_act2.axf

-

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Thu Sep 30 17:00:44 2021 +

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Mon Oct 04 17:14:18 2021

Maximum Stack Usage = 32 bytes + Unknown(Cycles, Untraceable Function Pointers)

Call chain for Maximum Stack Depth:

@@ -342,7 +342,7 @@ Global Symbols

[Called By] -

MyGPIO_Init (Thumb, 236 bytes, Stack size 4 bytes, driver_gpio.o(i.MyGPIO_Init)) +

MyGPIO_Init (Thumb, 166 bytes, Stack size 4 bytes, driver_gpio.o(i.MyGPIO_Init))

[Stack]


[Calls]