diff --git a/drivers/Driver_ADC.h b/drivers/Driver_ADC.h index bfadbc4..ebb6578 100644 --- a/drivers/Driver_ADC.h +++ b/drivers/Driver_ADC.h @@ -9,4 +9,7 @@ typedef struct { char GPIO_Conf; // voir ci dessous } MyADC_Struct_TypeDef; +void MyADC_Init(MyADC_Struct_TypeDef *ADC); +uint16_t MyADC_Read(MyADC_Struct_TypeDef *ADC); + #endif \ No newline at end of file diff --git a/drivers/Driver_Timer.c b/drivers/Driver_Timer.c index 64ff1e2..2aa6073 100644 --- a/drivers/Driver_Timer.c +++ b/drivers/Driver_Timer.c @@ -3,20 +3,13 @@ void MyTimer_Init(MyTimer_Struct_TypeDef *Timer) { // Activation de l'horloge correspondante au Timer - if (Timer->Timer == TIM1) - { + if (Timer->Timer == TIM1) { RCC->APB2ENR |= RCC_APB2ENR_TIM1EN; // Voir p140 du manual - } - else if (Timer->Timer == TIM2) - { + } else if (Timer->Timer == TIM2) { RCC->APB1ENR |= RCC_APB1ENR_TIM2EN; - } - else if (Timer->Timer == TIM3) - { + } else if (Timer->Timer == TIM3) { RCC->APB1ENR |= RCC_APB1ENR_TIM3EN; - } - else if (Timer->Timer == TIM4) - { + } else if (Timer->Timer == TIM4) { RCC->APB1ENR |= RCC_APB1ENR_TIM4EN; } @@ -24,7 +17,7 @@ void MyTimer_Init(MyTimer_Struct_TypeDef *Timer) // Le compteur du registre PSC commence à zéro, donc on soustrait 1 pour éviter les débordements. Timer->Timer->PSC = Timer->PSC - 1; // Valeur du prescaler Timer->Timer->ARR = Timer->ARR - 1; // Valeur de l'autoreload -> Quand cette valeur est atteinte le timer est réinitialisé - Timer->Timer->CR1 |= TIM_CR1_ARPE; // Active "Autoreload preload" pour prendre en compte immédiatement les modifications de la valeur de l'autoreload (ARR) lors du prochain cycle de Timer. + //Timer->Timer->CR1 |= TIM_CR1_ARPE; // Active "Autoreload preload" pour prendre en compte immédiatement les modifications de la valeur de l'autoreload (ARR) lors du prochain cycle de Timer -> Utile pour PWM Variable } void MyTimer_Start(MyTimer_Struct_TypeDef *Timer) @@ -35,4 +28,25 @@ void MyTimer_Start(MyTimer_Struct_TypeDef *Timer) void MyTimer_Stop(MyTimer_Struct_TypeDef *Timer) { Timer->Timer->CR1 &= ~TIM_CR1_CEN; // Arrête le Timer -} \ No newline at end of file +} + +void MyTimer_EnableInterrupt(MyTimer_Struct_TypeDef *Timer) { + Timer->Timer->DIER |= TIM_DIER_UIE; // Active l'interruption "Update" du Timer + NVIC->ISER[Timer->IRQn / 32] = (1 << Timer->IRQn); // Pour que ce soit générique : On divise IRQn par 32 pour avoir le ISER[] correspondant. On fait également le modulo 32 de IRQn pour avoir un nombre entre 0 et 31 correspondant au setting +} + +void MyTimer_SetPriority(MyTimer_Struct_TypeDef *Timer, uint8_t priority) { + NVIC->IP[Timer->IRQn] = (priority << 4); // Décalé vers la gauche de 4 selon la datasheet voir p125 +} + + +void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint16_t duty_cycle) { // ducy_cycle en % + // Configuration du PWM + Timer->Timer->CCMR1 |= TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2; // Mode PWM1 sur le canal 1 (CC1) + Timer->Timer->CCER |= TIM_CCER_CC1E; // Activation du canal 1 (CC1) + + // Configuration du registre CCR1 avec la valeur du rapport cyclique + Timer->Timer->CCR1 = (duty_cycle * Timer->ARR) / 100; + + // MOE +} diff --git a/drivers/Driver_Timer.h b/drivers/Driver_Timer.h index c34de31..ae1c54c 100644 --- a/drivers/Driver_Timer.h +++ b/drivers/Driver_Timer.h @@ -8,6 +8,7 @@ typedef struct TIM_TypeDef * Timer; unsigned short ARR; // Valeur du registre ARR (auto-reload register) qui détermine la période du timer unsigned short PSC; // Valeur du registre PSC (prescaler) qui détermine le rapport de division de la fréquence d'horloge + IRQn_Type IRQn; // Numéro d'interruption correspondant au Timer } MyTimer_Struct_TypeDef; @@ -15,7 +16,9 @@ typedef struct void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer); void MyTimer_Base_Start(MyTimer_Struct_TypeDef * Timer); void MyTimer_Base_Stop(MyTimer_Struct_TypeDef * Timer); -void MyTimer_Base_Reset(MyTimer_Struct_TypeDef * Timer); +void MyTimer_EnableInterrupt(MyTimer_Struct_TypeDef *Timer); +void MyTimer_SetPriority(MyTimer_Struct_TypeDef *Timer, uint8_t priority); +void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint16_t duty_cycle); //#define MyTimer_Base_Start(Timer) //#define MyTimer_Base_Stop(Timer) diff --git a/projet_1/Listings/tp_sim.map b/projet_1/Listings/tp_sim.map index 9fefc72..8b15346 100644 --- a/projet_1/Listings/tp_sim.map +++ b/projet_1/Listings/tp_sim.map @@ -4,12 +4,13 @@ Component: Arm Compiler for Embedded 6.19 Tool: armlink [5e73cb00] Section Cross References + main.o(.text.TIM2_IRQHandler) refers to driver_gpio.o(.text.MyGPIO_Toggle) for MyGPIO_Toggle + main.o(.ARM.exidx.text.TIM2_IRQHandler) refers to main.o(.text.TIM2_IRQHandler) for [Anonymous Symbol] main.o(.text.main) refers to driver_gpio.o(.text.MyGPIO_Init) for MyGPIO_Init main.o(.text.main) refers to driver_timer.o(.text.MyTimer_Init) for MyTimer_Init + main.o(.text.main) refers to driver_timer.o(.text.MyTimer_EnableInterrupt) for MyTimer_EnableInterrupt + main.o(.text.main) refers to driver_timer.o(.text.MyTimer_SetPriority) for MyTimer_SetPriority main.o(.text.main) refers to driver_timer.o(.text.MyTimer_Start) for MyTimer_Start - main.o(.text.main) refers to driver_timer.o(.text.MyTimer_Stop) for MyTimer_Stop - main.o(.text.main) refers to driver_gpio.o(.text.MyGPIO_Set) for MyGPIO_Set - main.o(.text.main) refers to driver_gpio.o(.text.MyGPIO_Reset) for MyGPIO_Reset main.o(.ARM.exidx.text.main) refers to main.o(.text.main) for [Anonymous Symbol] driver_gpio.o(.ARM.exidx.text.MyGPIO_Init) refers to driver_gpio.o(.text.MyGPIO_Init) for [Anonymous Symbol] driver_gpio.o(.ARM.exidx.text.MyGPIO_Read) refers to driver_gpio.o(.text.MyGPIO_Read) for [Anonymous Symbol] @@ -19,8 +20,11 @@ Section Cross References driver_timer.o(.ARM.exidx.text.MyTimer_Init) refers to driver_timer.o(.text.MyTimer_Init) for [Anonymous Symbol] driver_timer.o(.ARM.exidx.text.MyTimer_Start) refers to driver_timer.o(.text.MyTimer_Start) for [Anonymous Symbol] driver_timer.o(.ARM.exidx.text.MyTimer_Stop) refers to driver_timer.o(.text.MyTimer_Stop) for [Anonymous Symbol] + driver_timer.o(.ARM.exidx.text.MyTimer_EnableInterrupt) refers to driver_timer.o(.text.MyTimer_EnableInterrupt) for [Anonymous Symbol] + driver_timer.o(.ARM.exidx.text.MyTimer_SetPriority) refers to driver_timer.o(.text.MyTimer_SetPriority) for [Anonymous Symbol] startup_stm32f10x_md.o(RESET) refers to startup_stm32f10x_md.o(STACK) for __initial_sp startup_stm32f10x_md.o(RESET) refers to startup_stm32f10x_md.o(.text) for Reset_Handler + startup_stm32f10x_md.o(RESET) refers to main.o(.text.TIM2_IRQHandler) for TIM2_IRQHandler startup_stm32f10x_md.o(.text) refers to system_stm32f10x.o(.text.SystemInit) for SystemInit startup_stm32f10x_md.o(.text) refers to entry.o(.ARM.Collect$$$$00000000) for __main system_stm32f10x.o(.ARM.exidx.text.SystemInit) refers to system_stm32f10x.o(.text.SystemInit) for [Anonymous Symbol] @@ -49,20 +53,25 @@ Section Cross References Removing Unused input sections from the image. Removing main.o(.text), (0 bytes). + Removing main.o(.ARM.exidx.text.TIM2_IRQHandler), (8 bytes). Removing main.o(.ARM.exidx.text.main), (8 bytes). Removing main.o(.ARM.use_no_argv), (4 bytes). Removing driver_gpio.o(.text), (0 bytes). Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Init), (8 bytes). Removing driver_gpio.o(.text.MyGPIO_Read), (10 bytes). Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Read), (8 bytes). + Removing driver_gpio.o(.text.MyGPIO_Set), (14 bytes). Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Set), (8 bytes). + Removing driver_gpio.o(.text.MyGPIO_Reset), (10 bytes). Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Reset), (8 bytes). - Removing driver_gpio.o(.text.MyGPIO_Toggle), (14 bytes). Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Toggle), (8 bytes). Removing driver_timer.o(.text), (0 bytes). Removing driver_timer.o(.ARM.exidx.text.MyTimer_Init), (8 bytes). Removing driver_timer.o(.ARM.exidx.text.MyTimer_Start), (8 bytes). + Removing driver_timer.o(.text.MyTimer_Stop), (12 bytes). Removing driver_timer.o(.ARM.exidx.text.MyTimer_Stop), (8 bytes). + Removing driver_timer.o(.ARM.exidx.text.MyTimer_EnableInterrupt), (8 bytes). + Removing driver_timer.o(.ARM.exidx.text.MyTimer_SetPriority), (8 bytes). Removing driver_adc.o(.text), (0 bytes). Removing startup_stm32f10x_md.o(HEAP), (512 bytes). Removing system_stm32f10x.o(.text), (0 bytes). @@ -72,7 +81,7 @@ Removing Unused input sections from the image. Removing system_stm32f10x.o(.data.SystemCoreClock), (4 bytes). Removing system_stm32f10x.o(.rodata.AHBPrescTable), (16 bytes). -23 unused section(s) (total 758 bytes) removed from the image. +28 unused section(s) (total 804 bytes) removed from the image. ============================================================================== @@ -118,13 +127,14 @@ Image Symbol Table .text 0x08000100 Section 36 startup_stm32f10x_md.o(.text) .text 0x08000124 Section 36 init.o(.text) [Anonymous Symbol] 0x08000148 Section 0 driver_gpio.o(.text.MyGPIO_Init) - [Anonymous Symbol] 0x080001e8 Section 0 driver_gpio.o(.text.MyGPIO_Reset) - [Anonymous Symbol] 0x080001f4 Section 0 driver_gpio.o(.text.MyGPIO_Set) - [Anonymous Symbol] 0x08000204 Section 0 driver_timer.o(.text.MyTimer_Init) - [Anonymous Symbol] 0x0800029c Section 0 driver_timer.o(.text.MyTimer_Start) - [Anonymous Symbol] 0x080002a8 Section 0 driver_timer.o(.text.MyTimer_Stop) - [Anonymous Symbol] 0x080002b4 Section 0 system_stm32f10x.o(.text.SystemInit) - [Anonymous Symbol] 0x080003c4 Section 0 main.o(.text.main) + [Anonymous Symbol] 0x080001e8 Section 0 driver_gpio.o(.text.MyGPIO_Toggle) + [Anonymous Symbol] 0x080001f8 Section 0 driver_timer.o(.text.MyTimer_EnableInterrupt) + [Anonymous Symbol] 0x08000220 Section 0 driver_timer.o(.text.MyTimer_Init) + [Anonymous Symbol] 0x080002b0 Section 0 driver_timer.o(.text.MyTimer_SetPriority) + [Anonymous Symbol] 0x080002c4 Section 0 driver_timer.o(.text.MyTimer_Start) + [Anonymous Symbol] 0x080002d0 Section 0 system_stm32f10x.o(.text.SystemInit) + [Anonymous Symbol] 0x080003e0 Section 0 main.o(.text.TIM2_IRQHandler) + [Anonymous Symbol] 0x08000400 Section 0 main.o(.text.main) i.__scatterload_copy 0x08000466 Section 14 handlers.o(i.__scatterload_copy) i.__scatterload_null 0x08000474 Section 2 handlers.o(i.__scatterload_null) i.__scatterload_zeroinit 0x08000476 Section 14 handlers.o(i.__scatterload_zeroinit) @@ -195,7 +205,6 @@ Image Symbol Table TIM1_CC_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) TIM1_TRG_COM_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) TIM1_UP_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) - TIM2_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) TIM3_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) TIM4_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) USART1_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) @@ -208,13 +217,14 @@ Image Symbol Table __scatterload 0x08000125 Thumb Code 28 init.o(.text) __scatterload_rt2 0x08000125 Thumb Code 0 init.o(.text) MyGPIO_Init 0x08000149 Thumb Code 144 driver_gpio.o(.text.MyGPIO_Init) - MyGPIO_Reset 0x080001e9 Thumb Code 10 driver_gpio.o(.text.MyGPIO_Reset) - MyGPIO_Set 0x080001f5 Thumb Code 14 driver_gpio.o(.text.MyGPIO_Set) - MyTimer_Init 0x08000205 Thumb Code 152 driver_timer.o(.text.MyTimer_Init) - MyTimer_Start 0x0800029d Thumb Code 12 driver_timer.o(.text.MyTimer_Start) - MyTimer_Stop 0x080002a9 Thumb Code 12 driver_timer.o(.text.MyTimer_Stop) - SystemInit 0x080002b5 Thumb Code 272 system_stm32f10x.o(.text.SystemInit) - main 0x080003c5 Thumb Code 162 main.o(.text.main) + MyGPIO_Toggle 0x080001e9 Thumb Code 14 driver_gpio.o(.text.MyGPIO_Toggle) + MyTimer_EnableInterrupt 0x080001f9 Thumb Code 38 driver_timer.o(.text.MyTimer_EnableInterrupt) + MyTimer_Init 0x08000221 Thumb Code 144 driver_timer.o(.text.MyTimer_Init) + MyTimer_SetPriority 0x080002b1 Thumb Code 18 driver_timer.o(.text.MyTimer_SetPriority) + MyTimer_Start 0x080002c5 Thumb Code 12 driver_timer.o(.text.MyTimer_Start) + SystemInit 0x080002d1 Thumb Code 272 system_stm32f10x.o(.text.SystemInit) + TIM2_IRQHandler 0x080003e1 Thumb Code 32 main.o(.text.TIM2_IRQHandler) + main 0x08000401 Thumb Code 102 main.o(.text.main) __scatterload_copy 0x08000467 Thumb Code 14 handlers.o(i.__scatterload_copy) __scatterload_null 0x08000475 Thumb Code 2 handlers.o(i.__scatterload_null) __scatterload_zeroinit 0x08000477 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) @@ -236,32 +246,34 @@ Memory Map of the image Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x08000000 0x08000000 0x000000ec Data RO 45 RESET startup_stm32f10x_md.o - 0x080000ec 0x080000ec 0x00000000 Code RO 66 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) - 0x080000ec 0x080000ec 0x00000004 Code RO 69 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) - 0x080000f0 0x080000f0 0x00000004 Code RO 72 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 74 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 76 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) - 0x080000f4 0x080000f4 0x00000008 Code RO 77 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) - 0x080000fc 0x080000fc 0x00000000 Code RO 79 .ARM.Collect$$$$0000000D mc_w.l(entry10a.o) - 0x080000fc 0x080000fc 0x00000000 Code RO 81 .ARM.Collect$$$$0000000F mc_w.l(entry11a.o) - 0x080000fc 0x080000fc 0x00000004 Code RO 70 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) - 0x08000100 0x08000100 0x00000024 Code RO 46 * .text startup_stm32f10x_md.o - 0x08000124 0x08000124 0x00000024 Code RO 83 .text mc_w.l(init.o) - 0x08000148 0x08000148 0x000000a0 Code RO 11 .text.MyGPIO_Init driver_gpio.o - 0x080001e8 0x080001e8 0x0000000a Code RO 17 .text.MyGPIO_Reset driver_gpio.o - 0x080001f2 0x080001f2 0x00000002 PAD - 0x080001f4 0x080001f4 0x0000000e Code RO 15 .text.MyGPIO_Set driver_gpio.o - 0x08000202 0x08000202 0x00000002 PAD - 0x08000204 0x08000204 0x00000098 Code RO 29 .text.MyTimer_Init driver_timer.o - 0x0800029c 0x0800029c 0x0000000c Code RO 31 .text.MyTimer_Start driver_timer.o - 0x080002a8 0x080002a8 0x0000000c Code RO 33 .text.MyTimer_Stop driver_timer.o - 0x080002b4 0x080002b4 0x00000110 Code RO 53 .text.SystemInit system_stm32f10x.o - 0x080003c4 0x080003c4 0x000000a2 Code RO 2 .text.main main.o - 0x08000466 0x08000466 0x0000000e Code RO 87 i.__scatterload_copy mc_w.l(handlers.o) - 0x08000474 0x08000474 0x00000002 Code RO 88 i.__scatterload_null mc_w.l(handlers.o) - 0x08000476 0x08000476 0x0000000e Code RO 89 i.__scatterload_zeroinit mc_w.l(handlers.o) - 0x08000484 0x08000484 0x00000010 Data RO 86 Region$$Table anon$$obj.o + 0x08000000 0x08000000 0x000000ec Data RO 52 RESET startup_stm32f10x_md.o + 0x080000ec 0x080000ec 0x00000000 Code RO 73 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) + 0x080000ec 0x080000ec 0x00000004 Code RO 76 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) + 0x080000f0 0x080000f0 0x00000004 Code RO 79 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 81 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 83 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) + 0x080000f4 0x080000f4 0x00000008 Code RO 84 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) + 0x080000fc 0x080000fc 0x00000000 Code RO 86 .ARM.Collect$$$$0000000D mc_w.l(entry10a.o) + 0x080000fc 0x080000fc 0x00000000 Code RO 88 .ARM.Collect$$$$0000000F mc_w.l(entry11a.o) + 0x080000fc 0x080000fc 0x00000004 Code RO 77 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) + 0x08000100 0x08000100 0x00000024 Code RO 53 * .text startup_stm32f10x_md.o + 0x08000124 0x08000124 0x00000024 Code RO 90 .text mc_w.l(init.o) + 0x08000148 0x08000148 0x000000a0 Code RO 14 .text.MyGPIO_Init driver_gpio.o + 0x080001e8 0x080001e8 0x0000000e Code RO 22 .text.MyGPIO_Toggle driver_gpio.o + 0x080001f6 0x080001f6 0x00000002 PAD + 0x080001f8 0x080001f8 0x00000026 Code RO 38 .text.MyTimer_EnableInterrupt driver_timer.o + 0x0800021e 0x0800021e 0x00000002 PAD + 0x08000220 0x08000220 0x00000090 Code RO 32 .text.MyTimer_Init driver_timer.o + 0x080002b0 0x080002b0 0x00000012 Code RO 40 .text.MyTimer_SetPriority driver_timer.o + 0x080002c2 0x080002c2 0x00000002 PAD + 0x080002c4 0x080002c4 0x0000000c Code RO 34 .text.MyTimer_Start driver_timer.o + 0x080002d0 0x080002d0 0x00000110 Code RO 60 .text.SystemInit system_stm32f10x.o + 0x080003e0 0x080003e0 0x00000020 Code RO 2 .text.TIM2_IRQHandler main.o + 0x08000400 0x08000400 0x00000066 Code RO 4 .text.main main.o + 0x08000466 0x08000466 0x0000000e Code RO 94 i.__scatterload_copy mc_w.l(handlers.o) + 0x08000474 0x08000474 0x00000002 Code RO 95 i.__scatterload_null mc_w.l(handlers.o) + 0x08000476 0x08000476 0x0000000e Code RO 96 i.__scatterload_zeroinit mc_w.l(handlers.o) + 0x08000484 0x08000484 0x00000010 Data RO 93 Region$$Table anon$$obj.o Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000494, Size: 0x00000000, Max: 0xffffffff, ABSOLUTE) @@ -273,7 +285,7 @@ Memory Map of the image Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 - 0x00000400 Zero RW 43 STACK startup_stm32f10x_md.o + 0x20000000 - 0x00000400 Zero RW 50 STACK startup_stm32f10x_md.o ============================================================================== @@ -283,16 +295,16 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name - 184 16 0 0 0 2117 driver_gpio.o - 176 0 0 0 0 2360 driver_timer.o - 162 0 0 0 0 2120 main.o + 174 16 0 0 0 2117 driver_gpio.o + 212 0 0 0 0 4392 driver_timer.o + 134 0 0 0 0 3305 main.o 36 8 236 0 1024 840 startup_stm32f10x_md.o 272 0 0 0 0 2793 system_stm32f10x.o ---------------------------------------------------------------------- - 834 24 252 0 1024 10230 Object Totals + 834 24 252 0 1024 13447 Object Totals 0 0 16 0 0 0 (incl. Generated) - 4 0 0 0 0 0 (incl. Padding) + 6 0 0 0 0 0 (incl. Padding) ---------------------------------------------------------------------- @@ -329,8 +341,8 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 920 40 252 0 1024 10390 Grand Totals - 920 40 252 0 1024 10390 ELF Image Totals + 920 40 252 0 1024 13607 Grand Totals + 920 40 252 0 1024 13607 ELF Image Totals 920 40 252 0 0 0 ROM Totals ============================================================================== diff --git a/projet_1/Objects/driver_adc.d b/projet_1/Objects/driver_adc.d index 3d79e2f..1d280b2 100644 --- a/projet_1/Objects/driver_adc.d +++ b/projet_1/Objects/driver_adc.d @@ -1,6 +1,6 @@ ./objects/driver_adc.o: ..\drivers\Driver_ADC.c ..\drivers\Driver_Timer.h \ C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h \ - RTE\_sim\RTE_Components.h \ + RTE\_board\RTE_Components.h \ C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h \ C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\stdint.h \ C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h \ diff --git a/projet_1/Objects/driver_gpio.d b/projet_1/Objects/driver_gpio.d index 90914cb..ed3536d 100644 --- a/projet_1/Objects/driver_gpio.d +++ b/projet_1/Objects/driver_gpio.d @@ -1,7 +1,7 @@ ./objects/driver_gpio.o: ..\drivers\Driver_GPIO.c \ ..\drivers\Driver_GPIO.h \ C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h \ - RTE\_sim\RTE_Components.h \ + RTE\_board\RTE_Components.h \ C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h \ C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\stdint.h \ C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h \ diff --git a/projet_1/Objects/driver_timer.d b/projet_1/Objects/driver_timer.d index f096ea7..8a06d6a 100644 --- a/projet_1/Objects/driver_timer.d +++ b/projet_1/Objects/driver_timer.d @@ -1,7 +1,7 @@ ./objects/driver_timer.o: ..\drivers\Driver_Timer.c \ ..\drivers\Driver_Timer.h \ C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h \ - RTE\_sim\RTE_Components.h \ + RTE\_board\RTE_Components.h \ C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h \ C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\stdint.h \ C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h \ diff --git a/projet_1/Objects/driver_timer.o b/projet_1/Objects/driver_timer.o index 9f060c1..3c5cbb1 100644 Binary files a/projet_1/Objects/driver_timer.o and b/projet_1/Objects/driver_timer.o differ diff --git a/projet_1/Objects/main.d b/projet_1/Objects/main.d index acf4c94..a026c2f 100644 --- a/projet_1/Objects/main.d +++ b/projet_1/Objects/main.d @@ -1,6 +1,6 @@ ./objects/main.o: src\main.c \ C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h \ - RTE\_sim\RTE_Components.h \ + RTE\_board\RTE_Components.h \ C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h \ C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\stdint.h \ C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h \ diff --git a/projet_1/Objects/main.o b/projet_1/Objects/main.o index 7ff0045..a1012d2 100644 Binary files a/projet_1/Objects/main.o and b/projet_1/Objects/main.o differ diff --git a/projet_1/Objects/startup_stm32f10x_md.o b/projet_1/Objects/startup_stm32f10x_md.o index 1919378..6ac6cdb 100644 Binary files a/projet_1/Objects/startup_stm32f10x_md.o and b/projet_1/Objects/startup_stm32f10x_md.o differ diff --git a/projet_1/Objects/system_stm32f10x.d b/projet_1/Objects/system_stm32f10x.d index 54cca20..143e821 100644 --- a/projet_1/Objects/system_stm32f10x.d +++ b/projet_1/Objects/system_stm32f10x.d @@ -1,6 +1,6 @@ ./objects/system_stm32f10x.o: RTE\Device\STM32F103RB\system_stm32f10x.c \ C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h \ - RTE\_sim\RTE_Components.h \ + RTE\_board\RTE_Components.h \ C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h \ C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\stdint.h \ C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h \ diff --git a/projet_1/Objects/tp_board.dep b/projet_1/Objects/tp_board.dep index dee8dc6..cb611ba 100644 --- a/projet_1/Objects/tp_board.dep +++ b/projet_1/Objects/tp_board.dep @@ -1,6 +1,6 @@ Dependencies for Project 'tp', Target 'board': (DO NOT MODIFY !) CompilerVersion: 6190000::V6.19::ARMCLANG -F (.\src\main.c)(0x6418B06C)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) +F (.\src\main.c)(0x641A292B)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_board\RTE_Components.h)(0x6415C72E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -10,8 +10,8 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) I (..\drivers\Driver_GPIO.h)(0x6418B324) -I (..\drivers\Driver_Timer.h)(0x6418AED3) -I (..\drivers\Driver_ADC.h)(0x64185970) +I (..\drivers\Driver_Timer.h)(0x641A1BC2) +I (..\drivers\Driver_ADC.h)(0x641A2645) F (..\drivers\Driver_GPIO.c)(0x6418B3FF)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_gpio.o -MD) I (..\drivers\Driver_GPIO.h)(0x6418B324) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) @@ -23,8 +23,8 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) F (..\drivers\Driver_GPIO.h)(0x6418B324)() -F (..\drivers\Driver_Timer.c)(0x6418AEFF)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_timer.o -MD) -I (..\drivers\Driver_Timer.h)(0x6418AED3) +F (..\drivers\Driver_Timer.c)(0x641A2797)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_timer.o -MD) +I (..\drivers\Driver_Timer.h)(0x641A1BC2) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_board\RTE_Components.h)(0x6415C72E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -33,9 +33,9 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) -F (..\drivers\Driver_Timer.h)(0x6418AED3)() +F (..\drivers\Driver_Timer.h)(0x641A1BC2)() F (..\drivers\Driver_ADC.c)(0x64182F1D)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_adc.o -MD) -I (..\drivers\Driver_Timer.h)(0x6418AED3) +I (..\drivers\Driver_Timer.h)(0x641A1BC2) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_board\RTE_Components.h)(0x6415C72E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -44,7 +44,7 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) -F (..\drivers\Driver_ADC.h)(0x64185970)() +F (..\drivers\Driver_ADC.h)(0x641A2645)() F (RTE/Device/STM32F103RB/RTE_Device.h)(0x5FC0B25A)() F (RTE/Device/STM32F103RB/startup_stm32f10x_md.s)(0x61ADDBCE)(--target=arm-arm-none-eabi -mcpu=cortex-m3 -masm=auto -Wa,armasm,--diag_suppress=A1950W -c -gdwarf-4 -Wa,armasm,--pd,"__MICROLIB SETA 1" -Wa,armasm,--pd,"__EVAL SETA 1" -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -Wa,armasm,--pd,"__UVISION_VERSION SETA 538" -Wa,armasm,--pd,"_RTE_ SETA 1" -Wa,armasm,--pd,"STM32F10X_MD SETA 1" -Wa,armasm,--pd,"_RTE_ SETA 1" -o ./objects/startup_stm32f10x_md.o) F (RTE/Device/STM32F103RB/system_stm32f10x.c)(0x61ADDBCE)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/system_stm32f10x.o -MD) diff --git a/projet_1/Objects/tp_sim.axf b/projet_1/Objects/tp_sim.axf index 630b789..065ed48 100644 Binary files a/projet_1/Objects/tp_sim.axf and b/projet_1/Objects/tp_sim.axf differ diff --git a/projet_1/Objects/tp_sim.build_log.htm b/projet_1/Objects/tp_sim.build_log.htm index 4686a72..b29943d 100644 --- a/projet_1/Objects/tp_sim.build_log.htm +++ b/projet_1/Objects/tp_sim.build_log.htm @@ -17,7 +17,7 @@ Library Manager: ArmAr.exe V6.19 Hex Converter: FromElf.exe V6.19 CPU DLL: SARMCM3.DLL V5.38.0.0 Dialog DLL: DARMSTM.DLL V1.69.1.0 -Target DLL: UL2CM3.DLL V1.164.8.0 +Target DLL: STLink\ST-LINKIII-KEIL_SWO.dll V3.1.0.0 Dialog DLL: TCM.DLL V1.56.4.0

Project:

@@ -26,13 +26,13 @@ Project File Date: 03/20/2023

Output:

*** Using Compiler 'V6.19', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin' -Rebuild target 'sim' -compiling Driver_ADC.c... -assembling startup_stm32f10x_md.s... -compiling system_stm32f10x.c... +Rebuild target 'board' compiling Driver_Timer.c... compiling Driver_GPIO.c... +compiling Driver_ADC.c... +assembling startup_stm32f10x_md.s... compiling main.c... +compiling system_stm32f10x.c... linking... Program Size: Code=920 RO-data=252 RW-data=0 ZI-data=1024 ".\Objects\tp_sim.axf" - 0 Error(s), 0 Warning(s). @@ -53,7 +53,7 @@ Package Vendor: Keil

Collection of Component include folders:

./RTE/Device/STM32F103RB - ./RTE/_sim + ./RTE/_board C:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include C:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include diff --git a/projet_1/Objects/tp_sim.dep b/projet_1/Objects/tp_sim.dep index cd3cbad..9ac3687 100644 --- a/projet_1/Objects/tp_sim.dep +++ b/projet_1/Objects/tp_sim.dep @@ -1,6 +1,6 @@ Dependencies for Project 'tp', Target 'sim': (DO NOT MODIFY !) CompilerVersion: 6190000::V6.19::ARMCLANG -F (.\src\main.c)(0x6418B461)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ./include -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) +F (.\src\main.c)(0x641A28AC)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ./include -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_sim\RTE_Components.h)(0x6415C555) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -10,8 +10,8 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) I (..\drivers\Driver_GPIO.h)(0x6418B324) -I (..\drivers\Driver_Timer.h)(0x6418AED3) -I (..\drivers\Driver_ADC.h)(0x64185970) +I (..\drivers\Driver_Timer.h)(0x641A1BC2) +I (..\drivers\Driver_ADC.h)(0x641A2645) F (..\drivers\Driver_GPIO.c)(0x6418B3FF)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ./include -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_gpio.o -MD) I (..\drivers\Driver_GPIO.h)(0x6418B324) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) @@ -23,8 +23,8 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) F (..\drivers\Driver_GPIO.h)(0x6418B324)() -F (..\drivers\Driver_Timer.c)(0x6418AEFF)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ./include -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_timer.o -MD) -I (..\drivers\Driver_Timer.h)(0x6418AED3) +F (..\drivers\Driver_Timer.c)(0x641A2797)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ./include -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_timer.o -MD) +I (..\drivers\Driver_Timer.h)(0x641A1BC2) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_sim\RTE_Components.h)(0x6415C555) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -33,9 +33,9 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) -F (..\drivers\Driver_Timer.h)(0x6418AED3)() +F (..\drivers\Driver_Timer.h)(0x641A1BC2)() F (..\drivers\Driver_ADC.c)(0x64182F1D)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ./include -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_adc.o -MD) -I (..\drivers\Driver_Timer.h)(0x6418AED3) +I (..\drivers\Driver_Timer.h)(0x641A1BC2) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_sim\RTE_Components.h)(0x6415C555) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -44,7 +44,7 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) -F (..\drivers\Driver_ADC.h)(0x64185970)() +F (..\drivers\Driver_ADC.h)(0x641A2645)() F (RTE/Device/STM32F103RB/RTE_Device.h)(0x5FC0B25A)() F (RTE/Device/STM32F103RB/startup_stm32f10x_md.s)(0x61ADDBCE)(--target=arm-arm-none-eabi -mcpu=cortex-m3 -masm=auto -Wa,armasm,--diag_suppress=A1950W -c -gdwarf-4 -Wa,armasm,--pd,"__MICROLIB SETA 1" -Wa,armasm,--pd,"__EVAL SETA 1" -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -Wa,armasm,--pd,"__UVISION_VERSION SETA 538" -Wa,armasm,--pd,"_RTE_ SETA 1" -Wa,armasm,--pd,"STM32F10X_MD SETA 1" -Wa,armasm,--pd,"_RTE_ SETA 1" -o ./objects/startup_stm32f10x_md.o) F (RTE/Device/STM32F103RB/system_stm32f10x.c)(0x61ADDBCE)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ./include -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/system_stm32f10x.o -MD) diff --git a/projet_1/Objects/tp_sim.htm b/projet_1/Objects/tp_sim.htm index dbdaeb2..3f5d2c1 100644 --- a/projet_1/Objects/tp_sim.htm +++ b/projet_1/Objects/tp_sim.htm @@ -3,9 +3,9 @@ Static Call Graph - [.\Objects\tp_sim.axf]

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

