diff --git a/driver/Driver_GPIO.c b/driver/Driver_GPIO.c index 8f2b81c..a057b41 100644 --- a/driver/Driver_GPIO.c +++ b/driver/Driver_GPIO.c @@ -70,3 +70,5 @@ void MyGPIO_Toggle ( GPIO_TypeDef * GPIO , char GPIO_Pin ) { GPIO->ODR ^= 0x1<Timer->CCER &= ~TIM_CCER_CC2P; Timer->Timer->CCMR1 &= ~(TIM_CCMR1_IC2F_0 | TIM_CCMR1_IC2F_1 | TIM_CCMR1_IC2F_2 | TIM_CCMR1_IC2F_3); Timer->Timer->SMCR |= TIM_SMCR_SMS_0 | TIM_SMCR_SMS_1; + + + // activer la clock pour le port GPIOC + RCC->APB2ENR |= RCC_APB2ENR_IOPCEN; + + // configurer PC3 en mode entrée avec une pull-up + GPIOC->CRL &= ~(GPIO_CRL_MODE3 | GPIO_CRL_CNF3); + GPIOC->CRL |= GPIO_CRL_CNF3_1 | GPIO_CRL_MODE3_0; + + // configurer l'interruption pour PC3 en mode bord montant + EXTI->IMR |= EXTI_IMR_MR3; + EXTI->RTSR |= EXTI_RTSR_TR3; + + // configurer la priorité de l'interruption + NVIC_SetPriority(EXTI3_IRQn, 1); + + // activer l'interruption + NVIC_EnableIRQ(EXTI3_IRQn); } @@ -138,3 +156,11 @@ void TIM4_IRQHandler (void) (*TIM4_fx)(); } +int seed(int a) { + return a = 2; +} + +void EXTI3_IRQHandler(void) { + + int a = seed(a); +} \ No newline at end of file diff --git a/projet-voilier/Listings/projet-voilier.map b/projet-voilier/Listings/projet-voilier.map index 7c8448c..7317941 100644 --- a/projet-voilier/Listings/projet-voilier.map +++ b/projet-voilier/Listings/projet-voilier.map @@ -4,9 +4,17 @@ Component: Arm Compiler for Embedded 6.19 Tool: armlink [5e73cb00] Section Cross References +<<<<<<< HEAD main.o(.text.main) refers to driver_adc.o(.text.driver_adc_1_launch_read) for driver_adc_1_launch_read main.o(.text.main) refers to driver_imu.o(.text.driver_IMU_init) for driver_IMU_init main.o(.text.main) refers to driver_imu.o(.text.driver_IMU_read) for driver_IMU_read +======= + main.o(.text.main) refers to driver_gpio.o(.text.MyGPIO_Init) for MyGPIO_Init + main.o(.text.main) refers to driver_uart.o(.text.MyUART_Init) for MyUART_Init + main.o(.text.main) refers to driver_timer.o(.text.MyTimer_Base_Init) for MyTimer_Base_Init + main.o(.text.main) refers to driver_timer.o(.text.MyTimer_ConfigureEncoder) for MyTimer_ConfigureEncoder + main.o(.text.main) refers to driver_timer.o(.text.MyTimer_Start) for MyTimer_Start +>>>>>>> encoder 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] @@ -29,6 +37,8 @@ Section Cross References driver_timer.o(.ARM.exidx.text.TIM3_IRQHandler) refers to driver_timer.o(.text.TIM3_IRQHandler) for [Anonymous Symbol] driver_timer.o(.text.TIM4_IRQHandler) refers to driver_timer.o(.data.TIM4_fx) for TIM4_fx driver_timer.o(.ARM.exidx.text.TIM4_IRQHandler) refers to driver_timer.o(.text.TIM4_IRQHandler) for [Anonymous Symbol] + driver_timer.o(.ARM.exidx.text.seed) refers to driver_timer.o(.text.seed) for [Anonymous Symbol] + driver_timer.o(.ARM.exidx.text.EXTI3_IRQHandler) refers to driver_timer.o(.text.EXTI3_IRQHandler) for [Anonymous Symbol] driver_timer.o(.data.TIM2_fx) refers to driver_timer.o(.text.Bug) for Bug driver_timer.o(.data.TIM3_fx) refers to driver_timer.o(.text.Bug) for Bug driver_timer.o(.data.TIM4_fx) refers to driver_timer.o(.text.Bug) for Bug @@ -44,6 +54,7 @@ Section Cross References driver_adc.o(.text.ADC1_2_IRQHandler) refers to driver_adc.o(.data.ADC1_2_fx) for ADC1_2_fx driver_adc.o(.ARM.exidx.text.ADC1_2_IRQHandler) refers to driver_adc.o(.text.ADC1_2_IRQHandler) for [Anonymous Symbol] driver_adc.o(.data.ADC1_2_fx) refers to driver_adc.o(.text.erreur) for erreur +<<<<<<< HEAD driver_imu.o(.text.driver_IMU_write_register) refers to myspi.o(i.MySPI_Clear_NSS) for MySPI_Clear_NSS driver_imu.o(.text.driver_IMU_write_register) refers to myspi.o(i.MySPI_Send) for MySPI_Send driver_imu.o(.text.driver_IMU_write_register) refers to myspi.o(i.MySPI_Set_NSS) for MySPI_Set_NSS @@ -58,11 +69,17 @@ Section Cross References driver_imu.o(.text.driver_IMU_read) refers to myspi.o(i.MySPI_Read) for MySPI_Read driver_imu.o(.text.driver_IMU_read) refers to myspi.o(i.MySPI_Set_NSS) for MySPI_Set_NSS driver_imu.o(.ARM.exidx.text.driver_IMU_read) refers to driver_imu.o(.text.driver_IMU_read) for [Anonymous Symbol] +======= +>>>>>>> encoder startup_stm32f10x_md.o(STACK) refers (Special) to heapauxi.o(.text) for __use_two_region_memory startup_stm32f10x_md.o(HEAP) refers (Special) to heapauxi.o(.text) for __use_two_region_memory startup_stm32f10x_md.o(RESET) refers (Special) to heapauxi.o(.text) for __use_two_region_memory 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 +<<<<<<< HEAD +======= + startup_stm32f10x_md.o(RESET) refers to driver_timer.o(.text.EXTI3_IRQHandler) for EXTI3_IRQHandler +>>>>>>> encoder startup_stm32f10x_md.o(RESET) refers to driver_adc.o(.text.ADC1_2_IRQHandler) for ADC1_2_IRQHandler startup_stm32f10x_md.o(RESET) refers to driver_timer.o(.text.TIM2_IRQHandler) for TIM2_IRQHandler startup_stm32f10x_md.o(RESET) refers to driver_timer.o(.text.TIM3_IRQHandler) for TIM3_IRQHandler @@ -225,8 +242,10 @@ Removing Unused input sections from the image. Removing driver_timer.o(.ARM.exidx.text.TIM2_IRQHandler), (8 bytes). Removing driver_timer.o(.ARM.exidx.text.TIM3_IRQHandler), (8 bytes). Removing driver_timer.o(.ARM.exidx.text.TIM4_IRQHandler), (8 bytes). + Removing driver_timer.o(.text.seed), (4 bytes). + Removing driver_timer.o(.ARM.exidx.text.seed), (8 bytes). + Removing driver_timer.o(.ARM.exidx.text.EXTI3_IRQHandler), (8 bytes). Removing driver_uart.o(.text), (0 bytes). - Removing driver_uart.o(.text.MyUART_Init), (76 bytes). Removing driver_uart.o(.ARM.exidx.text.MyUART_Init), (8 bytes). Removing driver_uart.o(.text.MyUART_SendByte), (22 bytes). Removing driver_uart.o(.ARM.exidx.text.MyUART_SendByte), (8 bytes). @@ -237,10 +256,15 @@ Removing Unused input sections from the image. Removing driver_adc.o(.ARM.exidx.text.erreur), (8 bytes). Removing driver_adc.o(.text.driver_adc_1_init), (160 bytes). Removing driver_adc.o(.ARM.exidx.text.driver_adc_1_init), (8 bytes). +<<<<<<< HEAD +======= + Removing driver_adc.o(.text.driver_adc_1_launch_read), (18 bytes). +>>>>>>> encoder Removing driver_adc.o(.ARM.exidx.text.driver_adc_1_launch_read), (8 bytes). Removing driver_adc.o(.text.driver_adc_1_read), (16 bytes). Removing driver_adc.o(.ARM.exidx.text.driver_adc_1_read), (8 bytes). Removing driver_adc.o(.ARM.exidx.text.ADC1_2_IRQHandler), (8 bytes). +<<<<<<< HEAD Removing driver_imu.o(.text), (0 bytes). Removing driver_imu.o(.text.driver_IMU_write_register), (30 bytes). Removing driver_imu.o(.ARM.exidx.text.driver_IMU_write_register), (8 bytes). @@ -249,6 +273,8 @@ Removing Unused input sections from the image. Removing driver_imu.o(.rodata.POWER_CTL), (1 bytes). Removing driver_imu.o(.rodata.BW_RATE), (1 bytes). Removing driver_imu.o(.rodata.DATA_FORMAT), (1 bytes). +======= +>>>>>>> encoder Removing system_stm32f10x.o(.text), (0 bytes). Removing system_stm32f10x.o(.ARM.exidx.text.SystemInit), (8 bytes). Removing system_stm32f10x.o(.text.SystemCoreClockUpdate), (110 bytes). @@ -259,7 +285,11 @@ Removing Unused input sections from the image. Removing myspi.o(.revsh_text), (4 bytes). Removing myspi.o(.rrx_text), (6 bytes). +<<<<<<< HEAD 64 unused section(s) (total 1481 bytes) removed from the image. +======= +54 unused section(s) (total 1084 bytes) removed from the image. +>>>>>>> encoder ============================================================================== @@ -389,6 +419,7 @@ Image Symbol Table .text 0x08000242 Section 0 indicate_semi.o(.text) [Anonymous Symbol] 0x08000244 Section 0 driver_adc.o(.text.ADC1_2_IRQHandler) [Anonymous Symbol] 0x08000260 Section 0 driver_timer.o(.text.Bug) +<<<<<<< HEAD [Anonymous Symbol] 0x08000264 Section 0 system_stm32f10x.o(.text.SystemInit) [Anonymous Symbol] 0x08000374 Section 0 driver_timer.o(.text.TIM2_IRQHandler) [Anonymous Symbol] 0x08000390 Section 0 driver_timer.o(.text.TIM3_IRQHandler) @@ -411,6 +442,27 @@ Image Symbol Table Stack_Mem 0x20000278 Data 1024 startup_stm32f10x_md.o(STACK) STACK 0x20000278 Section 1024 startup_stm32f10x_md.o(STACK) __initial_sp 0x20000678 Data 0 startup_stm32f10x_md.o(STACK) +======= + [Anonymous Symbol] 0x08000264 Section 0 driver_timer.o(.text.EXTI3_IRQHandler) + [Anonymous Symbol] 0x08000268 Section 0 driver_gpio.o(.text.MyGPIO_Init) + [Anonymous Symbol] 0x08000304 Section 0 driver_timer.o(.text.MyTimer_Base_Init) + [Anonymous Symbol] 0x08000390 Section 0 driver_timer.o(.text.MyTimer_ConfigureEncoder) + [Anonymous Symbol] 0x08000438 Section 0 driver_timer.o(.text.MyTimer_Start) + [Anonymous Symbol] 0x08000444 Section 0 driver_uart.o(.text.MyUART_Init) + [Anonymous Symbol] 0x08000490 Section 0 system_stm32f10x.o(.text.SystemInit) + [Anonymous Symbol] 0x080005a0 Section 0 driver_timer.o(.text.TIM2_IRQHandler) + [Anonymous Symbol] 0x080005bc Section 0 driver_timer.o(.text.TIM3_IRQHandler) + [Anonymous Symbol] 0x080005d8 Section 0 driver_timer.o(.text.TIM4_IRQHandler) + [Anonymous Symbol] 0x080005f4 Section 0 driver_uart.o(.text.USART3_IRQHandler) + [Anonymous Symbol] 0x08000604 Section 0 driver_adc.o(.text.erreur) + [Anonymous Symbol] 0x08000608 Section 0 main.o(.text.main) + .bss 0x20000010 Section 96 libspace.o(.bss) + Heap_Mem 0x20000070 Data 512 startup_stm32f10x_md.o(HEAP) + HEAP 0x20000070 Section 512 startup_stm32f10x_md.o(HEAP) + Stack_Mem 0x20000270 Data 1024 startup_stm32f10x_md.o(STACK) + STACK 0x20000270 Section 1024 startup_stm32f10x_md.o(STACK) + __initial_sp 0x20000670 Data 0 startup_stm32f10x_md.o(STACK) +>>>>>>> encoder Global Symbols @@ -522,7 +574,6 @@ Image Symbol Table EXTI15_10_IRQHandler 0x080001a3 Thumb Code 0 startup_stm32f10x_md.o(.text) EXTI1_IRQHandler 0x080001a3 Thumb Code 0 startup_stm32f10x_md.o(.text) EXTI2_IRQHandler 0x080001a3 Thumb Code 0 startup_stm32f10x_md.o(.text) - EXTI3_IRQHandler 0x080001a3 Thumb Code 0 startup_stm32f10x_md.o(.text) EXTI4_IRQHandler 0x080001a3 Thumb Code 0 startup_stm32f10x_md.o(.text) EXTI9_5_IRQHandler 0x080001a3 Thumb Code 0 startup_stm32f10x_md.o(.text) FLASH_IRQHandler 0x080001a3 Thumb Code 0 startup_stm32f10x_md.o(.text) @@ -562,6 +613,7 @@ Image Symbol Table __semihosting_library_function 0x08000243 Thumb Code 0 indicate_semi.o(.text) ADC1_2_IRQHandler 0x08000245 Thumb Code 28 driver_adc.o(.text.ADC1_2_IRQHandler) Bug 0x08000261 Thumb Code 2 driver_timer.o(.text.Bug) +<<<<<<< HEAD SystemInit 0x08000265 Thumb Code 272 system_stm32f10x.o(.text.SystemInit) TIM2_IRQHandler 0x08000375 Thumb Code 26 driver_timer.o(.text.TIM2_IRQHandler) TIM3_IRQHandler 0x08000391 Thumb Code 28 driver_timer.o(.text.TIM3_IRQHandler) @@ -586,6 +638,29 @@ Image Symbol Table TIM4_fx 0x20000010 Data 4 driver_timer.o(.data.TIM4_fx) __libspace_start 0x20000018 Data 96 libspace.o(.bss) __temporary_stack_top$libspace 0x20000078 Data 0 libspace.o(.bss) +======= + EXTI3_IRQHandler 0x08000265 Thumb Code 2 driver_timer.o(.text.EXTI3_IRQHandler) + MyGPIO_Init 0x08000269 Thumb Code 140 driver_gpio.o(.text.MyGPIO_Init) + MyTimer_Base_Init 0x08000305 Thumb Code 140 driver_timer.o(.text.MyTimer_Base_Init) + MyTimer_ConfigureEncoder 0x08000391 Thumb Code 168 driver_timer.o(.text.MyTimer_ConfigureEncoder) + MyTimer_Start 0x08000439 Thumb Code 12 driver_timer.o(.text.MyTimer_Start) + MyUART_Init 0x08000445 Thumb Code 76 driver_uart.o(.text.MyUART_Init) + SystemInit 0x08000491 Thumb Code 272 system_stm32f10x.o(.text.SystemInit) + TIM2_IRQHandler 0x080005a1 Thumb Code 26 driver_timer.o(.text.TIM2_IRQHandler) + TIM3_IRQHandler 0x080005bd Thumb Code 28 driver_timer.o(.text.TIM3_IRQHandler) + TIM4_IRQHandler 0x080005d9 Thumb Code 28 driver_timer.o(.text.TIM4_IRQHandler) + USART3_IRQHandler 0x080005f5 Thumb Code 14 driver_uart.o(.text.USART3_IRQHandler) + erreur 0x08000605 Thumb Code 2 driver_adc.o(.text.erreur) + main 0x08000609 Thumb Code 126 main.o(.text.main) + Region$$Table$$Base 0x08000688 Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x080006a8 Number 0 anon$$obj.o(Region$$Table) + ADC1_2_fx 0x20000000 Data 4 driver_adc.o(.data.ADC1_2_fx) + TIM2_fx 0x20000004 Data 4 driver_timer.o(.data.TIM2_fx) + TIM3_fx 0x20000008 Data 4 driver_timer.o(.data.TIM3_fx) + TIM4_fx 0x2000000c Data 4 driver_timer.o(.data.TIM4_fx) + __libspace_start 0x20000010 Data 96 libspace.o(.bss) + __temporary_stack_top$libspace 0x20000070 Data 0 libspace.o(.bss) +>>>>>>> encoder @@ -595,6 +670,7 @@ Memory Map of the image Image Entry point : 0x08000189 +<<<<<<< HEAD Load Region LR_1 (Base: 0x08000000, Size: 0x000007b4, Max: 0xffffffff, ABSOLUTE) Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000007a0, Max: 0xffffffff, ABSOLUTE) @@ -704,6 +780,114 @@ Memory Map of the image 0x20000018 - 0x00000060 Zero RW 184 .bss c_w.l(libspace.o) 0x20000078 - 0x00000200 Zero RW 112 HEAP startup_stm32f10x_md.o 0x20000278 - 0x00000400 Zero RW 111 STACK startup_stm32f10x_md.o +======= + Load Region LR_1 (Base: 0x08000000, Size: 0x000006b8, Max: 0xffffffff, ABSOLUTE) + + Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000006a8, Max: 0xffffffff, ABSOLUTE) + + Exec Addr Load Addr Size Type Attr Idx E Section Name Object + + 0x08000000 0x08000000 0x000000ec Data RO 102 RESET startup_stm32f10x_md.o + 0x080000ec 0x080000ec 0x00000008 Code RO 127 * !!!main c_w.l(__main.o) + 0x080000f4 0x080000f4 0x00000034 Code RO 292 !!!scatter c_w.l(__scatter.o) + 0x08000128 0x08000128 0x0000001a Code RO 294 !!handler_copy c_w.l(__scatter_copy.o) + 0x08000142 0x08000142 0x00000002 PAD + 0x08000144 0x08000144 0x0000001c Code RO 296 !!handler_zi c_w.l(__scatter_zi.o) + 0x08000160 0x08000160 0x00000002 Code RO 154 .ARM.Collect$$libinit$$00000000 c_w.l(libinit.o) + 0x08000162 0x08000162 0x00000000 Code RO 161 .ARM.Collect$$libinit$$00000002 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 163 .ARM.Collect$$libinit$$00000004 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 165 .ARM.Collect$$libinit$$00000006 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 168 .ARM.Collect$$libinit$$0000000C c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 170 .ARM.Collect$$libinit$$0000000E c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 172 .ARM.Collect$$libinit$$00000010 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 175 .ARM.Collect$$libinit$$00000013 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 177 .ARM.Collect$$libinit$$00000015 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 179 .ARM.Collect$$libinit$$00000017 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 181 .ARM.Collect$$libinit$$00000019 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 183 .ARM.Collect$$libinit$$0000001B c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 185 .ARM.Collect$$libinit$$0000001D c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 187 .ARM.Collect$$libinit$$0000001F c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 189 .ARM.Collect$$libinit$$00000021 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 191 .ARM.Collect$$libinit$$00000023 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 193 .ARM.Collect$$libinit$$00000025 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 195 .ARM.Collect$$libinit$$00000027 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 199 .ARM.Collect$$libinit$$0000002E c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 201 .ARM.Collect$$libinit$$00000030 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 203 .ARM.Collect$$libinit$$00000032 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 205 .ARM.Collect$$libinit$$00000034 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000002 Code RO 206 .ARM.Collect$$libinit$$00000035 c_w.l(libinit2.o) + 0x08000164 0x08000164 0x00000002 Code RO 228 .ARM.Collect$$libshutdown$$00000000 c_w.l(libshutdown.o) + 0x08000166 0x08000166 0x00000000 Code RO 243 .ARM.Collect$$libshutdown$$00000002 c_w.l(libshutdown2.o) + 0x08000166 0x08000166 0x00000000 Code RO 245 .ARM.Collect$$libshutdown$$00000004 c_w.l(libshutdown2.o) + 0x08000166 0x08000166 0x00000000 Code RO 248 .ARM.Collect$$libshutdown$$00000007 c_w.l(libshutdown2.o) + 0x08000166 0x08000166 0x00000000 Code RO 251 .ARM.Collect$$libshutdown$$0000000A c_w.l(libshutdown2.o) + 0x08000166 0x08000166 0x00000000 Code RO 253 .ARM.Collect$$libshutdown$$0000000C c_w.l(libshutdown2.o) + 0x08000166 0x08000166 0x00000000 Code RO 256 .ARM.Collect$$libshutdown$$0000000F c_w.l(libshutdown2.o) + 0x08000166 0x08000166 0x00000002 Code RO 257 .ARM.Collect$$libshutdown$$00000010 c_w.l(libshutdown2.o) + 0x08000168 0x08000168 0x00000000 Code RO 129 .ARM.Collect$$rtentry$$00000000 c_w.l(__rtentry.o) + 0x08000168 0x08000168 0x00000000 Code RO 131 .ARM.Collect$$rtentry$$00000002 c_w.l(__rtentry2.o) + 0x08000168 0x08000168 0x00000006 Code RO 143 .ARM.Collect$$rtentry$$00000004 c_w.l(__rtentry4.o) + 0x0800016e 0x0800016e 0x00000000 Code RO 133 .ARM.Collect$$rtentry$$00000009 c_w.l(__rtentry2.o) + 0x0800016e 0x0800016e 0x00000004 Code RO 134 .ARM.Collect$$rtentry$$0000000A c_w.l(__rtentry2.o) + 0x08000172 0x08000172 0x00000000 Code RO 136 .ARM.Collect$$rtentry$$0000000C c_w.l(__rtentry2.o) + 0x08000172 0x08000172 0x00000008 Code RO 137 .ARM.Collect$$rtentry$$0000000D c_w.l(__rtentry2.o) + 0x0800017a 0x0800017a 0x00000002 Code RO 158 .ARM.Collect$$rtexit$$00000000 c_w.l(rtexit.o) + 0x0800017c 0x0800017c 0x00000000 Code RO 208 .ARM.Collect$$rtexit$$00000002 c_w.l(rtexit2.o) + 0x0800017c 0x0800017c 0x00000004 Code RO 209 .ARM.Collect$$rtexit$$00000003 c_w.l(rtexit2.o) + 0x08000180 0x08000180 0x00000006 Code RO 210 .ARM.Collect$$rtexit$$00000004 c_w.l(rtexit2.o) + 0x08000186 0x08000186 0x00000002 PAD + 0x08000188 0x08000188 0x00000040 Code RO 103 * .text startup_stm32f10x_md.o + 0x080001c8 0x080001c8 0x00000006 Code RO 125 .text c_w.l(heapauxi.o) + 0x080001ce 0x080001ce 0x0000004a Code RO 145 .text c_w.l(sys_stackheap_outer.o) + 0x08000218 0x08000218 0x00000012 Code RO 147 .text c_w.l(exit.o) + 0x0800022a 0x0800022a 0x00000002 PAD + 0x0800022c 0x0800022c 0x00000008 Code RO 155 .text c_w.l(libspace.o) + 0x08000234 0x08000234 0x0000000c Code RO 218 .text c_w.l(sys_exit.o) + 0x08000240 0x08000240 0x00000002 Code RO 233 .text c_w.l(use_no_semi.o) + 0x08000242 0x08000242 0x00000000 Code RO 235 .text c_w.l(indicate_semi.o) + 0x08000242 0x08000242 0x00000002 PAD + 0x08000244 0x08000244 0x0000001c Code RO 90 .text.ADC1_2_IRQHandler driver_adc.o + 0x08000260 0x08000260 0x00000002 Code RO 41 .text.Bug driver_timer.o + 0x08000262 0x08000262 0x00000002 PAD + 0x08000264 0x08000264 0x00000002 Code RO 53 .text.EXTI3_IRQHandler driver_timer.o + 0x08000266 0x08000266 0x00000002 PAD + 0x08000268 0x08000268 0x0000009c Code RO 11 .text.MyGPIO_Init driver_gpio.o + 0x08000304 0x08000304 0x0000008c Code RO 29 .text.MyTimer_Base_Init driver_timer.o + 0x08000390 0x08000390 0x000000a8 Code RO 39 .text.MyTimer_ConfigureEncoder driver_timer.o + 0x08000438 0x08000438 0x0000000c Code RO 31 .text.MyTimer_Start driver_timer.o + 0x08000444 0x08000444 0x0000004c Code RO 66 .text.MyUART_Init driver_uart.o + 0x08000490 0x08000490 0x00000110 Code RO 110 .text.SystemInit system_stm32f10x.o + 0x080005a0 0x080005a0 0x0000001a Code RO 45 .text.TIM2_IRQHandler driver_timer.o + 0x080005ba 0x080005ba 0x00000002 PAD + 0x080005bc 0x080005bc 0x0000001c Code RO 47 .text.TIM3_IRQHandler driver_timer.o + 0x080005d8 0x080005d8 0x0000001c Code RO 49 .text.TIM4_IRQHandler driver_timer.o + 0x080005f4 0x080005f4 0x0000000e Code RO 72 .text.USART3_IRQHandler driver_uart.o + 0x08000602 0x08000602 0x00000002 PAD + 0x08000604 0x08000604 0x00000002 Code RO 82 .text.erreur driver_adc.o + 0x08000606 0x08000606 0x00000002 PAD + 0x08000608 0x08000608 0x0000007e Code RO 2 .text.main main.o + 0x08000686 0x08000686 0x00000002 PAD + 0x08000688 0x08000688 0x00000020 Data RO 291 Region$$Table anon$$obj.o + + + Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x080006a8, Size: 0x00000010, Max: 0xffffffff, ABSOLUTE) + + Exec Addr Load Addr Size Type Attr Idx E Section Name Object + + 0x20000000 0x080006a8 0x00000004 Data RW 92 .data.ADC1_2_fx driver_adc.o + 0x20000004 0x080006ac 0x00000004 Data RW 55 .data.TIM2_fx driver_timer.o + 0x20000008 0x080006b0 0x00000004 Data RW 56 .data.TIM3_fx driver_timer.o + 0x2000000c 0x080006b4 0x00000004 Data RW 57 .data.TIM4_fx driver_timer.o + + + Execution Region ER_ZI (Exec base: 0x20000010, Load base: 0x080006b8, Size: 0x00000660, Max: 0xffffffff, ABSOLUTE) + + Exec Addr Load Addr Size Type Attr Idx E Section Name Object + + 0x20000010 - 0x00000060 Zero RW 156 .bss c_w.l(libspace.o) + 0x20000070 - 0x00000200 Zero RW 101 HEAP startup_stm32f10x_md.o + 0x20000270 - 0x00000400 Zero RW 100 STACK startup_stm32f10x_md.o +>>>>>>> encoder ============================================================================== @@ -713,16 +897,28 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name +<<<<<<< HEAD 48 0 0 4 0 4525 driver_adc.o 126 0 0 0 0 2309 driver_imu.o 84 0 0 12 0 6988 driver_timer.o 14 0 0 0 0 2250 driver_uart.o 28 0 0 0 0 1165 main.o +======= + 30 0 0 4 0 4524 driver_adc.o + 156 16 0 0 0 2108 driver_gpio.o + 406 0 0 12 0 8028 driver_timer.o + 90 0 0 0 0 2250 driver_uart.o + 126 0 0 0 0 2548 main.o +>>>>>>> encoder 64 26 236 0 1536 864 startup_stm32f10x_md.o 272 0 0 0 0 2813 system_stm32f10x.o ---------------------------------------------------------------------- +<<<<<<< HEAD 648 26 268 16 1536 20914 Object Totals +======= + 1156 42 268 16 1536 23135 Object Totals +>>>>>>> encoder 0 0 32 0 0 0 (incl. Generated) 12 0 0 0 0 0 (incl. Padding) @@ -773,6 +969,7 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug +<<<<<<< HEAD 1684 122 268 20 1632 21482 Grand Totals 1684 122 268 20 1632 21482 ELF Image Totals 1684 122 268 20 0 0 ROM Totals @@ -782,6 +979,17 @@ Image component sizes Total RO Size (Code + RO Data) 1952 ( 1.91kB) Total RW Size (RW Data + ZI Data) 1652 ( 1.61kB) Total ROM Size (Code + RO Data + RW Data) 1972 ( 1.93kB) +======= + 1436 58 268 16 1632 23511 Grand Totals + 1436 58 268 16 1632 23511 ELF Image Totals + 1436 58 268 16 0 0 ROM Totals + +============================================================================== + + Total RO Size (Code + RO Data) 1704 ( 1.66kB) + Total RW Size (RW Data + ZI Data) 1648 ( 1.61kB) + Total ROM Size (Code + RO Data + RW Data) 1720 ( 1.68kB) +>>>>>>> encoder ============================================================================== diff --git a/projet-voilier/Listings/projet-voilier_reel.map b/projet-voilier/Listings/projet-voilier_reel.map index 4ba18b3..0fca834 100644 --- a/projet-voilier/Listings/projet-voilier_reel.map +++ b/projet-voilier/Listings/projet-voilier_reel.map @@ -4,6 +4,7 @@ Component: ARM Compiler 5.06 update 7 (build 960) Tool: armlink [4d3601] Section Cross References +<<<<<<< HEAD main.o(i.main) refers to driver_adc.o(i.driver_adc_1_launch_read) for driver_adc_1_launch_read main.o(i.main) refers to driver_imu.o(i.driver_IMU_init) for driver_IMU_init main.o(i.main) refers to driver_imu.o(i.driver_IMU_read) for driver_IMU_read @@ -33,6 +34,64 @@ Section Cross References startup_stm32f10x_md.o(RESET) refers to driver_timer.o(i.TIM3_IRQHandler) for TIM3_IRQHandler startup_stm32f10x_md.o(RESET) refers to driver_timer.o(i.TIM4_IRQHandler) for TIM4_IRQHandler startup_stm32f10x_md.o(.text) refers to system_stm32f10x.o(i.SystemInit) for SystemInit +======= + main.o(.text.main) refers to driver_gpio.o(.text.MyGPIO_Init) for MyGPIO_Init + main.o(.text.main) refers to driver_uart.o(.text.MyUART_Init) for MyUART_Init + main.o(.text.main) refers to driver_timer.o(.text.MyTimer_Base_Init) for MyTimer_Base_Init + main.o(.text.main) refers to driver_timer.o(.text.MyTimer_ConfigureEncoder) for MyTimer_ConfigureEncoder + main.o(.text.main) refers to driver_timer.o(.text.MyTimer_Start) for MyTimer_Start + main.o(.ARM.exidx.text.main) refers to main.o(.text.main) for [Anonymous Symbol] + main.o(.ARM.exidx.text.EXTI15_10_IRQHandler) refers to main.o(.text.EXTI15_10_IRQHandler) 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] + driver_gpio.o(.ARM.exidx.text.MyGPIO_Set) refers to driver_gpio.o(.text.MyGPIO_Set) for [Anonymous Symbol] + driver_gpio.o(.ARM.exidx.text.MyGPIO_Reset) refers to driver_gpio.o(.text.MyGPIO_Reset) for [Anonymous Symbol] + driver_gpio.o(.ARM.exidx.text.MyGPIO_Toggle) refers to driver_gpio.o(.text.MyGPIO_Toggle) for [Anonymous Symbol] + driver_timer.o(.ARM.exidx.text.MyTimer_Base_Init) refers to driver_timer.o(.text.MyTimer_Base_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_ConfigurePWM) refers to driver_timer.o(.text.MyTimer_ConfigurePWM) for [Anonymous Symbol] + driver_timer.o(.ARM.exidx.text.MyTimer_SetPWMDutyCycle) refers to driver_timer.o(.text.MyTimer_SetPWMDutyCycle) for [Anonymous Symbol] + driver_timer.o(.ARM.exidx.text.MyTimer_ConfigureEncoder) refers to driver_timer.o(.text.MyTimer_ConfigureEncoder) for [Anonymous Symbol] + driver_timer.o(.ARM.exidx.text.Bug) refers to driver_timer.o(.text.Bug) for [Anonymous Symbol] + driver_timer.o(.text.MyTimer_ActiveIT) refers to driver_timer.o(.data.TIM2_fx) for TIM2_fx + driver_timer.o(.text.MyTimer_ActiveIT) refers to driver_timer.o(.data.TIM4_fx) for TIM4_fx + driver_timer.o(.text.MyTimer_ActiveIT) refers to driver_timer.o(.data.TIM3_fx) for TIM3_fx + driver_timer.o(.ARM.exidx.text.MyTimer_ActiveIT) refers to driver_timer.o(.text.MyTimer_ActiveIT) for [Anonymous Symbol] + driver_timer.o(.text.TIM2_IRQHandler) refers to driver_timer.o(.data.TIM2_fx) for TIM2_fx + driver_timer.o(.ARM.exidx.text.TIM2_IRQHandler) refers to driver_timer.o(.text.TIM2_IRQHandler) for [Anonymous Symbol] + driver_timer.o(.text.TIM3_IRQHandler) refers to driver_timer.o(.data.TIM3_fx) for TIM3_fx + driver_timer.o(.ARM.exidx.text.TIM3_IRQHandler) refers to driver_timer.o(.text.TIM3_IRQHandler) for [Anonymous Symbol] + driver_timer.o(.text.TIM4_IRQHandler) refers to driver_timer.o(.data.TIM4_fx) for TIM4_fx + driver_timer.o(.ARM.exidx.text.TIM4_IRQHandler) refers to driver_timer.o(.text.TIM4_IRQHandler) for [Anonymous Symbol] + driver_timer.o(.ARM.exidx.text.seed) refers to driver_timer.o(.text.seed) for [Anonymous Symbol] + driver_timer.o(.ARM.exidx.text.EXTI3_IRQHandler) refers to driver_timer.o(.text.EXTI3_IRQHandler) for [Anonymous Symbol] + driver_timer.o(.data.TIM2_fx) refers to driver_timer.o(.text.Bug) for Bug + driver_timer.o(.data.TIM3_fx) refers to driver_timer.o(.text.Bug) for Bug + driver_timer.o(.data.TIM4_fx) refers to driver_timer.o(.text.Bug) for Bug + driver_uart.o(.ARM.exidx.text.MyUART_Init) refers to driver_uart.o(.text.MyUART_Init) for [Anonymous Symbol] + driver_uart.o(.ARM.exidx.text.MyUART_SendByte) refers to driver_uart.o(.text.MyUART_SendByte) for [Anonymous Symbol] + driver_uart.o(.ARM.exidx.text.MyUART_ReceiveByte) refers to driver_uart.o(.text.MyUART_ReceiveByte) for [Anonymous Symbol] + driver_uart.o(.ARM.exidx.text.USART3_IRQHandler) refers to driver_uart.o(.text.USART3_IRQHandler) for [Anonymous Symbol] + driver_adc.o(.ARM.exidx.text.erreur) refers to driver_adc.o(.text.erreur) for [Anonymous Symbol] + driver_adc.o(.text.driver_adc_1_init) refers to driver_adc.o(.data.ADC1_2_fx) for ADC1_2_fx + driver_adc.o(.ARM.exidx.text.driver_adc_1_init) refers to driver_adc.o(.text.driver_adc_1_init) for [Anonymous Symbol] + driver_adc.o(.ARM.exidx.text.driver_adc_1_launch_read) refers to driver_adc.o(.text.driver_adc_1_launch_read) for [Anonymous Symbol] + driver_adc.o(.ARM.exidx.text.driver_adc_1_read) refers to driver_adc.o(.text.driver_adc_1_read) for [Anonymous Symbol] + driver_adc.o(.text.ADC1_2_IRQHandler) refers to driver_adc.o(.data.ADC1_2_fx) for ADC1_2_fx + driver_adc.o(.ARM.exidx.text.ADC1_2_IRQHandler) refers to driver_adc.o(.text.ADC1_2_IRQHandler) for [Anonymous Symbol] + driver_adc.o(.data.ADC1_2_fx) refers to driver_adc.o(.text.erreur) for erreur + 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 driver_timer.o(.text.EXTI3_IRQHandler) for EXTI3_IRQHandler + startup_stm32f10x_md.o(RESET) refers to driver_adc.o(.text.ADC1_2_IRQHandler) for ADC1_2_IRQHandler + startup_stm32f10x_md.o(RESET) refers to driver_timer.o(.text.TIM2_IRQHandler) for TIM2_IRQHandler + startup_stm32f10x_md.o(RESET) refers to driver_timer.o(.text.TIM3_IRQHandler) for TIM3_IRQHandler + startup_stm32f10x_md.o(RESET) refers to driver_timer.o(.text.TIM4_IRQHandler) for TIM4_IRQHandler + startup_stm32f10x_md.o(RESET) refers to driver_uart.o(.text.USART3_IRQHandler) for USART3_IRQHandler + startup_stm32f10x_md.o(RESET) refers to main.o(.text.EXTI15_10_IRQHandler) for EXTI15_10_IRQHandler + startup_stm32f10x_md.o(.text) refers to system_stm32f10x.o(.text.SystemInit) for SystemInit +>>>>>>> encoder startup_stm32f10x_md.o(.text) refers to entry.o(.ARM.Collect$$$$00000000) for __main system_stm32f10x.o(i.SetSysClock) refers to system_stm32f10x.o(i.SetSysClockTo72) for SetSysClockTo72 system_stm32f10x.o(i.SystemCoreClockUpdate) refers to system_stm32f10x.o(.data) for SystemCoreClock @@ -65,6 +124,7 @@ Section Cross References Removing Unused input sections from the image. +<<<<<<< HEAD Removing main.o(.rev16_text), (4 bytes). Removing main.o(.revsh_text), (4 bytes). Removing main.o(.rrx_text), (6 bytes). @@ -95,6 +155,57 @@ Removing Unused input sections from the image. Removing driver_imu.o(.revsh_text), (4 bytes). Removing driver_imu.o(.rrx_text), (6 bytes). Removing driver_imu.o(.constdata), (3 bytes). +======= + Removing main.o(.text), (0 bytes). + Removing main.o(.ARM.exidx.text.main), (8 bytes). + Removing main.o(.ARM.exidx.text.EXTI15_10_IRQHandler), (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), (12 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), (16 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_Base_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(.text.MyTimer_ConfigurePWM), (166 bytes). + Removing driver_timer.o(.ARM.exidx.text.MyTimer_ConfigurePWM), (8 bytes). + Removing driver_timer.o(.text.MyTimer_SetPWMDutyCycle), (82 bytes). + Removing driver_timer.o(.ARM.exidx.text.MyTimer_SetPWMDutyCycle), (8 bytes). + Removing driver_timer.o(.ARM.exidx.text.MyTimer_ConfigureEncoder), (8 bytes). + Removing driver_timer.o(.ARM.exidx.text.Bug), (8 bytes). + Removing driver_timer.o(.text.MyTimer_ActiveIT), (150 bytes). + Removing driver_timer.o(.ARM.exidx.text.MyTimer_ActiveIT), (8 bytes). + Removing driver_timer.o(.ARM.exidx.text.TIM2_IRQHandler), (8 bytes). + Removing driver_timer.o(.ARM.exidx.text.TIM3_IRQHandler), (8 bytes). + Removing driver_timer.o(.ARM.exidx.text.TIM4_IRQHandler), (8 bytes). + Removing driver_timer.o(.text.seed), (4 bytes). + Removing driver_timer.o(.ARM.exidx.text.seed), (8 bytes). + Removing driver_timer.o(.ARM.exidx.text.EXTI3_IRQHandler), (8 bytes). + Removing driver_uart.o(.text), (0 bytes). + Removing driver_uart.o(.ARM.exidx.text.MyUART_Init), (8 bytes). + Removing driver_uart.o(.text.MyUART_SendByte), (22 bytes). + Removing driver_uart.o(.ARM.exidx.text.MyUART_SendByte), (8 bytes). + Removing driver_uart.o(.text.MyUART_ReceiveByte), (24 bytes). + Removing driver_uart.o(.ARM.exidx.text.MyUART_ReceiveByte), (8 bytes). + Removing driver_uart.o(.ARM.exidx.text.USART3_IRQHandler), (8 bytes). + Removing driver_adc.o(.text), (0 bytes). + Removing driver_adc.o(.ARM.exidx.text.erreur), (8 bytes). + Removing driver_adc.o(.text.driver_adc_1_init), (160 bytes). + Removing driver_adc.o(.ARM.exidx.text.driver_adc_1_init), (8 bytes). + Removing driver_adc.o(.text.driver_adc_1_launch_read), (18 bytes). + Removing driver_adc.o(.ARM.exidx.text.driver_adc_1_launch_read), (8 bytes). + Removing driver_adc.o(.text.driver_adc_1_read), (16 bytes). + Removing driver_adc.o(.ARM.exidx.text.driver_adc_1_read), (8 bytes). + Removing driver_adc.o(.ARM.exidx.text.ADC1_2_IRQHandler), (8 bytes). +>>>>>>> encoder Removing startup_stm32f10x_md.o(HEAP), (512 bytes). Removing system_stm32f10x.o(.rev16_text), (4 bytes). Removing system_stm32f10x.o(.revsh_text), (4 bytes). @@ -105,7 +216,11 @@ Removing Unused input sections from the image. Removing myspi.o(.revsh_text), (4 bytes). Removing myspi.o(.rrx_text), (6 bytes). +<<<<<<< HEAD 39 unused section(s) (total 1899 bytes) removed from the image. +======= +56 unused section(s) (total 1604 bytes) removed from the image. +>>>>>>> encoder ============================================================================== @@ -115,7 +230,11 @@ Image Symbol Table Symbol Name Value Ov Type Size Object(Section) +<<<<<<< HEAD ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10a.o ABSOLUTE +======= + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE +>>>>>>> encoder ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7a.o ABSOLUTE @@ -124,6 +243,7 @@ Image Symbol Table ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11b.o ABSOLUTE +<<<<<<< HEAD ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9a.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9b.o ABSOLUTE @@ -143,6 +263,13 @@ Image Symbol Table RTE\Device\STM32F103RB\startup_stm32f10x_md.s 0x00000000 Number 0 startup_stm32f10x_md.o ABSOLUTE RTE\Device\STM32F103RB\system_stm32f10x.c 0x00000000 Number 0 system_stm32f10x.o ABSOLUTE RTE\\Device\\STM32F103RB\\system_stm32f10x.c 0x00000000 Number 0 system_stm32f10x.o ABSOLUTE +======= + Driver_ADC.c 0x00000000 Number 0 driver_adc.o ABSOLUTE + Driver_GPIO.c 0x00000000 Number 0 driver_gpio.o ABSOLUTE + Driver_Timer.c 0x00000000 Number 0 driver_timer.o ABSOLUTE + Driver_UART.c 0x00000000 Number 0 driver_uart.o ABSOLUTE + RTE/Device/STM32F103RB/startup_stm32f10x_md.s 0x00000000 Number 0 startup_stm32f10x_md.o ABSOLUTE +>>>>>>> encoder dc.s 0x00000000 Number 0 dc.o ABSOLUTE handlers.s 0x00000000 Number 0 handlers.o ABSOLUTE init.s 0x00000000 Number 0 init.o ABSOLUTE @@ -155,6 +282,7 @@ Image Symbol Table .ARM.Collect$$$$00000008 0x080000f4 Section 0 entry7b.o(.ARM.Collect$$$$00000008) .ARM.Collect$$$$0000000A 0x080000f4 Section 0 entry8b.o(.ARM.Collect$$$$0000000A) .ARM.Collect$$$$0000000B 0x080000f4 Section 8 entry9a.o(.ARM.Collect$$$$0000000B) +<<<<<<< HEAD .ARM.Collect$$$$0000000E 0x080000fc Section 4 entry12b.o(.ARM.Collect$$$$0000000E) .ARM.Collect$$$$0000000F 0x08000100 Section 0 entry10a.o(.ARM.Collect$$$$0000000F) .ARM.Collect$$$$00000011 0x08000100 Section 0 entry11a.o(.ARM.Collect$$$$00000011) @@ -190,6 +318,34 @@ Image Symbol Table .data 0x2000000c Section 4 driver_adc.o(.data) .data 0x20000010 Section 4 myspi.o(.data) STACK 0x20000018 Section 1024 startup_stm32f10x_md.o(STACK) +======= + __lit__00000000 0x080000fc Data 4 entry2.o(.ARM.Collect$$$$00002712) + .ARM.Collect$$$$0000000D 0x080000fc Section 0 entry10a.o(.ARM.Collect$$$$0000000D) + .ARM.Collect$$$$0000000F 0x080000fc Section 0 entry11a.o(.ARM.Collect$$$$0000000F) + .ARM.Collect$$$$00002712 0x080000fc Section 4 entry2.o(.ARM.Collect$$$$00002712) + .text 0x08000100 Section 36 startup_stm32f10x_md.o(.text) + .text 0x08000124 Section 36 init.o(.text) + [Anonymous Symbol] 0x08000148 Section 0 driver_adc.o(.text.ADC1_2_IRQHandler) + [Anonymous Symbol] 0x08000164 Section 0 driver_timer.o(.text.Bug) + [Anonymous Symbol] 0x08000168 Section 0 main.o(.text.EXTI15_10_IRQHandler) + [Anonymous Symbol] 0x08000184 Section 0 driver_timer.o(.text.EXTI3_IRQHandler) + [Anonymous Symbol] 0x08000188 Section 0 driver_gpio.o(.text.MyGPIO_Init) + [Anonymous Symbol] 0x08000224 Section 0 driver_timer.o(.text.MyTimer_Base_Init) + [Anonymous Symbol] 0x080002b0 Section 0 driver_timer.o(.text.MyTimer_ConfigureEncoder) + [Anonymous Symbol] 0x08000358 Section 0 driver_timer.o(.text.MyTimer_Start) + [Anonymous Symbol] 0x08000364 Section 0 driver_uart.o(.text.MyUART_Init) + [Anonymous Symbol] 0x080003b0 Section 0 system_stm32f10x.o(.text.SystemInit) + [Anonymous Symbol] 0x080004c0 Section 0 driver_timer.o(.text.TIM2_IRQHandler) + [Anonymous Symbol] 0x080004dc Section 0 driver_timer.o(.text.TIM3_IRQHandler) + [Anonymous Symbol] 0x080004f8 Section 0 driver_timer.o(.text.TIM4_IRQHandler) + [Anonymous Symbol] 0x08000514 Section 0 driver_uart.o(.text.USART3_IRQHandler) + [Anonymous Symbol] 0x08000524 Section 0 driver_adc.o(.text.erreur) + [Anonymous Symbol] 0x08000528 Section 0 main.o(.text.main) + i.__scatterload_copy 0x080005de Section 14 handlers.o(i.__scatterload_copy) + i.__scatterload_null 0x080005ec Section 2 handlers.o(i.__scatterload_null) + i.__scatterload_zeroinit 0x080005ee Section 14 handlers.o(i.__scatterload_zeroinit) + STACK 0x20000010 Section 1024 startup_stm32f10x_md.o(STACK) +>>>>>>> encoder Global Symbols @@ -213,6 +369,7 @@ Image Symbol Table _main_clock 0x080000f5 Thumb Code 0 entry7b.o(.ARM.Collect$$$$00000008) _main_cpp_init 0x080000f5 Thumb Code 0 entry8b.o(.ARM.Collect$$$$0000000A) _main_init 0x080000f5 Thumb Code 0 entry9a.o(.ARM.Collect$$$$0000000B) +<<<<<<< HEAD __rt_lib_shutdown_fini 0x080000fd Thumb Code 0 entry12b.o(.ARM.Collect$$$$0000000E) __rt_final_cpp 0x08000101 Thumb Code 0 entry10a.o(.ARM.Collect$$$$0000000F) __rt_final_exit 0x08000101 Thumb Code 0 entry11a.o(.ARM.Collect$$$$00000011) @@ -295,6 +452,84 @@ Image Symbol Table ADC1_2_fx 0x2000000c Data 4 driver_adc.o(.data) ActiveSPI 0x20000010 Data 4 myspi.o(.data) __initial_sp 0x20000418 Data 0 startup_stm32f10x_md.o(STACK) +======= + __rt_final_cpp 0x080000fd Thumb Code 0 entry10a.o(.ARM.Collect$$$$0000000D) + __rt_final_exit 0x080000fd Thumb Code 0 entry11a.o(.ARM.Collect$$$$0000000F) + Reset_Handler 0x08000101 Thumb Code 8 startup_stm32f10x_md.o(.text) + NMI_Handler 0x08000109 Thumb Code 2 startup_stm32f10x_md.o(.text) + HardFault_Handler 0x0800010b Thumb Code 2 startup_stm32f10x_md.o(.text) + MemManage_Handler 0x0800010d Thumb Code 2 startup_stm32f10x_md.o(.text) + BusFault_Handler 0x0800010f Thumb Code 2 startup_stm32f10x_md.o(.text) + UsageFault_Handler 0x08000111 Thumb Code 2 startup_stm32f10x_md.o(.text) + SVC_Handler 0x08000113 Thumb Code 2 startup_stm32f10x_md.o(.text) + DebugMon_Handler 0x08000115 Thumb Code 2 startup_stm32f10x_md.o(.text) + PendSV_Handler 0x08000117 Thumb Code 2 startup_stm32f10x_md.o(.text) + SysTick_Handler 0x08000119 Thumb Code 2 startup_stm32f10x_md.o(.text) + CAN1_RX1_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + CAN1_SCE_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + DMA1_Channel1_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + DMA1_Channel2_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + DMA1_Channel3_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + DMA1_Channel4_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + DMA1_Channel5_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + DMA1_Channel6_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + DMA1_Channel7_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + EXTI0_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + EXTI1_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + EXTI2_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + EXTI4_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + EXTI9_5_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + FLASH_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + I2C1_ER_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + I2C1_EV_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + I2C2_ER_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + I2C2_EV_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + PVD_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + RCC_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + RTCAlarm_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + RTC_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + SPI1_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + SPI2_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + TAMPER_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + TIM1_BRK_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + 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) + USART1_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + USART2_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + USBWakeUp_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + USB_HP_CAN1_TX_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + USB_LP_CAN1_RX0_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + WWDG_IRQHandler 0x0800011b Thumb Code 0 startup_stm32f10x_md.o(.text) + __scatterload 0x08000125 Thumb Code 28 init.o(.text) + __scatterload_rt2 0x08000125 Thumb Code 0 init.o(.text) + ADC1_2_IRQHandler 0x08000149 Thumb Code 28 driver_adc.o(.text.ADC1_2_IRQHandler) + Bug 0x08000165 Thumb Code 2 driver_timer.o(.text.Bug) + EXTI15_10_IRQHandler 0x08000169 Thumb Code 26 main.o(.text.EXTI15_10_IRQHandler) + EXTI3_IRQHandler 0x08000185 Thumb Code 2 driver_timer.o(.text.EXTI3_IRQHandler) + MyGPIO_Init 0x08000189 Thumb Code 140 driver_gpio.o(.text.MyGPIO_Init) + MyTimer_Base_Init 0x08000225 Thumb Code 140 driver_timer.o(.text.MyTimer_Base_Init) + MyTimer_ConfigureEncoder 0x080002b1 Thumb Code 168 driver_timer.o(.text.MyTimer_ConfigureEncoder) + MyTimer_Start 0x08000359 Thumb Code 12 driver_timer.o(.text.MyTimer_Start) + MyUART_Init 0x08000365 Thumb Code 76 driver_uart.o(.text.MyUART_Init) + SystemInit 0x080003b1 Thumb Code 272 system_stm32f10x.o(.text.SystemInit) + TIM2_IRQHandler 0x080004c1 Thumb Code 26 driver_timer.o(.text.TIM2_IRQHandler) + TIM3_IRQHandler 0x080004dd Thumb Code 28 driver_timer.o(.text.TIM3_IRQHandler) + TIM4_IRQHandler 0x080004f9 Thumb Code 28 driver_timer.o(.text.TIM4_IRQHandler) + USART3_IRQHandler 0x08000515 Thumb Code 14 driver_uart.o(.text.USART3_IRQHandler) + erreur 0x08000525 Thumb Code 2 driver_adc.o(.text.erreur) + main 0x08000529 Thumb Code 182 main.o(.text.main) + __scatterload_copy 0x080005df Thumb Code 14 handlers.o(i.__scatterload_copy) + __scatterload_null 0x080005ed Thumb Code 2 handlers.o(i.__scatterload_null) + __scatterload_zeroinit 0x080005ef Thumb Code 14 handlers.o(i.__scatterload_zeroinit) + Region$$Table$$Base 0x080005fc Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x0800061c Number 0 anon$$obj.o(Region$$Table) + ADC1_2_fx 0x20000000 Data 4 driver_adc.o(.data.ADC1_2_fx) + TIM2_fx 0x20000004 Data 4 driver_timer.o(.data.TIM2_fx) + TIM3_fx 0x20000008 Data 4 driver_timer.o(.data.TIM3_fx) + TIM4_fx 0x2000000c Data 4 driver_timer.o(.data.TIM4_fx) + __initial_sp 0x20000410 Data 0 startup_stm32f10x_md.o(STACK) +>>>>>>> encoder @@ -304,6 +539,7 @@ Memory Map of the image Image Entry point : 0x08000105 +<<<<<<< HEAD Load Region LR_1 (Base: 0x08000000, Size: 0x0000070c, Max: 0xffffffff, ABSOLUTE) Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000006f8, Max: 0xffffffff, ABSOLUTE) @@ -365,6 +601,69 @@ Memory Map of the image 0x20000014 0x0800070c 0x00000004 PAD 0x20000018 - 0x00000400 Zero RW 310 STACK startup_stm32f10x_md.o +======= + Load Region LR_1 (Base: 0x08000000, Size: 0x0000062c, Max: 0xffffffff, ABSOLUTE) + + Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x0000061c, Max: 0xffffffff, ABSOLUTE) + + Exec Addr Load Addr Size Type Attr Idx E Section Name Object + + 0x08000000 0x08000000 0x000000ec Data RO 106 RESET startup_stm32f10x_md.o + 0x080000ec 0x080000ec 0x00000000 Code RO 127 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) + 0x080000ec 0x080000ec 0x00000004 Code RO 130 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) + 0x080000f0 0x080000f0 0x00000004 Code RO 133 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 135 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 137 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) + 0x080000f4 0x080000f4 0x00000008 Code RO 138 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) + 0x080000fc 0x080000fc 0x00000000 Code RO 140 .ARM.Collect$$$$0000000D mc_w.l(entry10a.o) + 0x080000fc 0x080000fc 0x00000000 Code RO 142 .ARM.Collect$$$$0000000F mc_w.l(entry11a.o) + 0x080000fc 0x080000fc 0x00000004 Code RO 131 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) + 0x08000100 0x08000100 0x00000024 Code RO 107 * .text startup_stm32f10x_md.o + 0x08000124 0x08000124 0x00000024 Code RO 144 .text mc_w.l(init.o) + 0x08000148 0x08000148 0x0000001c Code RO 94 .text.ADC1_2_IRQHandler driver_adc.o + 0x08000164 0x08000164 0x00000002 Code RO 45 .text.Bug driver_timer.o + 0x08000166 0x08000166 0x00000002 PAD + 0x08000168 0x08000168 0x0000001a Code RO 4 .text.EXTI15_10_IRQHandler main.o + 0x08000182 0x08000182 0x00000002 PAD + 0x08000184 0x08000184 0x00000002 Code RO 57 .text.EXTI3_IRQHandler driver_timer.o + 0x08000186 0x08000186 0x00000002 PAD + 0x08000188 0x08000188 0x0000009c Code RO 15 .text.MyGPIO_Init driver_gpio.o + 0x08000224 0x08000224 0x0000008c Code RO 33 .text.MyTimer_Base_Init driver_timer.o + 0x080002b0 0x080002b0 0x000000a8 Code RO 43 .text.MyTimer_ConfigureEncoder driver_timer.o + 0x08000358 0x08000358 0x0000000c Code RO 35 .text.MyTimer_Start driver_timer.o + 0x08000364 0x08000364 0x0000004c Code RO 70 .text.MyUART_Init driver_uart.o + 0x080003b0 0x080003b0 0x00000110 Code RO 114 .text.SystemInit system_stm32f10x.o + 0x080004c0 0x080004c0 0x0000001a Code RO 49 .text.TIM2_IRQHandler driver_timer.o + 0x080004da 0x080004da 0x00000002 PAD + 0x080004dc 0x080004dc 0x0000001c Code RO 51 .text.TIM3_IRQHandler driver_timer.o + 0x080004f8 0x080004f8 0x0000001c Code RO 53 .text.TIM4_IRQHandler driver_timer.o + 0x08000514 0x08000514 0x0000000e Code RO 76 .text.USART3_IRQHandler driver_uart.o + 0x08000522 0x08000522 0x00000002 PAD + 0x08000524 0x08000524 0x00000002 Code RO 86 .text.erreur driver_adc.o + 0x08000526 0x08000526 0x00000002 PAD + 0x08000528 0x08000528 0x000000b6 Code RO 2 .text.main main.o + 0x080005de 0x080005de 0x0000000e Code RO 148 i.__scatterload_copy mc_w.l(handlers.o) + 0x080005ec 0x080005ec 0x00000002 Code RO 149 i.__scatterload_null mc_w.l(handlers.o) + 0x080005ee 0x080005ee 0x0000000e Code RO 150 i.__scatterload_zeroinit mc_w.l(handlers.o) + 0x080005fc 0x080005fc 0x00000020 Data RO 147 Region$$Table anon$$obj.o + + + Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x0800061c, Size: 0x00000010, Max: 0xffffffff, ABSOLUTE) + + Exec Addr Load Addr Size Type Attr Idx E Section Name Object + + 0x20000000 0x0800061c 0x00000004 Data RW 96 .data.ADC1_2_fx driver_adc.o + 0x20000004 0x08000620 0x00000004 Data RW 59 .data.TIM2_fx driver_timer.o + 0x20000008 0x08000624 0x00000004 Data RW 60 .data.TIM3_fx driver_timer.o + 0x2000000c 0x08000628 0x00000004 Data RW 61 .data.TIM4_fx driver_timer.o + + + Execution Region ER_ZI (Exec base: 0x20000010, Load base: 0x0800062c, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE) + + Exec Addr Load Addr Size Type Attr Idx E Section Name Object + + 0x20000010 - 0x00000400 Zero RW 104 STACK startup_stm32f10x_md.o +>>>>>>> encoder ============================================================================== @@ -374,6 +673,7 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name +<<<<<<< HEAD 56 16 0 4 0 1976 driver_adc.o 120 6 0 0 0 1780 driver_imu.o 100 26 0 12 0 2558 driver_timer.o @@ -385,6 +685,20 @@ Image component sizes 668 84 268 16 1024 217090 Object Totals 0 0 32 0 0 0 (incl. Generated) 2 0 0 0 0 0 (incl. Padding) +======= + 30 0 0 4 0 4524 driver_adc.o + 156 16 0 0 0 2108 driver_gpio.o + 406 0 0 12 0 8028 driver_timer.o + 90 0 0 0 0 2250 driver_uart.o + 208 0 0 0 0 4914 main.o + 36 8 236 0 1024 860 startup_stm32f10x_md.o + 272 0 0 0 0 2813 system_stm32f10x.o + + ---------------------------------------------------------------------- + 1210 24 268 16 1024 25497 Object Totals + 0 0 32 0 0 0 (incl. Generated) + 12 0 0 0 0 0 (incl. Padding) +>>>>>>> encoder ---------------------------------------------------------------------- @@ -424,6 +738,7 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug +<<<<<<< HEAD 1516 180 268 20 1028 216878 Grand Totals 1516 180 268 20 1028 216878 ELF Image Totals 1516 180 268 20 0 0 ROM Totals @@ -433,6 +748,17 @@ Image component sizes Total RO Size (Code + RO Data) 1784 ( 1.74kB) Total RW Size (RW Data + ZI Data) 1048 ( 1.02kB) Total ROM Size (Code + RO Data + RW Data) 1804 ( 1.76kB) +======= + 1296 40 268 16 1024 25617 Grand Totals + 1296 40 268 16 1024 25617 ELF Image Totals + 1296 40 268 16 0 0 ROM Totals + +============================================================================== + + Total RO Size (Code + RO Data) 1564 ( 1.53kB) + Total RW Size (RW Data + ZI Data) 1040 ( 1.02kB) + Total ROM Size (Code + RO Data + RW Data) 1580 ( 1.54kB) +>>>>>>> encoder ============================================================================== diff --git a/projet-voilier/Objects/driver_gpio.d b/projet-voilier/Objects/driver_gpio.d index 5d70e7b..4bb2de3 100644 --- a/projet-voilier/Objects/driver_gpio.d +++ b/projet-voilier/Objects/driver_gpio.d @@ -1,6 +1,6 @@ ./objects/driver_gpio.o: ..\driver\Driver_GPIO.c ..\driver\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\_reel\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-voilier/Objects/driver_timer.d b/projet-voilier/Objects/driver_timer.d index e2a0439..1136a0b 100644 --- a/projet-voilier/Objects/driver_timer.d +++ b/projet-voilier/Objects/driver_timer.d @@ -1,7 +1,7 @@ ./objects/driver_timer.o: ..\driver\Driver_Timer.c \ ..\driver\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\_reel\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-voilier/Objects/driver_uart.d b/projet-voilier/Objects/driver_uart.d index ff36ca6..8694107 100644 --- a/projet-voilier/Objects/driver_uart.d +++ b/projet-voilier/Objects/driver_uart.d @@ -1,6 +1,6 @@ ./objects/driver_uart.o: ..\driver\Driver_UART.c ..\driver\Driver_UART.h \ C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h \ - RTE\_sim\RTE_Components.h \ + RTE\_reel\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-voilier/Objects/main.d b/projet-voilier/Objects/main.d index 15fc007..14bcf71 100644 --- a/projet-voilier/Objects/main.d +++ b/projet-voilier/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\_reel\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-voilier/Objects/main.o b/projet-voilier/Objects/main.o new file mode 100644 index 0000000..d337a22 Binary files /dev/null and b/projet-voilier/Objects/main.o differ diff --git a/projet-voilier/Objects/projet-voilier.axf b/projet-voilier/Objects/projet-voilier.axf new file mode 100644 index 0000000..988f783 Binary files /dev/null and b/projet-voilier/Objects/projet-voilier.axf differ diff --git a/projet-voilier/Objects/projet-voilier.build_log.htm b/projet-voilier/Objects/projet-voilier.build_log.htm index daa04ae..eeb48ba 100644 --- a/projet-voilier/Objects/projet-voilier.build_log.htm +++ b/projet-voilier/Objects/projet-voilier.build_log.htm @@ -27,6 +27,7 @@ Project File Date: 04/07/2023

Output:

*** Using Compiler 'V6.19', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin' Rebuild target 'sim' +compiling Driver_UART.c... assembling startup_stm32f10x_md.s... src/main.c(16): error: unknown type name 'Encoder' Encoder->Timer = TIM4; @@ -93,13 +94,24 @@ void MyTimer_Start(MyTimer_Struct_TypeDef * Timer); ^ 3 warnings and 11 errors generated. compiling main.c... +<<<<<<< HEAD compiling Driver_ADC.c... compiling Driver_UART.c... compiling Driver_IMU.c... +======= +>>>>>>> encoder compiling Driver_GPIO.c... +compiling system_stm32f10x.c... +compiling Driver_ADC.c... compiling Driver_Timer.c... +<<<<<<< HEAD compiling system_stm32f10x.c... ".\Objects\projet-voilier.axf" - 11 Error(s), 3 Warning(s). +======= +linking... +Program Size: Code=1436 RO-data=268 RW-data=16 ZI-data=1632 +".\Objects\projet-voilier.axf" - 0 Error(s), 0 Warning(s). +>>>>>>> encoder

Software Packages used:

@@ -126,11 +138,14 @@ Package Vendor: Keil * Component: ARM::CMSIS:CORE:5.6.0 * Component: Keil::Device:Startup:1.0.0 - Include file: RTE_Driver/Config/RTE_Device.h - Source file: Device/Source/system_stm32f10x.c - Source file: Device/Source/ARM/STM32F1xx_OPT.s Source file: Device/Source/ARM/startup_stm32f10x_md.s +<<<<<<< HEAD Target not created. +======= + Source file: Device/Source/system_stm32f10x.c + Include file: RTE_Driver/Config/RTE_Device.h + Source file: Device/Source/ARM/STM32F1xx_OPT.s +>>>>>>> encoder Build Time Elapsed: 00:00:01 diff --git a/projet-voilier/Objects/projet-voilier.htm b/projet-voilier/Objects/projet-voilier.htm index 90ecc43..68c0931 100644 --- a/projet-voilier/Objects/projet-voilier.htm +++ b/projet-voilier/Objects/projet-voilier.htm @@ -3,9 +3,15 @@ Static Call Graph - [.\Objects\projet-voilier.axf]

Static Call Graph for image .\Objects\projet-voilier.axf

+<<<<<<< HEAD

#<CALLGRAPH># ARM Linker, 6190004: Last Updated: Fri Apr 7 14:37:03 2023

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

+======= +

#<CALLGRAPH># ARM Linker, 6190004: Last Updated: Tue Apr 11 09:10:04 2023 +

+

Maximum Stack Usage = 56 bytes + Unknown(Functions without stacksize, Cycles, Untraceable Function Pointers)

+>>>>>>> encoder Call chain for Maximum Stack Depth:

__rt_entry_main ⇒ main ⇒ driver_IMU_read

@@ -54,7 +60,7 @@ Function Pointers

  • EXTI15_10_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • EXTI1_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • EXTI2_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) -
  • EXTI3_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) +
  • EXTI3_IRQHandler from driver_timer.o(.text.EXTI3_IRQHandler) referenced from startup_stm32f10x_md.o(RESET)
  • EXTI4_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • EXTI9_5_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • FLASH_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) @@ -113,9 +119,15 @@ Global Symbols

    [Calls] +<<<<<<< HEAD

    __scatterload_rt2_thumb_only (Thumb, 0 bytes, Stack size unknown bytes, __scatter.o(!!!scatter), UNUSED)

    __scatterload_null (Thumb, 0 bytes, Stack size unknown bytes, __scatter.o(!!!scatter), UNUSED) +======= +

    __scatterload_rt2_thumb_only (Thumb, 0 bytes, Stack size unknown bytes, __scatter.o(!!!scatter), UNUSED) + +

    __scatterload_null (Thumb, 0 bytes, Stack size unknown bytes, __scatter.o(!!!scatter), UNUSED) +>>>>>>> encoder

    __scatterload_copy (Thumb, 26 bytes, Stack size unknown bytes, __scatter_copy.o(!!handler_copy), UNUSED)

    [Calls]