diff --git a/FileInclude/MyGirouette.c b/FileInclude/MyGirouette.c new file mode 100644 index 0000000..22b2bab --- /dev/null +++ b/FileInclude/MyGirouette.c @@ -0,0 +1,36 @@ +#include "MyGirouette.h" +#include "Driver_GPIO.h" +#include "MyTimer.h" +void Init_Girouette(void){ + + MyGPIO_Struct_TypeDef GPIOA0={ + GPIOA, + 0, + In_Floating + }; + MyGPIO_Struct_TypeDef GPIOA1={ + GPIOA, + 1, + In_Floating + }; + + // Configuration du timer + MyTimer_Struct_TypeDef TIM; + TIM.Timer = TIM2; + TIM.ARR = 360; + TIM.PSC = 0; + + MyTimer_Base_Init(&TIM); + + TIM2->CCMR1 |= 0x1 << 0; //CH1 + TIM2->CCMR1 |= 0x1 << 8; //CH2 + + TIM2->SMCR |= 0x1 << 0; // Capture Mode : 1 => seulement les fronts montants 2 => seulement les fronts descendants 3 => les 2 + + MyGPIO_Init(&GPIOA0); + MyGPIO_Init(&GPIOA1); + + MyTimer_Base_Start(TIM2); +} + +uint16_t Get_Angle(void){return TIM2 -> CNT;} diff --git a/FileInclude/MyGirouette.h b/FileInclude/MyGirouette.h new file mode 100644 index 0000000..ede1909 --- /dev/null +++ b/FileInclude/MyGirouette.h @@ -0,0 +1,8 @@ +#ifndef __MYGIROUETTE_H +#define __MYGIROUETTE_H +#include "stm32f10x.h" + +void Init_Girouette(void); +uint16_t Get_Angle(void); + +#endif diff --git a/Listings/Projet1_Simulation.map b/Listings/Projet1_Simulation.map index 960bf46..6a36f35 100644 --- a/Listings/Projet1_Simulation.map +++ b/Listings/Projet1_Simulation.map @@ -7,16 +7,18 @@ Section Cross References main.o(i.Callback) refers to myadc.o(i.startADC) for startADC main.o(i.Callback) refers to myadc.o(i.read) for read main.o(i.Callback) refers to main.o(.data) for a - main.o(i.main) refers to mytimer.o(i.MyTimer_Base_Init) for MyTimer_Base_Init - main.o(i.main) refers to driver_gpio.o(i.MyGPIO_Init) for MyGPIO_Init - main.o(i.main) refers to mytimer.o(i.MyTimer_Base_Start) for MyTimer_Base_Start - main.o(i.main) refers to main.o(.constdata) for .constdata + main.o(i.main) refers to mygirouette.o(i.Init_Girouette) for Init_Girouette + main.o(i.main) refers to mygirouette.o(i.Get_Angle) for Get_Angle mytimer.o(i.MyTimer_ActiveIT) refers to mytimer.o(.data) for ptr1 mytimer.o(i.MyTimer_PWM) refers to driver_gpio.o(i.MyGPIO_Init) for MyGPIO_Init mytimer.o(i.TIM1_UP_IRQHandler) refers to mytimer.o(.data) for ptr1 mytimer.o(i.TIM2_IRQHandler) refers to mytimer.o(.data) for ptr2 mytimer.o(i.TIM3_IRQHandler) refers to mytimer.o(.data) for ptr3 mytimer.o(i.TIM4_IRQHandler) refers to mytimer.o(.data) for ptr4 + mygirouette.o(i.Init_Girouette) refers to mytimer.o(i.MyTimer_Base_Init) for MyTimer_Base_Init + mygirouette.o(i.Init_Girouette) refers to driver_gpio.o(i.MyGPIO_Init) for MyGPIO_Init + mygirouette.o(i.Init_Girouette) refers to mytimer.o(i.MyTimer_Base_Start) for MyTimer_Base_Start + mygirouette.o(i.Init_Girouette) refers to mygirouette.o(.constdata) for .constdata 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 mytimer.o(i.TIM1_UP_IRQHandler) for TIM1_UP_IRQHandler @@ -78,6 +80,9 @@ Removing Unused input sections from the image. Removing driver_gpio.o(i.MyGPIO_Reset), (14 bytes). Removing driver_gpio.o(i.MyGPIO_Set), (12 bytes). Removing driver_gpio.o(i.MyGPIO_Toggle), (12 bytes). + Removing mygirouette.o(.rev16_text), (4 bytes). + Removing mygirouette.o(.revsh_text), (4 bytes). + Removing mygirouette.o(.rrx_text), (6 bytes). Removing startup_stm32f10x_md.o(HEAP), (512 bytes). Removing system_stm32f10x.o(.rev16_text), (4 bytes). Removing system_stm32f10x.o(.revsh_text), (4 bytes). @@ -85,7 +90,7 @@ Removing Unused input sections from the image. Removing system_stm32f10x.o(i.SystemCoreClockUpdate), (164 bytes). Removing system_stm32f10x.o(.data), (20 bytes). -34 unused section(s) (total 1710 bytes) removed from the image. +37 unused section(s) (total 1724 bytes) removed from the image. ============================================================================== @@ -95,26 +100,28 @@ Image Symbol Table Symbol Name Value Ov Type Size Object(Section) - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11a.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10a.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12a.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9a.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8a.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7a.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12b.o ABSOLUTE FileInclude\Driver_GPIO.c 0x00000000 Number 0 driver_gpio.o ABSOLUTE FileInclude\MyADC.c 0x00000000 Number 0 myadc.o ABSOLUTE + FileInclude\MyGirouette.c 0x00000000 Number 0 mygirouette.o ABSOLUTE FileInclude\MyTimer.c 0x00000000 Number 0 mytimer.o ABSOLUTE FileInclude\\Driver_GPIO.c 0x00000000 Number 0 driver_gpio.o ABSOLUTE FileInclude\\MyADC.c 0x00000000 Number 0 myadc.o ABSOLUTE + FileInclude\\MyGirouette.c 0x00000000 Number 0 mygirouette.o ABSOLUTE FileInclude\\MyTimer.c 0x00000000 Number 0 mytimer.o ABSOLUTE 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 @@ -138,23 +145,25 @@ Image Symbol Table __lit__00000000 0x08000100 Data 4 entry2.o(.ARM.Collect$$$$00002712) .text 0x08000104 Section 36 startup_stm32f10x_md.o(.text) .text 0x08000128 Section 36 init.o(.text) - i.MyGPIO_Init 0x0800014c Section 0 driver_gpio.o(i.MyGPIO_Init) - i.MyTimer_Base_Init 0x08000200 Section 0 mytimer.o(i.MyTimer_Base_Init) - i.MyTimer_Base_Start 0x0800026c Section 0 mytimer.o(i.MyTimer_Base_Start) - i.SetSysClock 0x08000276 Section 0 system_stm32f10x.o(i.SetSysClock) - SetSysClock 0x08000277 Thumb Code 8 system_stm32f10x.o(i.SetSysClock) - i.SetSysClockTo72 0x08000280 Section 0 system_stm32f10x.o(i.SetSysClockTo72) - SetSysClockTo72 0x08000281 Thumb Code 214 system_stm32f10x.o(i.SetSysClockTo72) - i.SystemInit 0x08000360 Section 0 system_stm32f10x.o(i.SystemInit) - i.TIM1_UP_IRQHandler 0x080003c0 Section 0 mytimer.o(i.TIM1_UP_IRQHandler) - i.TIM2_IRQHandler 0x080003e4 Section 0 mytimer.o(i.TIM2_IRQHandler) - i.TIM3_IRQHandler 0x08000408 Section 0 mytimer.o(i.TIM3_IRQHandler) - i.TIM4_IRQHandler 0x0800042c Section 0 mytimer.o(i.TIM4_IRQHandler) - i.__scatterload_copy 0x08000450 Section 14 handlers.o(i.__scatterload_copy) - i.__scatterload_null 0x0800045e Section 2 handlers.o(i.__scatterload_null) - i.__scatterload_zeroinit 0x08000460 Section 14 handlers.o(i.__scatterload_zeroinit) - i.main 0x08000470 Section 0 main.o(i.main) - .constdata 0x080004e0 Section 24 main.o(.constdata) + i.Get_Angle 0x0800014c Section 0 mygirouette.o(i.Get_Angle) + i.Init_Girouette 0x08000154 Section 0 mygirouette.o(i.Init_Girouette) + i.MyGPIO_Init 0x080001c4 Section 0 driver_gpio.o(i.MyGPIO_Init) + i.MyTimer_Base_Init 0x08000278 Section 0 mytimer.o(i.MyTimer_Base_Init) + i.MyTimer_Base_Start 0x080002e4 Section 0 mytimer.o(i.MyTimer_Base_Start) + i.SetSysClock 0x080002ee Section 0 system_stm32f10x.o(i.SetSysClock) + SetSysClock 0x080002ef Thumb Code 8 system_stm32f10x.o(i.SetSysClock) + i.SetSysClockTo72 0x080002f8 Section 0 system_stm32f10x.o(i.SetSysClockTo72) + SetSysClockTo72 0x080002f9 Thumb Code 214 system_stm32f10x.o(i.SetSysClockTo72) + i.SystemInit 0x080003d8 Section 0 system_stm32f10x.o(i.SystemInit) + i.TIM1_UP_IRQHandler 0x08000438 Section 0 mytimer.o(i.TIM1_UP_IRQHandler) + i.TIM2_IRQHandler 0x0800045c Section 0 mytimer.o(i.TIM2_IRQHandler) + i.TIM3_IRQHandler 0x08000480 Section 0 mytimer.o(i.TIM3_IRQHandler) + i.TIM4_IRQHandler 0x080004a4 Section 0 mytimer.o(i.TIM4_IRQHandler) + i.__scatterload_copy 0x080004c8 Section 14 handlers.o(i.__scatterload_copy) + i.__scatterload_null 0x080004d6 Section 2 handlers.o(i.__scatterload_null) + i.__scatterload_zeroinit 0x080004d8 Section 14 handlers.o(i.__scatterload_zeroinit) + i.main 0x080004e6 Section 0 main.o(i.main) + .constdata 0x080004f4 Section 24 mygirouette.o(.constdata) .data 0x20000000 Section 16 mytimer.o(.data) STACK 0x20000010 Section 1024 startup_stm32f10x_md.o(STACK) @@ -234,20 +243,22 @@ Image Symbol Table WWDG_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) __scatterload 0x08000129 Thumb Code 28 init.o(.text) __scatterload_rt2 0x08000129 Thumb Code 0 init.o(.text) - MyGPIO_Init 0x0800014d Thumb Code 166 driver_gpio.o(i.MyGPIO_Init) - MyTimer_Base_Init 0x08000201 Thumb Code 98 mytimer.o(i.MyTimer_Base_Init) - MyTimer_Base_Start 0x0800026d Thumb Code 10 mytimer.o(i.MyTimer_Base_Start) - SystemInit 0x08000361 Thumb Code 78 system_stm32f10x.o(i.SystemInit) - TIM1_UP_IRQHandler 0x080003c1 Thumb Code 28 mytimer.o(i.TIM1_UP_IRQHandler) - TIM2_IRQHandler 0x080003e5 Thumb Code 32 mytimer.o(i.TIM2_IRQHandler) - TIM3_IRQHandler 0x08000409 Thumb Code 28 mytimer.o(i.TIM3_IRQHandler) - TIM4_IRQHandler 0x0800042d Thumb Code 28 mytimer.o(i.TIM4_IRQHandler) - __scatterload_copy 0x08000451 Thumb Code 14 handlers.o(i.__scatterload_copy) - __scatterload_null 0x0800045f Thumb Code 2 handlers.o(i.__scatterload_null) - __scatterload_zeroinit 0x08000461 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) - main 0x08000471 Thumb Code 106 main.o(i.main) - Region$$Table$$Base 0x080004f8 Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x08000518 Number 0 anon$$obj.o(Region$$Table) + Get_Angle 0x0800014d Thumb Code 8 mygirouette.o(i.Get_Angle) + Init_Girouette 0x08000155 Thumb Code 108 mygirouette.o(i.Init_Girouette) + MyGPIO_Init 0x080001c5 Thumb Code 166 driver_gpio.o(i.MyGPIO_Init) + MyTimer_Base_Init 0x08000279 Thumb Code 98 mytimer.o(i.MyTimer_Base_Init) + MyTimer_Base_Start 0x080002e5 Thumb Code 10 mytimer.o(i.MyTimer_Base_Start) + SystemInit 0x080003d9 Thumb Code 78 system_stm32f10x.o(i.SystemInit) + TIM1_UP_IRQHandler 0x08000439 Thumb Code 28 mytimer.o(i.TIM1_UP_IRQHandler) + TIM2_IRQHandler 0x0800045d Thumb Code 32 mytimer.o(i.TIM2_IRQHandler) + TIM3_IRQHandler 0x08000481 Thumb Code 28 mytimer.o(i.TIM3_IRQHandler) + TIM4_IRQHandler 0x080004a5 Thumb Code 28 mytimer.o(i.TIM4_IRQHandler) + __scatterload_copy 0x080004c9 Thumb Code 14 handlers.o(i.__scatterload_copy) + __scatterload_null 0x080004d7 Thumb Code 2 handlers.o(i.__scatterload_null) + __scatterload_zeroinit 0x080004d9 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) + main 0x080004e7 Thumb Code 14 main.o(i.main) + Region$$Table$$Base 0x0800050c Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x0800052c Number 0 anon$$obj.o(Region$$Table) ptr1 0x20000000 Data 4 mytimer.o(.data) ptr2 0x20000004 Data 4 mytimer.o(.data) ptr3 0x20000008 Data 4 mytimer.o(.data) @@ -262,51 +273,52 @@ Memory Map of the image Image Entry point : 0x080000ed - Load Region LR_IROM1 (Base: 0x08000000, Size: 0x00000528, Max: 0x00020000, ABSOLUTE) + Load Region LR_IROM1 (Base: 0x08000000, Size: 0x0000053c, Max: 0x00020000, ABSOLUTE) - Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000518, Max: 0x00020000, ABSOLUTE) + Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x0000052c, Max: 0x00020000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x08000000 0x08000000 0x000000ec Data RO 267 RESET startup_stm32f10x_md.o - 0x080000ec 0x080000ec 0x00000000 Code RO 318 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) - 0x080000ec 0x080000ec 0x00000004 Code RO 321 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) - 0x080000f0 0x080000f0 0x00000004 Code RO 324 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 326 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 328 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) - 0x080000f4 0x080000f4 0x00000008 Code RO 329 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) - 0x080000fc 0x080000fc 0x00000004 Code RO 336 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o) - 0x08000100 0x08000100 0x00000000 Code RO 331 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o) - 0x08000100 0x08000100 0x00000000 Code RO 333 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o) - 0x08000100 0x08000100 0x00000004 Code RO 322 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) - 0x08000104 0x08000104 0x00000024 Code RO 268 .text startup_stm32f10x_md.o - 0x08000128 0x08000128 0x00000024 Code RO 337 .text mc_w.l(init.o) - 0x0800014c 0x0800014c 0x000000b4 Code RO 220 i.MyGPIO_Init driver_gpio.o - 0x08000200 0x08000200 0x0000006c Code RO 79 i.MyTimer_Base_Init mytimer.o - 0x0800026c 0x0800026c 0x0000000a Code RO 80 i.MyTimer_Base_Start mytimer.o - 0x08000276 0x08000276 0x00000008 Code RO 275 i.SetSysClock system_stm32f10x.o - 0x0800027e 0x0800027e 0x00000002 PAD - 0x08000280 0x08000280 0x000000e0 Code RO 276 i.SetSysClockTo72 system_stm32f10x.o - 0x08000360 0x08000360 0x00000060 Code RO 278 i.SystemInit system_stm32f10x.o - 0x080003c0 0x080003c0 0x00000024 Code RO 85 i.TIM1_UP_IRQHandler mytimer.o - 0x080003e4 0x080003e4 0x00000024 Code RO 86 i.TIM2_IRQHandler mytimer.o - 0x08000408 0x08000408 0x00000024 Code RO 87 i.TIM3_IRQHandler mytimer.o - 0x0800042c 0x0800042c 0x00000024 Code RO 88 i.TIM4_IRQHandler mytimer.o - 0x08000450 0x08000450 0x0000000e Code RO 341 i.__scatterload_copy mc_w.l(handlers.o) - 0x0800045e 0x0800045e 0x00000002 Code RO 342 i.__scatterload_null mc_w.l(handlers.o) - 0x08000460 0x08000460 0x0000000e Code RO 343 i.__scatterload_zeroinit mc_w.l(handlers.o) - 0x0800046e 0x0800046e 0x00000002 PAD - 0x08000470 0x08000470 0x00000070 Code RO 5 i.main main.o - 0x080004e0 0x080004e0 0x00000018 Data RO 6 .constdata main.o - 0x080004f8 0x080004f8 0x00000020 Data RO 339 Region$$Table anon$$obj.o + 0x08000000 0x08000000 0x000000ec Data RO 303 RESET startup_stm32f10x_md.o + 0x080000ec 0x080000ec 0x00000000 Code RO 354 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) + 0x080000ec 0x080000ec 0x00000004 Code RO 357 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) + 0x080000f0 0x080000f0 0x00000004 Code RO 360 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 362 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 364 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) + 0x080000f4 0x080000f4 0x00000008 Code RO 365 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) + 0x080000fc 0x080000fc 0x00000004 Code RO 372 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o) + 0x08000100 0x08000100 0x00000000 Code RO 367 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o) + 0x08000100 0x08000100 0x00000000 Code RO 369 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o) + 0x08000100 0x08000100 0x00000004 Code RO 358 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) + 0x08000104 0x08000104 0x00000024 Code RO 304 .text startup_stm32f10x_md.o + 0x08000128 0x08000128 0x00000024 Code RO 373 .text mc_w.l(init.o) + 0x0800014c 0x0800014c 0x00000008 Code RO 270 i.Get_Angle mygirouette.o + 0x08000154 0x08000154 0x00000070 Code RO 271 i.Init_Girouette mygirouette.o + 0x080001c4 0x080001c4 0x000000b4 Code RO 222 i.MyGPIO_Init driver_gpio.o + 0x08000278 0x08000278 0x0000006c Code RO 81 i.MyTimer_Base_Init mytimer.o + 0x080002e4 0x080002e4 0x0000000a Code RO 82 i.MyTimer_Base_Start mytimer.o + 0x080002ee 0x080002ee 0x00000008 Code RO 311 i.SetSysClock system_stm32f10x.o + 0x080002f6 0x080002f6 0x00000002 PAD + 0x080002f8 0x080002f8 0x000000e0 Code RO 312 i.SetSysClockTo72 system_stm32f10x.o + 0x080003d8 0x080003d8 0x00000060 Code RO 314 i.SystemInit system_stm32f10x.o + 0x08000438 0x08000438 0x00000024 Code RO 87 i.TIM1_UP_IRQHandler mytimer.o + 0x0800045c 0x0800045c 0x00000024 Code RO 88 i.TIM2_IRQHandler mytimer.o + 0x08000480 0x08000480 0x00000024 Code RO 89 i.TIM3_IRQHandler mytimer.o + 0x080004a4 0x080004a4 0x00000024 Code RO 90 i.TIM4_IRQHandler mytimer.o + 0x080004c8 0x080004c8 0x0000000e Code RO 377 i.__scatterload_copy mc_w.l(handlers.o) + 0x080004d6 0x080004d6 0x00000002 Code RO 378 i.__scatterload_null mc_w.l(handlers.o) + 0x080004d8 0x080004d8 0x0000000e Code RO 379 i.__scatterload_zeroinit mc_w.l(handlers.o) + 0x080004e6 0x080004e6 0x0000000e Code RO 5 i.main main.o + 0x080004f4 0x080004f4 0x00000018 Data RO 272 .constdata mygirouette.o + 0x0800050c 0x0800050c 0x00000020 Data RO 375 Region$$Table anon$$obj.o - Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x08000518, Size: 0x00000410, Max: 0x00005000, ABSOLUTE) + Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x0800052c, Size: 0x00000410, Max: 0x00005000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 0x08000518 0x00000010 Data RW 89 .data mytimer.o - 0x20000010 - 0x00000400 Zero RW 265 STACK startup_stm32f10x_md.o + 0x20000000 0x0800052c 0x00000010 Data RW 91 .data mytimer.o + 0x20000010 - 0x00000400 Zero RW 301 STACK startup_stm32f10x_md.o ============================================================================== @@ -317,13 +329,14 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name 180 14 0 0 0 878 driver_gpio.o - 112 6 24 0 0 207835 main.o + 14 0 0 0 0 206763 main.o + 120 4 24 0 0 957 mygirouette.o 262 38 0 16 0 4318 mytimer.o 36 8 236 0 1024 792 startup_stm32f10x_md.o 328 28 0 0 0 1901 system_stm32f10x.o ---------------------------------------------------------------------- - 920 94 292 16 1024 215724 Object Totals + 942 92 292 16 1024 215609 Object Totals 0 0 32 0 0 0 (incl. Generated) 2 0 0 0 0 0 (incl. Padding) @@ -344,8 +357,8 @@ Image component sizes 36 8 0 0 0 68 init.o ---------------------------------------------------------------------- - 92 16 0 0 0 68 Library Totals - 2 0 0 0 0 0 (incl. Padding) + 90 16 0 0 0 68 Library Totals + 0 0 0 0 0 0 (incl. Padding) ---------------------------------------------------------------------- @@ -354,7 +367,7 @@ Image component sizes 90 16 0 0 0 68 mc_w.l ---------------------------------------------------------------------- - 92 16 0 0 0 68 Library Totals + 90 16 0 0 0 68 Library Totals ---------------------------------------------------------------------- @@ -363,15 +376,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 1012 110 292 16 1024 215476 Grand Totals - 1012 110 292 16 1024 215476 ELF Image Totals - 1012 110 292 16 0 0 ROM Totals + 1032 108 292 16 1024 215309 Grand Totals + 1032 108 292 16 1024 215309 ELF Image Totals + 1032 108 292 16 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 1304 ( 1.27kB) + Total RO Size (Code + RO Data) 1324 ( 1.29kB) Total RW Size (RW Data + ZI Data) 1040 ( 1.02kB) - Total ROM Size (Code + RO Data + RW Data) 1320 ( 1.29kB) + Total ROM Size (Code + RO Data + RW Data) 1340 ( 1.31kB) ============================================================================== diff --git a/Objects/Projet1_Réel.dep b/Objects/Projet1_Réel.dep index 67691ad..17d0c4a 100644 --- a/Objects/Projet1_Réel.dep +++ b/Objects/Projet1_Réel.dep @@ -1,6 +1,6 @@ Dependencies for Project 'Projet1', Target 'Réel': (DO NOT MODIFY !) CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC -F (.\Sources\main.c)(0x635BB559)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\main.o --omf_browse .\objects\main.crf --depend .\objects\main.d) +F (.\Sources\main.c)(0x635BBB54)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\main.o --omf_browse .\objects\main.crf --depend .\objects\main.d) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) I (.\RTE\_R_el\RTE_Components.h)(0x6352AB45) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) @@ -12,6 +12,7 @@ I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_ I (.\FileInclude\Driver_GPIO.h)(0x6352AB45) I (.\FileInclude\MyTimer.h)(0x6352B1EA) I (.\FileInclude\MyADC.h)(0x6352AB45) +I (.\FileInclude\MyGirouette.h)(0x635BBB64) F (.\FileInclude\MyTimer.c)(0x6352B454)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\mytimer.o --omf_browse .\objects\mytimer.crf --depend .\objects\mytimer.d) I (FileInclude\MyTimer.h)(0x6352B1EA) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) @@ -48,6 +49,19 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compil I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC) F (.\FileInclude\Driver_GPIO.h)(0x6352AB45)() +F (.\FileInclude\MyGirouette.c)(0x635BBB5F)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\mygirouette.o --omf_browse .\objects\mygirouette.crf --depend .\objects\mygirouette.d) +I (FileInclude\MyGirouette.h)(0x635BBB64) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) +I (.\RTE\_R_el\RTE_Components.h)(0x6352AB45) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) +I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC) +I (FileInclude\Driver_GPIO.h)(0x6352AB45) +I (FileInclude\MyTimer.h)(0x6352B1EA) +F (.\FileInclude\MyGirouette.h)(0x635BBB64)() F (RTE\Device\STM32F103RB\RTE_Device.h)(0x6352AB45)() F (RTE\Device\STM32F103RB\startup_stm32f10x_md.s)(0x6352AB45)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 534" --pd "_RTE_ SETA 1" --pd "STM32F10X_MD SETA 1" --pd "_RTE_ SETA 1" --list .\listings\startup_stm32f10x_md.lst --xref -o .\objects\startup_stm32f10x_md.o --depend .\objects\startup_stm32f10x_md.d) F (RTE\Device\STM32F103RB\system_stm32f10x.c)(0x6352B469)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\system_stm32f10x.o --omf_browse .\objects\system_stm32f10x.crf --depend .\objects\system_stm32f10x.d) diff --git a/Objects/Projet1_Simulation.axf b/Objects/Projet1_Simulation.axf index dbd125f..f27a149 100644 Binary files a/Objects/Projet1_Simulation.axf and b/Objects/Projet1_Simulation.axf differ diff --git a/Objects/Projet1_Simulation.build_log.htm b/Objects/Projet1_Simulation.build_log.htm index 72867d2..5c2b9d3 100644 --- a/Objects/Projet1_Simulation.build_log.htm +++ b/Objects/Projet1_Simulation.build_log.htm @@ -22,20 +22,24 @@ Dialog DLL: TARMSTM.DLL V1.66.0.0
#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Fri Oct 28 13:01:42 2022
+
#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Fri Oct 28 13:22:35 2022
-
__main (Thumb, 0 bytes, Stack size unknown bytes, entry.o(.ARM.Collect$$$$00000000))
[Address Reference Count : 1]
_main_stk (Thumb, 0 bytes, Stack size unknown bytes, entry2.o(.ARM.Collect$$$$00000001)) +
_main_stk (Thumb, 0 bytes, Stack size unknown bytes, entry2.o(.ARM.Collect$$$$00000001))
_main_scatterload (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004))
[Calls]
_main_clock (Thumb, 0 bytes, Stack size unknown bytes, entry7b.o(.ARM.Collect$$$$00000008)) +
_main_clock (Thumb, 0 bytes, Stack size unknown bytes, entry7b.o(.ARM.Collect$$$$00000008)) -
_main_cpp_init (Thumb, 0 bytes, Stack size unknown bytes, entry8b.o(.ARM.Collect$$$$0000000A)) +
_main_cpp_init (Thumb, 0 bytes, Stack size unknown bytes, entry8b.o(.ARM.Collect$$$$0000000A)) -
_main_init (Thumb, 0 bytes, Stack size unknown bytes, entry9a.o(.ARM.Collect$$$$0000000B)) +
_main_init (Thumb, 0 bytes, Stack size unknown bytes, entry9a.o(.ARM.Collect$$$$0000000B)) -
__rt_lib_shutdown_fini (Thumb, 0 bytes, Stack size unknown bytes, entry12b.o(.ARM.Collect$$$$0000000E)) +
__rt_lib_shutdown_fini (Thumb, 0 bytes, Stack size unknown bytes, entry12b.o(.ARM.Collect$$$$0000000E)) -
__rt_final_cpp (Thumb, 0 bytes, Stack size unknown bytes, entry10a.o(.ARM.Collect$$$$0000000F)) +
__rt_final_cpp (Thumb, 0 bytes, Stack size unknown bytes, entry10a.o(.ARM.Collect$$$$0000000F)) -
__rt_final_exit (Thumb, 0 bytes, Stack size unknown bytes, entry11a.o(.ARM.Collect$$$$00000011)) +
__rt_final_exit (Thumb, 0 bytes, Stack size unknown bytes, entry11a.o(.ARM.Collect$$$$00000011))
Reset_Handler (Thumb, 8 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
[Address Reference Count : 1]
__scatterload_rt2 (Thumb, 0 bytes, Stack size 0 bytes, init.o(.text), UNUSED) +
__scatterload_rt2 (Thumb, 0 bytes, Stack size 0 bytes, init.o(.text), UNUSED) -
MyGPIO_Init (Thumb, 166 bytes, Stack size 12 bytes, driver_gpio.o(i.MyGPIO_Init))
-
[Stack]
Get_Angle (Thumb, 8 bytes, Stack size 0 bytes, mygirouette.o(i.Get_Angle))
+
[Called By]
Init_Girouette (Thumb, 108 bytes, Stack size 40 bytes, mygirouette.o(i.Init_Girouette))
+
[Stack]
MyTimer_Base_Init (Thumb, 98 bytes, Stack size 0 bytes, mytimer.o(i.MyTimer_Base_Init))
-
[Called By]
MyGPIO_Init (Thumb, 166 bytes, Stack size 12 bytes, driver_gpio.o(i.MyGPIO_Init))
+
[Stack]
MyTimer_Base_Start (Thumb, 10 bytes, Stack size 0 bytes, mytimer.o(i.MyTimer_Base_Start))
-
[Called By]
MyTimer_Base_Init (Thumb, 98 bytes, Stack size 0 bytes, mytimer.o(i.MyTimer_Base_Init))
+
[Called By]
MyTimer_Base_Start (Thumb, 10 bytes, Stack size 0 bytes, mytimer.o(i.MyTimer_Base_Start))
+
[Called By]
SystemInit (Thumb, 78 bytes, Stack size 8 bytes, system_stm32f10x.o(i.SystemInit))
[Stack]
__scatterload_copy (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_copy), UNUSED) +
__scatterload_copy (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_copy), UNUSED) -
__scatterload_null (Thumb, 2 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_null), UNUSED) +
__scatterload_null (Thumb, 2 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_null), UNUSED) -
__scatterload_zeroinit (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_zeroinit), UNUSED) +
__scatterload_zeroinit (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_zeroinit), UNUSED) -
main (Thumb, 106 bytes, Stack size 32 bytes, main.o(i.main))
-
[Stack]
main (Thumb, 14 bytes, Stack size 0 bytes, main.o(i.main))
+
[Stack]
SetSysClock (Thumb, 8 bytes, Stack size 8 bytes, system_stm32f10x.o(i.SetSysClock)) +
SetSysClock (Thumb, 8 bytes, Stack size 8 bytes, system_stm32f10x.o(i.SetSysClock))
[Stack]
SetSysClockTo72 (Thumb, 214 bytes, Stack size 12 bytes, system_stm32f10x.o(i.SetSysClockTo72)) +
SetSysClockTo72 (Thumb, 214 bytes, Stack size 12 bytes, system_stm32f10x.o(i.SetSysClockTo72))
[Stack]