-

#<CALLGRAPH># ARM Linker, 6190004: Last Updated: Mon Mar 20 20:30:45 2023 +

#<CALLGRAPH># ARM Linker, 6190004: Last Updated: Tue Mar 21 23:01:30 2023

-

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

+

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

Call chain for Maximum Stack Depth:

main ⇒ MyGPIO_Init

@@ -69,7 +69,7 @@ Function Pointers

  • TIM1_CC_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • TIM1_TRG_COM_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • TIM1_UP_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) -
  • TIM2_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) +
  • TIM2_IRQHandler from main.o(.text.TIM2_IRQHandler) referenced from startup_stm32f10x_md.o(RESET)
  • TIM3_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • TIM4_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • USART1_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) @@ -279,9 +279,6 @@ Global Symbols

    TIM1_UP_IRQHandler (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
    [Address Reference Count : 1]

    -

    TIM2_IRQHandler (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text)) -
    [Address Reference Count : 1]

    TIM3_IRQHandler (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
    [Address Reference Count : 1]

    @@ -317,29 +314,29 @@ Global Symbols

    __scatterload_rt2 (Thumb, 0 bytes, Stack size 0 bytes, init.o(.text), UNUSED) -

    MyGPIO_Init (Thumb, 144 bytes, Stack size 8 bytes, driver_gpio.o(.text.MyGPIO_Init)) +

    MyGPIO_Init (Thumb, 144 bytes, Stack size 8 bytes, driver_gpio.o(.text.MyGPIO_Init))

    [Stack]


    [Called By] -

    MyGPIO_Reset (Thumb, 10 bytes, Stack size 0 bytes, driver_gpio.o(.text.MyGPIO_Reset)) +

    MyGPIO_Toggle (Thumb, 14 bytes, Stack size 0 bytes, driver_gpio.o(.text.MyGPIO_Toggle)) +

    [Called By]

    + +

    MyTimer_EnableInterrupt (Thumb, 38 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_EnableInterrupt))

    [Called By]

    -

    MyGPIO_Set (Thumb, 14 bytes, Stack size 0 bytes, driver_gpio.o(.text.MyGPIO_Set)) +

    MyTimer_Init (Thumb, 144 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Init))

    [Called By]

    -

    MyTimer_Init (Thumb, 152 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Init)) +

    MyTimer_SetPriority (Thumb, 18 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_SetPriority))

    [Called By]

    -

    MyTimer_Start (Thumb, 12 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Start)) -

    [Called By]

    - -

    MyTimer_Stop (Thumb, 12 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Stop)) +

    MyTimer_Start (Thumb, 12 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Start))

    [Called By]

    @@ -348,15 +345,21 @@ Global Symbols
    [Address Reference Count : 1] -

    main (Thumb, 162 bytes, Stack size 16 bytes, main.o(.text.main)) -

    [Stack]