diff --git a/projet-voilier/Listings/projet-voilier_reel.map b/projet-voilier/Listings/projet-voilier_reel.map index 0fca834..3169458 100644 --- a/projet-voilier/Listings/projet-voilier_reel.map +++ b/projet-voilier/Listings/projet-voilier_reel.map @@ -41,7 +41,6 @@ Section Cross References 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] @@ -89,7 +88,6 @@ Section Cross References 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 @@ -158,7 +156,6 @@ Removing Unused input sections from the image. ======= 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). @@ -207,6 +204,7 @@ Removing Unused input sections from the image. Removing driver_adc.o(.ARM.exidx.text.ADC1_2_IRQHandler), (8 bytes). >>>>>>> encoder Removing startup_stm32f10x_md.o(HEAP), (512 bytes). +<<<<<<< HEAD Removing system_stm32f10x.o(.rev16_text), (4 bytes). Removing system_stm32f10x.o(.revsh_text), (4 bytes). Removing system_stm32f10x.o(.rrx_text), (6 bytes). @@ -221,6 +219,16 @@ Removing Unused input sections from the image. ======= 56 unused section(s) (total 1604 bytes) removed from the image. >>>>>>> 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). + Removing system_stm32f10x.o(.ARM.exidx.text.SystemCoreClockUpdate), (8 bytes). + Removing system_stm32f10x.o(.data.SystemCoreClock), (4 bytes). + Removing system_stm32f10x.o(.rodata.AHBPrescTable), (16 bytes). + +55 unused section(s) (total 1596 bytes) removed from the image. +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b ============================================================================== @@ -327,23 +335,22 @@ Image Symbol Table .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) + [Anonymous Symbol] 0x08000168 Section 0 driver_timer.o(.text.EXTI3_IRQHandler) + [Anonymous Symbol] 0x0800016c Section 0 driver_gpio.o(.text.MyGPIO_Init) + [Anonymous Symbol] 0x08000208 Section 0 driver_timer.o(.text.MyTimer_Base_Init) + [Anonymous Symbol] 0x08000294 Section 0 driver_timer.o(.text.MyTimer_ConfigureEncoder) + [Anonymous Symbol] 0x0800033c Section 0 driver_timer.o(.text.MyTimer_Start) + [Anonymous Symbol] 0x08000348 Section 0 driver_uart.o(.text.MyUART_Init) + [Anonymous Symbol] 0x08000394 Section 0 system_stm32f10x.o(.text.SystemInit) + [Anonymous Symbol] 0x080004a4 Section 0 driver_timer.o(.text.TIM2_IRQHandler) + [Anonymous Symbol] 0x080004c0 Section 0 driver_timer.o(.text.TIM3_IRQHandler) + [Anonymous Symbol] 0x080004dc Section 0 driver_timer.o(.text.TIM4_IRQHandler) + [Anonymous Symbol] 0x080004f8 Section 0 driver_uart.o(.text.USART3_IRQHandler) + [Anonymous Symbol] 0x08000508 Section 0 driver_adc.o(.text.erreur) + [Anonymous Symbol] 0x0800050c Section 0 main.o(.text.main) + i.__scatterload_copy 0x0800058a Section 14 handlers.o(i.__scatterload_copy) + i.__scatterload_null 0x08000598 Section 2 handlers.o(i.__scatterload_null) + i.__scatterload_zeroinit 0x0800059a Section 14 handlers.o(i.__scatterload_zeroinit) STACK 0x20000010 Section 1024 startup_stm32f10x_md.o(STACK) >>>>>>> encoder @@ -475,6 +482,7 @@ Image Symbol Table 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) + EXTI15_10_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) @@ -505,25 +513,24 @@ Image Symbol Table __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) + EXTI3_IRQHandler 0x08000169 Thumb Code 2 driver_timer.o(.text.EXTI3_IRQHandler) + MyGPIO_Init 0x0800016d Thumb Code 140 driver_gpio.o(.text.MyGPIO_Init) + MyTimer_Base_Init 0x08000209 Thumb Code 140 driver_timer.o(.text.MyTimer_Base_Init) + MyTimer_ConfigureEncoder 0x08000295 Thumb Code 168 driver_timer.o(.text.MyTimer_ConfigureEncoder) + MyTimer_Start 0x0800033d Thumb Code 12 driver_timer.o(.text.MyTimer_Start) + MyUART_Init 0x08000349 Thumb Code 76 driver_uart.o(.text.MyUART_Init) + SystemInit 0x08000395 Thumb Code 272 system_stm32f10x.o(.text.SystemInit) + TIM2_IRQHandler 0x080004a5 Thumb Code 26 driver_timer.o(.text.TIM2_IRQHandler) + TIM3_IRQHandler 0x080004c1 Thumb Code 28 driver_timer.o(.text.TIM3_IRQHandler) + TIM4_IRQHandler 0x080004dd Thumb Code 28 driver_timer.o(.text.TIM4_IRQHandler) + USART3_IRQHandler 0x080004f9 Thumb Code 14 driver_uart.o(.text.USART3_IRQHandler) + erreur 0x08000509 Thumb Code 2 driver_adc.o(.text.erreur) + main 0x0800050d Thumb Code 126 main.o(.text.main) + __scatterload_copy 0x0800058b Thumb Code 14 handlers.o(i.__scatterload_copy) + __scatterload_null 0x08000599 Thumb Code 2 handlers.o(i.__scatterload_null) + __scatterload_zeroinit 0x0800059b Thumb Code 14 handlers.o(i.__scatterload_zeroinit) + Region$$Table$$Base 0x080005a8 Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x080005c8 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) @@ -599,71 +606,77 @@ Memory Map of the image Exec Addr Load Addr Size Type Attr Idx E Section Name Object +<<<<<<< HEAD 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) +======= + Load Region LR_1 (Base: 0x08000000, Size: 0x000005d8, Max: 0xffffffff, ABSOLUTE) +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b - Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x0000061c, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000005c8, 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 + 0x08000000 0x08000000 0x000000ec Data RO 102 RESET startup_stm32f10x_md.o + 0x080000ec 0x080000ec 0x00000000 Code RO 123 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) + 0x080000ec 0x080000ec 0x00000004 Code RO 126 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) + 0x080000f0 0x080000f0 0x00000004 Code RO 129 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 131 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 133 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) + 0x080000f4 0x080000f4 0x00000008 Code RO 134 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) + 0x080000fc 0x080000fc 0x00000000 Code RO 136 .ARM.Collect$$$$0000000D mc_w.l(entry10a.o) + 0x080000fc 0x080000fc 0x00000000 Code RO 138 .ARM.Collect$$$$0000000F mc_w.l(entry11a.o) + 0x080000fc 0x080000fc 0x00000004 Code RO 127 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) + 0x08000100 0x08000100 0x00000024 Code RO 103 * .text startup_stm32f10x_md.o + 0x08000124 0x08000124 0x00000024 Code RO 140 .text mc_w.l(init.o) + 0x08000148 0x08000148 0x0000001c Code RO 90 .text.ADC1_2_IRQHandler driver_adc.o + 0x08000164 0x08000164 0x00000002 Code RO 41 .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 + 0x08000168 0x08000168 0x00000002 Code RO 53 .text.EXTI3_IRQHandler driver_timer.o + 0x0800016a 0x0800016a 0x00000002 PAD + 0x0800016c 0x0800016c 0x0000009c Code RO 11 .text.MyGPIO_Init driver_gpio.o + 0x08000208 0x08000208 0x0000008c Code RO 29 .text.MyTimer_Base_Init driver_timer.o + 0x08000294 0x08000294 0x000000a8 Code RO 39 .text.MyTimer_ConfigureEncoder driver_timer.o + 0x0800033c 0x0800033c 0x0000000c Code RO 31 .text.MyTimer_Start driver_timer.o + 0x08000348 0x08000348 0x0000004c Code RO 66 .text.MyUART_Init driver_uart.o + 0x08000394 0x08000394 0x00000110 Code RO 110 .text.SystemInit system_stm32f10x.o + 0x080004a4 0x080004a4 0x0000001a Code RO 45 .text.TIM2_IRQHandler driver_timer.o + 0x080004be 0x080004be 0x00000002 PAD + 0x080004c0 0x080004c0 0x0000001c Code RO 47 .text.TIM3_IRQHandler driver_timer.o + 0x080004dc 0x080004dc 0x0000001c Code RO 49 .text.TIM4_IRQHandler driver_timer.o + 0x080004f8 0x080004f8 0x0000000e Code RO 72 .text.USART3_IRQHandler driver_uart.o + 0x08000506 0x08000506 0x00000002 PAD + 0x08000508 0x08000508 0x00000002 Code RO 82 .text.erreur driver_adc.o + 0x0800050a 0x0800050a 0x00000002 PAD + 0x0800050c 0x0800050c 0x0000007e Code RO 2 .text.main main.o + 0x0800058a 0x0800058a 0x0000000e Code RO 144 i.__scatterload_copy mc_w.l(handlers.o) + 0x08000598 0x08000598 0x00000002 Code RO 145 i.__scatterload_null mc_w.l(handlers.o) + 0x0800059a 0x0800059a 0x0000000e Code RO 146 i.__scatterload_zeroinit mc_w.l(handlers.o) + 0x080005a8 0x080005a8 0x00000020 Data RO 143 Region$$Table anon$$obj.o - Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x0800061c, Size: 0x00000010, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x080005c8, 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 + 0x20000000 0x080005c8 0x00000004 Data RW 92 .data.ADC1_2_fx driver_adc.o + 0x20000004 0x080005cc 0x00000004 Data RW 55 .data.TIM2_fx driver_timer.o + 0x20000008 0x080005d0 0x00000004 Data RW 56 .data.TIM3_fx driver_timer.o + 0x2000000c 0x080005d4 0x00000004 Data RW 57 .data.TIM4_fx driver_timer.o - Execution Region ER_ZI (Exec base: 0x20000010, Load base: 0x0800062c, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_ZI (Exec base: 0x20000010, Load base: 0x080005d8, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object +<<<<<<< HEAD 0x20000010 - 0x00000400 Zero RW 104 STACK startup_stm32f10x_md.o >>>>>>> encoder +======= + 0x20000010 - 0x00000400 Zero RW 100 STACK startup_stm32f10x_md.o +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b ============================================================================== @@ -690,15 +703,19 @@ Image component sizes 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 + 126 0 0 0 0 2547 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 + 1126 24 268 16 1024 23130 Object Totals 0 0 32 0 0 0 (incl. Generated) +<<<<<<< HEAD 12 0 0 0 0 0 (incl. Padding) >>>>>>> encoder +======= + 10 0 0 0 0 0 (incl. Padding) +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b ---------------------------------------------------------------------- @@ -738,6 +755,7 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug +<<<<<<< HEAD <<<<<<< HEAD 1516 180 268 20 1028 216878 Grand Totals 1516 180 268 20 1028 216878 ELF Image Totals @@ -752,13 +770,22 @@ Image component sizes 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 +======= + 1212 40 268 16 1024 23250 Grand Totals + 1212 40 268 16 1024 23250 ELF Image Totals + 1212 40 268 16 0 0 ROM Totals +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b ============================================================================== - Total RO Size (Code + RO Data) 1564 ( 1.53kB) + Total RO Size (Code + RO Data) 1480 ( 1.45kB) Total RW Size (RW Data + ZI Data) 1040 ( 1.02kB) +<<<<<<< HEAD Total ROM Size (Code + RO Data + RW Data) 1580 ( 1.54kB) >>>>>>> encoder +======= + Total ROM Size (Code + RO Data + RW Data) 1496 ( 1.46kB) +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b ============================================================================== diff --git a/projet-voilier/Objects/main.o b/projet-voilier/Objects/main.o new file mode 100644 index 0000000..be53699 Binary files /dev/null and b/projet-voilier/Objects/main.o differ diff --git a/projet-voilier/Objects/projet-voilier_reel.axf b/projet-voilier/Objects/projet-voilier_reel.axf new file mode 100644 index 0000000..4d0eb73 Binary files /dev/null and b/projet-voilier/Objects/projet-voilier_reel.axf differ diff --git a/projet-voilier/Objects/projet-voilier_reel.build_log.htm b/projet-voilier/Objects/projet-voilier_reel.build_log.htm index 0ebb207..9eb5300 100644 --- a/projet-voilier/Objects/projet-voilier_reel.build_log.htm +++ b/projet-voilier/Objects/projet-voilier_reel.build_log.htm @@ -27,6 +27,7 @@ Project File Date: 04/11/2023

Output:

*** Using Compiler 'V6.19', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin' Rebuild target 'reel' +<<<<<<< HEAD compiling Driver_GPIO.c... src/main.c(19): error: unknown type name 'Encoder' Encoder->Timer = TIM4; @@ -95,10 +96,23 @@ void MyTimer_Start(MyTimer_Struct_TypeDef * Timer); compiling main.c... assembling startup_stm32f10x_md.s... compiling Driver_UART.c... +======= +assembling startup_stm32f10x_md.s... +compiling main.c... +compiling Driver_UART.c... +compiling Driver_GPIO.c... +compiling Driver_ADC.c... +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b compiling system_stm32f10x.c... compiling Driver_ADC.c... compiling Driver_Timer.c... +<<<<<<< HEAD ".\Objects\projet-voilier_reel.axf" - 11 Error(s), 3 Warning(s). +======= +linking... +Program Size: Code=1212 RO-data=268 RW-data=16 ZI-data=1024 +".\Objects\projet-voilier_reel.axf" - 0 Error(s), 0 Warning(s). +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b

Software Packages used:

@@ -129,8 +143,12 @@ Package Vendor: Keil Source file: Device/Source/system_stm32f10x.c Include file: RTE_Driver/Config/RTE_Device.h Source file: Device/Source/ARM/STM32F1xx_OPT.s +<<<<<<< HEAD Target not created. Build Time Elapsed: 00:00:01 +======= +Build Time Elapsed: 00:00:00 +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b diff --git a/projet-voilier/Objects/projet-voilier_reel.dep b/projet-voilier/Objects/projet-voilier_reel.dep index 1c0d9a7..a1f9e23 100644 --- a/projet-voilier/Objects/projet-voilier_reel.dep +++ b/projet-voilier/Objects/projet-voilier_reel.dep @@ -1,6 +1,10 @@ Dependencies for Project 'projet-voilier', Target 'reel': (DO NOT MODIFY !) CompilerVersion: 6190000::V6.19::ARMCLANG +<<<<<<< HEAD F (.\src\main.c)(0x64351167)(-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 ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -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)(0x643511B0)(-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 ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -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) +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_reel\RTE_Components.h)(0x64218849) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -9,6 +13,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) +<<<<<<< HEAD I (..\driver\Driver_GPIO.h)(0x64351060) I (..\driver\Driver_Timer.h)(0x64351060) I (..\driver\Driver_UART.h)(0x642C85A4) @@ -17,6 +22,13 @@ I (..\driver\MySPI.h)(0x64351060) I (..\driver\Driver_IMU.h)(0x64351060) F (..\driver\Driver_GPIO.c)(0x64351084)(-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 ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -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 (..\driver\Driver_GPIO.h)(0x64351060) +======= +I (..\driver\Driver_GPIO.h)(0x643511B0) +I (..\driver\Driver_Timer.h)(0x643511B0) +I (..\driver\Driver_UART.h)(0x642C85A4) +F (..\driver\Driver_GPIO.c)(0x643511B0)(-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 ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -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 (..\driver\Driver_GPIO.h)(0x643511B0) +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_reel\RTE_Components.h)(0x64218849) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -26,9 +38,15 @@ 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 (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78) +<<<<<<< HEAD F (..\driver\Driver_GPIO.h)(0x64351060)() F (..\driver\Driver_Timer.c)(0x64351084)(-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 ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -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 (..\driver\Driver_Timer.h)(0x64351060) +======= +F (..\driver\Driver_GPIO.h)(0x643511B0)() +F (..\driver\Driver_Timer.c)(0x643511B0)(-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 ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -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 (..\driver\Driver_Timer.h)(0x643511B0) +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_reel\RTE_Components.h)(0x64218849) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -38,7 +56,11 @@ 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 (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78) +<<<<<<< HEAD F (..\driver\Driver_Timer.h)(0x64351060)() +======= +F (..\driver\Driver_Timer.h)(0x643511B0)() +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b F (..\driver\Driver_UART.c)(0x64300B0F)(-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 ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -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_uart.o -MD) I (..\driver\Driver_UART.h)(0x642C85A4) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) @@ -50,7 +72,11 @@ 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 (..\driver\Driver_UART.h)(0x642C85A4)() +<<<<<<< HEAD F (..\driver\Driver_ADC.c)(0x64351060)(-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 ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -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) +======= +F (..\driver\Driver_ADC.c)(0x643511B0)(-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 ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -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) +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_reel\RTE_Components.h)(0x64218849) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -60,8 +86,13 @@ 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 (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78) +<<<<<<< HEAD I (..\driver\Driver_ADC.h)(0x64351060) F (..\driver\Driver_ADC.h)(0x64351060)() +======= +I (..\driver\Driver_ADC.h)(0x643511B0) +F (..\driver\Driver_ADC.h)(0x643511B0)() +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b F (RTE/Device/STM32F103RB/RTE_Device.h)(0x641B050C)() F (RTE/Device/STM32F103RB/startup_stm32f10x_md.s)(0x641B050C)(--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/_reel -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)(0x641B050C)(-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 ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -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-voilier/Objects/projet-voilier_reel.htm b/projet-voilier/Objects/projet-voilier_reel.htm index cab7d9d..c285fb5 100644 --- a/projet-voilier/Objects/projet-voilier_reel.htm +++ b/projet-voilier/Objects/projet-voilier_reel.htm @@ -4,11 +4,15 @@

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

<<<<<<< HEAD +<<<<<<< HEAD

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Fri Apr 07 13:57:22 2023

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

=======

#<CALLGRAPH># ARM Linker, 6190004: Last Updated: Tue Apr 11 09:37:28 2023 +======= +

#<CALLGRAPH># ARM Linker, 6190004: Last Updated: Tue Apr 11 09:52:31 2023 +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b

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

>>>>>>> encoder @@ -58,7 +62,7 @@ Function Pointers
  • DMA1_Channel7_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • DebugMon_Handler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • EXTI0_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) -
  • EXTI15_10_IRQHandler from main.o(.text.EXTI15_10_IRQHandler) referenced from startup_stm32f10x_md.o(RESET) +
  • 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 driver_timer.o(.text.EXTI3_IRQHandler) referenced from startup_stm32f10x_md.o(RESET) @@ -258,6 +262,9 @@ Global Symbols

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

    +

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

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

    @@ -409,6 +416,7 @@ Global Symbols

    TIM2_IRQHandler (Thumb, 26 bytes, Stack size 8 bytes, driver_timer.o(i.TIM2_IRQHandler))

    [Stack]

    +<<<<<<< HEAD
    [Address Reference Count : 1]

    TIM3_IRQHandler (Thumb, 22 bytes, Stack size 8 bytes, driver_timer.o(i.TIM3_IRQHandler)) @@ -436,6 +444,8 @@ Global Symbols

    EXTI15_10_IRQHandler (Thumb, 26 bytes, Stack size 0 bytes, main.o(.text.EXTI15_10_IRQHandler))
    [Address Reference Count : 1]

    +======= +>>>>>>> 73cabe3969d793656407180a8db5feffe014593b

    EXTI3_IRQHandler (Thumb, 2 bytes, Stack size 0 bytes, driver_timer.o(.text.EXTI3_IRQHandler))
    [Address Reference Count : 1]

    @@ -525,7 +535,7 @@ Global Symbols
    [Address Reference Count : 1] -

    main (Thumb, 182 bytes, Stack size 48 bytes, main.o(.text.main)) +

    main (Thumb, 126 bytes, Stack size 48 bytes, main.o(.text.main))

    [Stack]


    [Calls]