diff --git a/timer_act2/Includes/Driver_TIMER.c b/timer_act2/Includes/Driver_TIMER.c index 466e324..1d590b0 100644 --- a/timer_act2/Includes/Driver_TIMER.c +++ b/timer_act2/Includes/Driver_TIMER.c @@ -22,6 +22,10 @@ void Activate_TIM(int i) { } } + +////////////////////////////////////////////////////////// +//-----------------Partie interruptions-----------------// +////////////////////////////////////////////////////////// void MyTimer_Active_IT ( TIM_TypeDef * Timer , char Prio , void (* IT_function) (void)) { //active l'interruption sur timer et pointe vers la fonction IT_function avec la priorité prio @@ -78,6 +82,10 @@ void TIM4_IRQHandler(void) { (* IT_function_TIM4) (); } + +////////////////////////////////////////////////////////// +//----------------------Partie PWM----------------------// +////////////////////////////////////////////////////////// void MyTimer_PWM(TIM_TypeDef * Timer, char Channel) { if (Timer == TIM1) { TIM1 -> BDTR |= 1 << 15 ; @@ -85,40 +93,51 @@ void MyTimer_PWM(TIM_TypeDef * Timer, char Channel) { switch (Channel) { case 1 : - //7=0b111 et 6=0b110 - Timer -> CCMR1 &= ~(7 << 4) ; - //on rajoute un OU sur le OC1PE - Timer -> CCMR1 |= ~(6 << 4) | (1<<3); + //On choisit le mode 1 + //on écrit donc '110' dans le registre OC1M de TIM1_CCMR1 + Timer->CCMR1 &= ~TIM_CCMR1_OC1M_0; + Timer->CCMR1 |= TIM_CCMR1_OC1M_1| TIM_CCMR1_OC1M_2; + //On autorise le registre de preload correspondant en écrivant 1 dans OC1PE + Timer->CCMR1 |= TIM_CCMR1_OC1PE ; + //On autorise la sortie OCx en mettant à 1 le registre CCxE + Timer->CCER |= TIM_CCER_CC1E; break ; case 2 : - Timer -> CCMR1 &= ~(7 << 12) ; - Timer -> CCMR1 |= ~(6 << 12) | (1<<11); + Timer->CCMR1 &= ~TIM_CCMR1_OC2M_0; + Timer->CCMR1 |= TIM_CCMR1_OC2M_1| TIM_CCMR1_OC2M_2; + Timer->CCMR1 |= TIM_CCMR1_OC1PE ; + Timer->CCER |= TIM_CCER_CC2E; break ; case 3 : - Timer -> CCMR2 &= ~(7 << 4) ; - Timer -> CCMR2 |= ~(6 << 4) | (1<<3); + Timer->CCMR2 &= ~TIM_CCMR2_OC3M_0; + Timer->CCMR2 |= TIM_CCMR2_OC3M_1| TIM_CCMR2_OC3M_2; + Timer->CCMR2 |= TIM_CCMR1_OC1PE ; + Timer->CCER |= TIM_CCER_CC3E; break ; case 4 : - Timer -> CCMR2 &= ~(7 << 12) ; - Timer -> CCMR2 |= ~(6 << 12) | (1<<11); + Timer->CCMR2 &= ~TIM_CCMR2_OC4M_0; + Timer->CCMR2 |= TIM_CCMR2_OC4M_1| TIM_CCMR2_OC4M_2; + Timer->CCMR2 |= TIM_CCMR1_OC1PE ; + Timer->CCER |= TIM_CCER_CC4E; break ; } - Timer -> CR1 |= 1 << 7 ; + //on autorise le registre de auto-reload preload en écrivant 1 dans le registre ARPE de CR1 + Timer -> CR1 |= TIM_CR1_ARPE ; } -void MyTimer_PWM_set_cycle(TIM_TypeDef * Timer, float prop, char channel) { +void MyTimer_PWM_set_cycle(TIM_TypeDef * Timer, float rapport, char channel) { switch (channel) { case 1 : - Timer->CCR1 = (int) (Timer -> ARR * prop) ; + Timer->CCR1 = (int) (Timer -> ARR * rapport) ; break ; case 2 : - Timer->CCR2 = (int) (Timer -> ARR * prop) ; + Timer->CCR2 = (int) (Timer -> ARR * rapport) ; break ; case 3 : - Timer->CCR3 = (int) (Timer -> ARR * prop) ; + Timer->CCR3 = (int) (Timer -> ARR * rapport) ; break ; case 4 : - Timer->CCR4 = (int) (Timer -> ARR * prop) ; + Timer->CCR4 = (int) (Timer -> ARR * rapport) ; break ; } } diff --git a/timer_act2/Includes/Driver_TIMER.h b/timer_act2/Includes/Driver_TIMER.h index b2e69e8..ea039be 100644 --- a/timer_act2/Includes/Driver_TIMER.h +++ b/timer_act2/Includes/Driver_TIMER.h @@ -9,18 +9,56 @@ typedef struct { uint16_t PSC ; } MyTimer_Struct_TypeDef ; +/* +***************************************************************************************** +* @brief +* @param -> Paramètre sous forme d’une structure (son adresse) contenant les informations de base +* @Note -> Fonction à lancer systématiquement avant d’aller plus en détail dans les conf plus fines +*********************************************************************************************** +*/ void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer) ; + void Activate_TIM(int) ; + + +/* +************************************************************************************************** +* @brief +* @param : - TIM_TypeDef * Timer : Timer concerné + - char Prio : de 0 a 15 +* @Note : La fonction MyTimer_Base_Init doit avoir été lancée au préalable +************************************************************************************************** +*/ void MyTimer_Active_IT ( TIM_TypeDef * , char , void (*) (void)) ; + void TIM1_TRG_COM_IRQHandler(void) ; void TIM2_IRQHandler(void) ; void TIM3_IRQHandler(void) ; void TIM4_IRQHandler(void) ; + +/* +************************************************************************************************** +* @brief +* @param : - TIM_TypeDef * Timer : Timer concerné +* - char Channel : canal concerné, de 1 a 4 +* @Note : Active le channel spécifié sur le timer spécifié, la gestion de la configuration I/O n’est +* pas faite dans cette fonction ni le réglage de la période de la PWM (ARR, PSC) +************************************************************************************************** +*/ void MyTimer_PWM( TIM_TypeDef *, char) ; + + +/* +************************************************************************************************** +* @brief +* @param : - TIM_TypeDef * Timer : Timer concerné +* - float rapport : rapport cyclique, de 0 à 1 +* - char Channel : canal concerné, de 1 a 4 +************************************************************************************************** +*/ void MyTimer_PWM_set_cycle(TIM_TypeDef *, float, char) ; #define MyTimer_Base_Start(Timer) (Timer->CR1 |= 0x1) #define MyTimer_Base_Stop(Timer) (Timer->CR1 &= ~0x1) -//#define MyTimer_PWM_set_cycle(Timer, prop, channel) (Timer->CCRchannel = (int) (Timer -> ARR * prop) #endif diff --git a/timer_act2/Listings/timer_act2.map b/timer_act2/Listings/timer_act2.map index ffbc616..b0216e9 100644 --- a/timer_act2/Listings/timer_act2.map +++ b/timer_act2/Listings/timer_act2.map @@ -4,15 +4,15 @@ Component: ARM Compiler 5.06 update 7 (build 960) Tool: armlink [4d3601] Section Cross References - principal.o(i.handle_TIM2) refers to driver_gpio.o(i.MyGPIO_Toggle) for MyGPIO_Toggle - principal.o(i.handle_TIM2) refers to principal.o(.data) for greenLed + principal.o(i.callback_TIM2) refers to driver_gpio.o(i.MyGPIO_Toggle) for MyGPIO_Toggle + principal.o(i.callback_TIM2) refers to principal.o(.data) for greenLed principal.o(i.main) refers to driver_timer.o(i.Activate_TIM) for Activate_TIM principal.o(i.main) refers to driver_gpio.o(i.MyGPIO_Activate) for MyGPIO_Activate - principal.o(i.main) refers to driver_gpio.o(i.MyGPIO_Init) for MyGPIO_Init 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_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 sortiePWM + principal.o(i.main) refers to principal.o(.data) for MonTimer driver_gpio.o(i.MyGPIO_Init) refers to driver_gpio.o(i.MyGPIO_Set) for MyGPIO_Set driver_gpio.o(i.MyGPIO_Toggle) refers to driver_gpio.o(i.MyGPIO_Reset) for MyGPIO_Reset driver_gpio.o(i.MyGPIO_Toggle) refers to driver_gpio.o(i.MyGPIO_Set) for MyGPIO_Set @@ -66,7 +66,7 @@ Removing Unused input sections from the image. Removing principal.o(.rev16_text), (4 bytes). Removing principal.o(.revsh_text), (4 bytes). Removing principal.o(.rrx_text), (6 bytes). - Removing principal.o(i.handle_TIM2), (20 bytes). + Removing principal.o(i.callback_TIM2), (20 bytes). Removing driver_gpio.o(.rev16_text), (4 bytes). Removing driver_gpio.o(.revsh_text), (4 bytes). Removing driver_gpio.o(.rrx_text), (6 bytes). @@ -153,20 +153,20 @@ Image Symbol Table 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 0x08000424 Section 0 driver_timer.o(i.MyTimer_PWM_set_cycle) - i.SetSysClock 0x080004a8 Section 0 system_stm32f10x.o(i.SetSysClock) - SetSysClock 0x080004a9 Thumb Code 8 system_stm32f10x.o(i.SetSysClock) - i.SetSysClockTo72 0x080004b0 Section 0 system_stm32f10x.o(i.SetSysClockTo72) - SetSysClockTo72 0x080004b1 Thumb Code 214 system_stm32f10x.o(i.SetSysClockTo72) - i.SystemInit 0x08000590 Section 0 system_stm32f10x.o(i.SystemInit) - i.TIM1_TRG_COM_IRQHandler 0x080005f0 Section 0 driver_timer.o(i.TIM1_TRG_COM_IRQHandler) - i.TIM2_IRQHandler 0x08000614 Section 0 driver_timer.o(i.TIM2_IRQHandler) - i.TIM3_IRQHandler 0x08000638 Section 0 driver_timer.o(i.TIM3_IRQHandler) - i.TIM4_IRQHandler 0x0800065c Section 0 driver_timer.o(i.TIM4_IRQHandler) - i.__scatterload_copy 0x08000680 Section 14 handlers.o(i.__scatterload_copy) - i.__scatterload_null 0x0800068e Section 2 handlers.o(i.__scatterload_null) - i.__scatterload_zeroinit 0x08000690 Section 14 handlers.o(i.__scatterload_zeroinit) - i.main 0x080006a0 Section 0 principal.o(i.main) + 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) .data 0x20000000 Section 24 principal.o(.data) .data 0x20000018 Section 16 driver_timer.o(.data) STACK 0x20000028 Section 1024 startup_stm32f10x_md.o(STACK) @@ -258,19 +258,19 @@ Image Symbol Table 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 124 driver_timer.o(i.MyTimer_PWM) - MyTimer_PWM_set_cycle 0x08000425 Thumb Code 132 driver_timer.o(i.MyTimer_PWM_set_cycle) - SystemInit 0x08000591 Thumb Code 78 system_stm32f10x.o(i.SystemInit) - TIM1_TRG_COM_IRQHandler 0x080005f1 Thumb Code 28 driver_timer.o(i.TIM1_TRG_COM_IRQHandler) - TIM2_IRQHandler 0x08000615 Thumb Code 32 driver_timer.o(i.TIM2_IRQHandler) - TIM3_IRQHandler 0x08000639 Thumb Code 28 driver_timer.o(i.TIM3_IRQHandler) - TIM4_IRQHandler 0x0800065d Thumb Code 28 driver_timer.o(i.TIM4_IRQHandler) - __scatterload_copy 0x08000681 Thumb Code 14 handlers.o(i.__scatterload_copy) - __scatterload_null 0x0800068f Thumb Code 2 handlers.o(i.__scatterload_null) - __scatterload_zeroinit 0x08000691 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) - main 0x080006a1 Thumb Code 98 principal.o(i.main) - Region$$Table$$Base 0x08000714 Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x08000734 Number 0 anon$$obj.o(Region$$Table) + 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) MonTimer 0x20000000 Data 8 principal.o(.data) greenLed 0x20000008 Data 8 principal.o(.data) sortiePWM 0x20000010 Data 8 principal.o(.data) @@ -288,9 +288,9 @@ Memory Map of the image Image Entry point : 0x08000105 - Load Region LR_1 (Base: 0x08000000, Size: 0x0000075c, Max: 0xffffffff, ABSOLUTE) + Load Region LR_1 (Base: 0x08000000, Size: 0x0000079c, Max: 0xffffffff, ABSOLUTE) - Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000734, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000774, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -319,32 +319,32 @@ Memory Map of the image 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 0x00000080 Code RO 132 i.MyTimer_PWM driver_timer.o - 0x08000424 0x08000424 0x00000084 Code RO 133 i.MyTimer_PWM_set_cycle driver_timer.o - 0x080004a8 0x080004a8 0x00000008 Code RO 228 i.SetSysClock system_stm32f10x.o - 0x080004b0 0x080004b0 0x000000e0 Code RO 229 i.SetSysClockTo72 system_stm32f10x.o - 0x08000590 0x08000590 0x00000060 Code RO 231 i.SystemInit system_stm32f10x.o - 0x080005f0 0x080005f0 0x00000024 Code RO 134 i.TIM1_TRG_COM_IRQHandler driver_timer.o - 0x08000614 0x08000614 0x00000024 Code RO 135 i.TIM2_IRQHandler driver_timer.o - 0x08000638 0x08000638 0x00000024 Code RO 136 i.TIM3_IRQHandler driver_timer.o - 0x0800065c 0x0800065c 0x00000024 Code RO 137 i.TIM4_IRQHandler driver_timer.o - 0x08000680 0x08000680 0x0000000e Code RO 303 i.__scatterload_copy mc_w.l(handlers.o) - 0x0800068e 0x0800068e 0x00000002 Code RO 304 i.__scatterload_null mc_w.l(handlers.o) - 0x08000690 0x08000690 0x0000000e Code RO 305 i.__scatterload_zeroinit mc_w.l(handlers.o) - 0x0800069e 0x0800069e 0x00000002 PAD - 0x080006a0 0x080006a0 0x00000074 Code RO 5 i.main principal.o - 0x08000714 0x08000714 0x00000020 Data RO 301 Region$$Table anon$$obj.o + 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 - Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000734, Size: 0x00000028, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000774, Size: 0x00000028, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 0x08000734 0x00000018 Data RW 6 .data principal.o - 0x20000018 0x0800074c 0x00000010 Data RW 140 .data driver_timer.o + 0x20000000 0x08000774 0x00000018 Data RW 6 .data principal.o + 0x20000018 0x0800078c 0x00000010 Data RW 140 .data driver_timer.o - Execution Region ER_ZI (Exec base: 0x20000028, Load base: 0x0800075c, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_ZI (Exec base: 0x20000028, Load base: 0x0800079c, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -359,13 +359,13 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name 268 6 0 0 0 2517 driver_gpio.o - 462 36 0 16 0 5475 driver_timer.o + 526 36 0 16 0 5511 driver_timer.o 116 18 0 24 0 208365 principal.o 36 8 236 0 1024 840 startup_stm32f10x_md.o 328 28 0 0 0 2101 system_stm32f10x.o ---------------------------------------------------------------------- - 1212 96 268 40 1024 219298 Object Totals + 1276 96 268 40 1024 219334 Object Totals 0 0 32 0 0 0 (incl. Generated) 2 0 0 0 0 0 (incl. Padding) @@ -411,15 +411,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 1576 112 268 40 1024 219118 Grand Totals - 1576 112 268 40 1024 219118 ELF Image Totals - 1576 112 268 40 0 0 ROM Totals + 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 ============================================================================== - Total RO Size (Code + RO Data) 1844 ( 1.80kB) + Total RO Size (Code + RO Data) 1908 ( 1.86kB) Total RW Size (RW Data + ZI Data) 1064 ( 1.04kB) - Total ROM Size (Code + RO Data + RW Data) 1884 ( 1.84kB) + Total ROM Size (Code + RO Data + RW Data) 1948 ( 1.90kB) ============================================================================== diff --git a/timer_act2/Objects/driver_gpio.crf b/timer_act2/Objects/driver_gpio.crf index 6ea801b..46c48ce 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.o b/timer_act2/Objects/driver_gpio.o index 6467f94..91a298a 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 2029d59..2501a02 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.o b/timer_act2/Objects/driver_timer.o index b5e331e..34a5b69 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 8b458de..6ce9c42 100644 Binary files a/timer_act2/Objects/principal.crf and b/timer_act2/Objects/principal.crf differ diff --git a/timer_act2/Objects/principal.o b/timer_act2/Objects/principal.o index 5e4db97..196f943 100644 Binary files a/timer_act2/Objects/principal.o and b/timer_act2/Objects/principal.o differ diff --git a/timer_act2/Objects/system_stm32f10x.crf b/timer_act2/Objects/system_stm32f10x.crf index f27a7ef..b799b35 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.o b/timer_act2/Objects/system_stm32f10x.o index d178e38..9a6ba51 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 ccc6c74..84fc523 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 dcb151e..1dbdebf 100644 --- a/timer_act2/Objects/timer_act2.build_log.htm +++ b/timer_act2/Objects/timer_act2.build_log.htm @@ -26,14 +26,15 @@ Project File Date: 09/20/2021