diff --git a/Keil_Elise_Yuwei/Local_Sources/bordage/Include/bordage.c b/Keil_Elise_Yuwei/Local_Sources/bordage/Include/bordage.c
index a55f39b..14ed5d2 100644
--- a/Keil_Elise_Yuwei/Local_Sources/bordage/Include/bordage.c
+++ b/Keil_Elise_Yuwei/Local_Sources/bordage/Include/bordage.c
@@ -21,7 +21,9 @@
*/
int bordage ( int angle ) {
- float duty_cycle = ((float) angle)/18.0 + 5.0; // convertit l'angle en rapport cyclique pour la commande du servo moteur
+ float angle_servo = 90.0 - angle;
+
+ float duty_cycle = angle_servo/18.0 + 5.0; // convertit l'angle en rapport cyclique pour la commande du servo moteur
// Configuration du timer avec une période de 20ms
MyTimer_Struct_TypeDef TIM;
diff --git a/Keil_Elise_Yuwei/Local_Sources/bordage/Listings/drivers_simule.map b/Keil_Elise_Yuwei/Local_Sources/bordage/Listings/drivers_simule.map
index f249e49..1e1c9d6 100644
--- a/Keil_Elise_Yuwei/Local_Sources/bordage/Listings/drivers_simule.map
+++ b/Keil_Elise_Yuwei/Local_Sources/bordage/Listings/drivers_simule.map
@@ -16,11 +16,11 @@ Section Cross References
mytimer.o(i.TIM3_IRQHandler) refers to mytimer.o(.data) for PtrF
mytimer.o(i.TIM4_IRQHandler) refers to mytimer.o(.data) for PtrF
bordage.o(i.Roulis_Handler) refers to bordage.o(i.bordage) for bordage
- bordage.o(i.bordage) refers to fflti.o(.text) for __aeabi_i2f
+ bordage.o(i.bordage) refers to dflti.o(.text) for __aeabi_i2d
+ bordage.o(i.bordage) refers to dadd.o(.text) for __aeabi_drsub
+ bordage.o(i.bordage) refers to d2f.o(.text) for __aeabi_d2f
bordage.o(i.bordage) refers to f2d.o(.text) for __aeabi_f2d
bordage.o(i.bordage) refers to ddiv.o(.text) for __aeabi_ddiv
- bordage.o(i.bordage) refers to dadd.o(.text) for __aeabi_dadd
- bordage.o(i.bordage) refers to d2f.o(.text) for __aeabi_d2f
bordage.o(i.bordage) refers to mytimer.o(i.MyTimer_Base_Init) for MyTimer_Base_Init
bordage.o(i.bordage) refers to mytimer.o(i.MyTimer_PWM) for MyTimer_PWM
bordage.o(i.bordage) refers to ffixui.o(.text) for __aeabi_f2uiz
@@ -50,8 +50,8 @@ Section Cross References
dadd.o(.text) refers to depilogue.o(.text) for _double_epilogue
ddiv.o(.text) refers (Special) to iusefp.o(.text) for __I$use$fp
ddiv.o(.text) refers to depilogue.o(.text) for _double_round
- fflti.o(.text) refers (Special) to iusefp.o(.text) for __I$use$fp
- fflti.o(.text) refers to fepilogue.o(.text) for _float_epilogue
+ dflti.o(.text) refers (Special) to iusefp.o(.text) for __I$use$fp
+ dflti.o(.text) refers to depilogue.o(.text) for _double_epilogue
ffixui.o(.text) refers (Special) to iusefp.o(.text) for __I$use$fp
f2d.o(.text) refers (Special) to iusefp.o(.text) for __I$use$fp
d2f.o(.text) refers (Special) to iusefp.o(.text) for __I$use$fp
@@ -138,7 +138,7 @@ Image Symbol Table
../fplib/microlib/fpepilogue.c 0x00000000 Number 0 fepilogue.o ABSOLUTE
../fplib/microlib/fpepilogue.c 0x00000000 Number 0 depilogue.o ABSOLUTE
../fplib/microlib/fpfix.c 0x00000000 Number 0 ffixui.o ABSOLUTE
- ../fplib/microlib/fpflt.c 0x00000000 Number 0 fflti.o ABSOLUTE
+ ../fplib/microlib/fpflt.c 0x00000000 Number 0 dflti.o ABSOLUTE
Include\Driver_GPIO.c 0x00000000 Number 0 driver_gpio.o ABSOLUTE
Include\MyADC.c 0x00000000 Number 0 myadc.o ABSOLUTE
Include\MyTimer.c 0x00000000 Number 0 mytimer.o ABSOLUTE
@@ -170,36 +170,36 @@ Image Symbol Table
.text 0x08000104 Section 36 startup_stm32f10x_md.o(.text)
.text 0x08000128 Section 0 dadd.o(.text)
.text 0x08000276 Section 0 ddiv.o(.text)
- .text 0x08000354 Section 0 fflti.o(.text)
- .text 0x08000366 Section 0 ffixui.o(.text)
- .text 0x0800038e Section 0 f2d.o(.text)
- .text 0x080003b4 Section 0 d2f.o(.text)
- .text 0x080003ec Section 0 llshl.o(.text)
- .text 0x0800040a Section 0 llsshr.o(.text)
- .text 0x0800042e Section 0 iusefp.o(.text)
- .text 0x0800042e Section 0 fepilogue.o(.text)
- .text 0x0800049c Section 0 depilogue.o(.text)
- .text 0x08000558 Section 36 init.o(.text)
- .text 0x0800057c Section 0 llushr.o(.text)
- i.MyGPIO_Init 0x0800059c Section 0 driver_gpio.o(i.MyGPIO_Init)
- i.MyTimer_Base_Init 0x08000668 Section 0 mytimer.o(i.MyTimer_Base_Init)
- i.MyTimer_PWM 0x080006e4 Section 0 mytimer.o(i.MyTimer_PWM)
- i.Roulis_Handler 0x0800075c Section 0 bordage.o(i.Roulis_Handler)
- i.SetSysClock 0x08000766 Section 0 system_stm32f10x.o(i.SetSysClock)
- SetSysClock 0x08000767 Thumb Code 8 system_stm32f10x.o(i.SetSysClock)
- i.SetSysClockTo72 0x08000770 Section 0 system_stm32f10x.o(i.SetSysClockTo72)
- SetSysClockTo72 0x08000771 Thumb Code 214 system_stm32f10x.o(i.SetSysClockTo72)
- i.Set_Duty_Cycle 0x08000850 Section 0 mytimer.o(i.Set_Duty_Cycle)
- i.SystemInit 0x0800089c Section 0 system_stm32f10x.o(i.SystemInit)
- i.TIM1_UP_IRQHandler 0x080008fc Section 0 mytimer.o(i.TIM1_UP_IRQHandler)
- i.TIM2_IRQHandler 0x08000920 Section 0 mytimer.o(i.TIM2_IRQHandler)
- i.TIM3_IRQHandler 0x08000944 Section 0 mytimer.o(i.TIM3_IRQHandler)
- i.TIM4_IRQHandler 0x08000968 Section 0 mytimer.o(i.TIM4_IRQHandler)
- i.__scatterload_copy 0x0800098c Section 14 handlers.o(i.__scatterload_copy)
- i.__scatterload_null 0x0800099a Section 2 handlers.o(i.__scatterload_null)
- i.__scatterload_zeroinit 0x0800099c Section 14 handlers.o(i.__scatterload_zeroinit)
- i.bordage 0x080009ac Section 0 bordage.o(i.bordage)
- i.main 0x08000a20 Section 0 principal.o(i.main)
+ .text 0x08000354 Section 0 dflti.o(.text)
+ .text 0x08000376 Section 0 ffixui.o(.text)
+ .text 0x0800039e Section 0 f2d.o(.text)
+ .text 0x080003c4 Section 0 d2f.o(.text)
+ .text 0x080003fc Section 0 llshl.o(.text)
+ .text 0x0800041a Section 0 llsshr.o(.text)
+ .text 0x0800043e Section 0 iusefp.o(.text)
+ .text 0x0800043e Section 0 fepilogue.o(.text)
+ .text 0x080004ac Section 0 depilogue.o(.text)
+ .text 0x08000568 Section 36 init.o(.text)
+ .text 0x0800058c Section 0 llushr.o(.text)
+ i.MyGPIO_Init 0x080005ac Section 0 driver_gpio.o(i.MyGPIO_Init)
+ i.MyTimer_Base_Init 0x08000678 Section 0 mytimer.o(i.MyTimer_Base_Init)
+ i.MyTimer_PWM 0x080006f4 Section 0 mytimer.o(i.MyTimer_PWM)
+ i.Roulis_Handler 0x0800076c Section 0 bordage.o(i.Roulis_Handler)
+ i.SetSysClock 0x08000776 Section 0 system_stm32f10x.o(i.SetSysClock)
+ SetSysClock 0x08000777 Thumb Code 8 system_stm32f10x.o(i.SetSysClock)
+ i.SetSysClockTo72 0x08000780 Section 0 system_stm32f10x.o(i.SetSysClockTo72)
+ SetSysClockTo72 0x08000781 Thumb Code 214 system_stm32f10x.o(i.SetSysClockTo72)
+ i.Set_Duty_Cycle 0x08000860 Section 0 mytimer.o(i.Set_Duty_Cycle)
+ i.SystemInit 0x080008ac Section 0 system_stm32f10x.o(i.SystemInit)
+ i.TIM1_UP_IRQHandler 0x0800090c Section 0 mytimer.o(i.TIM1_UP_IRQHandler)
+ i.TIM2_IRQHandler 0x08000930 Section 0 mytimer.o(i.TIM2_IRQHandler)
+ i.TIM3_IRQHandler 0x08000954 Section 0 mytimer.o(i.TIM3_IRQHandler)
+ i.TIM4_IRQHandler 0x08000978 Section 0 mytimer.o(i.TIM4_IRQHandler)
+ i.__scatterload_copy 0x0800099c Section 14 handlers.o(i.__scatterload_copy)
+ i.__scatterload_null 0x080009aa Section 2 handlers.o(i.__scatterload_null)
+ i.__scatterload_zeroinit 0x080009ac Section 14 handlers.o(i.__scatterload_zeroinit)
+ i.bordage 0x080009bc Section 0 bordage.o(i.bordage)
+ i.main 0x08000a44 Section 0 principal.o(i.main)
.data 0x20000000 Section 8 principal.o(.data)
.data 0x20000008 Section 4 mytimer.o(.data)
STACK 0x20000010 Section 1024 startup_stm32f10x_md.o(STACK)
@@ -282,40 +282,40 @@ Image Symbol Table
__aeabi_dsub 0x0800026b Thumb Code 6 dadd.o(.text)
__aeabi_drsub 0x08000271 Thumb Code 6 dadd.o(.text)
__aeabi_ddiv 0x08000277 Thumb Code 222 ddiv.o(.text)
- __aeabi_i2f 0x08000355 Thumb Code 18 fflti.o(.text)
- __aeabi_f2uiz 0x08000367 Thumb Code 40 ffixui.o(.text)
- __aeabi_f2d 0x0800038f Thumb Code 38 f2d.o(.text)
- __aeabi_d2f 0x080003b5 Thumb Code 56 d2f.o(.text)
- __aeabi_llsl 0x080003ed Thumb Code 30 llshl.o(.text)
- _ll_shift_l 0x080003ed Thumb Code 0 llshl.o(.text)
- __aeabi_lasr 0x0800040b Thumb Code 36 llsshr.o(.text)
- _ll_sshift_r 0x0800040b Thumb Code 0 llsshr.o(.text)
- __I$use$fp 0x0800042f Thumb Code 0 iusefp.o(.text)
- _float_round 0x0800042f Thumb Code 18 fepilogue.o(.text)
- _float_epilogue 0x08000441 Thumb Code 92 fepilogue.o(.text)
- _double_round 0x0800049d Thumb Code 30 depilogue.o(.text)
- _double_epilogue 0x080004bb Thumb Code 156 depilogue.o(.text)
- __scatterload 0x08000559 Thumb Code 28 init.o(.text)
- __scatterload_rt2 0x08000559 Thumb Code 0 init.o(.text)
- __aeabi_llsr 0x0800057d Thumb Code 32 llushr.o(.text)
- _ll_ushift_r 0x0800057d Thumb Code 0 llushr.o(.text)
- MyGPIO_Init 0x0800059d Thumb Code 184 driver_gpio.o(i.MyGPIO_Init)
- MyTimer_Base_Init 0x08000669 Thumb Code 106 mytimer.o(i.MyTimer_Base_Init)
- MyTimer_PWM 0x080006e5 Thumb Code 120 mytimer.o(i.MyTimer_PWM)
- Roulis_Handler 0x0800075d Thumb Code 10 bordage.o(i.Roulis_Handler)
- Set_Duty_Cycle 0x08000851 Thumb Code 76 mytimer.o(i.Set_Duty_Cycle)
- SystemInit 0x0800089d Thumb Code 78 system_stm32f10x.o(i.SystemInit)
- TIM1_UP_IRQHandler 0x080008fd Thumb Code 28 mytimer.o(i.TIM1_UP_IRQHandler)
- TIM2_IRQHandler 0x08000921 Thumb Code 32 mytimer.o(i.TIM2_IRQHandler)
- TIM3_IRQHandler 0x08000945 Thumb Code 28 mytimer.o(i.TIM3_IRQHandler)
- TIM4_IRQHandler 0x08000969 Thumb Code 28 mytimer.o(i.TIM4_IRQHandler)
- __scatterload_copy 0x0800098d Thumb Code 14 handlers.o(i.__scatterload_copy)
- __scatterload_null 0x0800099b Thumb Code 2 handlers.o(i.__scatterload_null)
- __scatterload_zeroinit 0x0800099d Thumb Code 14 handlers.o(i.__scatterload_zeroinit)
- bordage 0x080009ad Thumb Code 102 bordage.o(i.bordage)
- main 0x08000a21 Thumb Code 28 principal.o(i.main)
- Region$$Table$$Base 0x08000a44 Number 0 anon$$obj.o(Region$$Table)
- Region$$Table$$Limit 0x08000a64 Number 0 anon$$obj.o(Region$$Table)
+ __aeabi_i2d 0x08000355 Thumb Code 34 dflti.o(.text)
+ __aeabi_f2uiz 0x08000377 Thumb Code 40 ffixui.o(.text)
+ __aeabi_f2d 0x0800039f Thumb Code 38 f2d.o(.text)
+ __aeabi_d2f 0x080003c5 Thumb Code 56 d2f.o(.text)
+ __aeabi_llsl 0x080003fd Thumb Code 30 llshl.o(.text)
+ _ll_shift_l 0x080003fd Thumb Code 0 llshl.o(.text)
+ __aeabi_lasr 0x0800041b Thumb Code 36 llsshr.o(.text)
+ _ll_sshift_r 0x0800041b Thumb Code 0 llsshr.o(.text)
+ __I$use$fp 0x0800043f Thumb Code 0 iusefp.o(.text)
+ _float_round 0x0800043f Thumb Code 18 fepilogue.o(.text)
+ _float_epilogue 0x08000451 Thumb Code 92 fepilogue.o(.text)
+ _double_round 0x080004ad Thumb Code 30 depilogue.o(.text)
+ _double_epilogue 0x080004cb Thumb Code 156 depilogue.o(.text)
+ __scatterload 0x08000569 Thumb Code 28 init.o(.text)
+ __scatterload_rt2 0x08000569 Thumb Code 0 init.o(.text)
+ __aeabi_llsr 0x0800058d Thumb Code 32 llushr.o(.text)
+ _ll_ushift_r 0x0800058d Thumb Code 0 llushr.o(.text)
+ MyGPIO_Init 0x080005ad Thumb Code 184 driver_gpio.o(i.MyGPIO_Init)
+ MyTimer_Base_Init 0x08000679 Thumb Code 106 mytimer.o(i.MyTimer_Base_Init)
+ MyTimer_PWM 0x080006f5 Thumb Code 120 mytimer.o(i.MyTimer_PWM)
+ Roulis_Handler 0x0800076d Thumb Code 10 bordage.o(i.Roulis_Handler)
+ Set_Duty_Cycle 0x08000861 Thumb Code 76 mytimer.o(i.Set_Duty_Cycle)
+ SystemInit 0x080008ad Thumb Code 78 system_stm32f10x.o(i.SystemInit)
+ TIM1_UP_IRQHandler 0x0800090d Thumb Code 28 mytimer.o(i.TIM1_UP_IRQHandler)
+ TIM2_IRQHandler 0x08000931 Thumb Code 32 mytimer.o(i.TIM2_IRQHandler)
+ TIM3_IRQHandler 0x08000955 Thumb Code 28 mytimer.o(i.TIM3_IRQHandler)
+ TIM4_IRQHandler 0x08000979 Thumb Code 28 mytimer.o(i.TIM4_IRQHandler)
+ __scatterload_copy 0x0800099d Thumb Code 14 handlers.o(i.__scatterload_copy)
+ __scatterload_null 0x080009ab Thumb Code 2 handlers.o(i.__scatterload_null)
+ __scatterload_zeroinit 0x080009ad Thumb Code 14 handlers.o(i.__scatterload_zeroinit)
+ bordage 0x080009bd Thumb Code 120 bordage.o(i.bordage)
+ main 0x08000a45 Thumb Code 28 principal.o(i.main)
+ Region$$Table$$Base 0x08000a68 Number 0 anon$$obj.o(Region$$Table)
+ Region$$Table$$Limit 0x08000a88 Number 0 anon$$obj.o(Region$$Table)
GPIO_Struct 0x20000000 Data 8 principal.o(.data)
PtrF 0x20000008 Data 4 mytimer.o(.data)
__initial_sp 0x20000410 Data 0 startup_stm32f10x_md.o(STACK)
@@ -328,74 +328,74 @@ Memory Map of the image
Image Entry point : 0x08000105
- Load Region LR_1 (Base: 0x08000000, Size: 0x00000a70, Max: 0xffffffff, ABSOLUTE)
+ Load Region LR_1 (Base: 0x08000000, Size: 0x00000a94, Max: 0xffffffff, ABSOLUTE)
- Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000a64, Max: 0xffffffff, ABSOLUTE)
+ Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000a88, Max: 0xffffffff, ABSOLUTE)
Exec Addr Load Addr Size Type Attr Idx E Section Name Object
- 0x08000000 0x08000000 0x000000ec Data RO 266 RESET startup_stm32f10x_md.o
- 0x080000ec 0x080000ec 0x00000000 Code RO 317 * .ARM.Collect$$$$00000000 mc_w.l(entry.o)
- 0x080000ec 0x080000ec 0x00000004 Code RO 332 .ARM.Collect$$$$00000001 mc_w.l(entry2.o)
- 0x080000f0 0x080000f0 0x00000004 Code RO 335 .ARM.Collect$$$$00000004 mc_w.l(entry5.o)
- 0x080000f4 0x080000f4 0x00000000 Code RO 337 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o)
- 0x080000f4 0x080000f4 0x00000000 Code RO 339 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o)
- 0x080000f4 0x080000f4 0x00000008 Code RO 340 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o)
- 0x080000fc 0x080000fc 0x00000004 Code RO 347 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o)
- 0x08000100 0x08000100 0x00000000 Code RO 342 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o)
- 0x08000100 0x08000100 0x00000000 Code RO 344 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o)
- 0x08000100 0x08000100 0x00000004 Code RO 333 .ARM.Collect$$$$00002712 mc_w.l(entry2.o)
- 0x08000104 0x08000104 0x00000024 Code RO 267 * .text startup_stm32f10x_md.o
- 0x08000128 0x08000128 0x0000014e Code RO 320 .text mf_w.l(dadd.o)
- 0x08000276 0x08000276 0x000000de Code RO 322 .text mf_w.l(ddiv.o)
- 0x08000354 0x08000354 0x00000012 Code RO 324 .text mf_w.l(fflti.o)
- 0x08000366 0x08000366 0x00000028 Code RO 326 .text mf_w.l(ffixui.o)
- 0x0800038e 0x0800038e 0x00000026 Code RO 328 .text mf_w.l(f2d.o)
- 0x080003b4 0x080003b4 0x00000038 Code RO 330 .text mf_w.l(d2f.o)
- 0x080003ec 0x080003ec 0x0000001e Code RO 348 .text mc_w.l(llshl.o)
- 0x0800040a 0x0800040a 0x00000024 Code RO 350 .text mc_w.l(llsshr.o)
- 0x0800042e 0x0800042e 0x00000000 Code RO 352 .text mc_w.l(iusefp.o)
- 0x0800042e 0x0800042e 0x0000006e Code RO 353 .text mf_w.l(fepilogue.o)
- 0x0800049c 0x0800049c 0x000000ba Code RO 355 .text mf_w.l(depilogue.o)
- 0x08000556 0x08000556 0x00000002 PAD
- 0x08000558 0x08000558 0x00000024 Code RO 357 .text mc_w.l(init.o)
- 0x0800057c 0x0800057c 0x00000020 Code RO 359 .text mc_w.l(llushr.o)
- 0x0800059c 0x0800059c 0x000000cc Code RO 72 i.MyGPIO_Init driver_gpio.o
- 0x08000668 0x08000668 0x0000007c Code RO 124 i.MyTimer_Base_Init mytimer.o
- 0x080006e4 0x080006e4 0x00000078 Code RO 126 i.MyTimer_PWM mytimer.o
- 0x0800075c 0x0800075c 0x0000000a Code RO 234 i.Roulis_Handler bordage.o
- 0x08000766 0x08000766 0x00000008 Code RO 274 i.SetSysClock system_stm32f10x.o
- 0x0800076e 0x0800076e 0x00000002 PAD
- 0x08000770 0x08000770 0x000000e0 Code RO 275 i.SetSysClockTo72 system_stm32f10x.o
- 0x08000850 0x08000850 0x0000004c Code RO 127 i.Set_Duty_Cycle mytimer.o
- 0x0800089c 0x0800089c 0x00000060 Code RO 277 i.SystemInit system_stm32f10x.o
- 0x080008fc 0x080008fc 0x00000024 Code RO 128 i.TIM1_UP_IRQHandler mytimer.o
- 0x08000920 0x08000920 0x00000024 Code RO 129 i.TIM2_IRQHandler mytimer.o
- 0x08000944 0x08000944 0x00000024 Code RO 130 i.TIM3_IRQHandler mytimer.o
- 0x08000968 0x08000968 0x00000024 Code RO 131 i.TIM4_IRQHandler mytimer.o
- 0x0800098c 0x0800098c 0x0000000e Code RO 363 i.__scatterload_copy mc_w.l(handlers.o)
- 0x0800099a 0x0800099a 0x00000002 Code RO 364 i.__scatterload_null mc_w.l(handlers.o)
- 0x0800099c 0x0800099c 0x0000000e Code RO 365 i.__scatterload_zeroinit mc_w.l(handlers.o)
- 0x080009aa 0x080009aa 0x00000002 PAD
- 0x080009ac 0x080009ac 0x00000074 Code RO 235 i.bordage bordage.o
- 0x08000a20 0x08000a20 0x00000024 Code RO 4 i.main principal.o
- 0x08000a44 0x08000a44 0x00000020 Data RO 361 Region$$Table anon$$obj.o
+ 0x08000000 0x08000000 0x000000ec Data RO 276 RESET startup_stm32f10x_md.o
+ 0x080000ec 0x080000ec 0x00000000 Code RO 327 * .ARM.Collect$$$$00000000 mc_w.l(entry.o)
+ 0x080000ec 0x080000ec 0x00000004 Code RO 342 .ARM.Collect$$$$00000001 mc_w.l(entry2.o)
+ 0x080000f0 0x080000f0 0x00000004 Code RO 345 .ARM.Collect$$$$00000004 mc_w.l(entry5.o)
+ 0x080000f4 0x080000f4 0x00000000 Code RO 347 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o)
+ 0x080000f4 0x080000f4 0x00000000 Code RO 349 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o)
+ 0x080000f4 0x080000f4 0x00000008 Code RO 350 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o)
+ 0x080000fc 0x080000fc 0x00000004 Code RO 357 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o)
+ 0x08000100 0x08000100 0x00000000 Code RO 352 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o)
+ 0x08000100 0x08000100 0x00000000 Code RO 354 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o)
+ 0x08000100 0x08000100 0x00000004 Code RO 343 .ARM.Collect$$$$00002712 mc_w.l(entry2.o)
+ 0x08000104 0x08000104 0x00000024 Code RO 277 * .text startup_stm32f10x_md.o
+ 0x08000128 0x08000128 0x0000014e Code RO 330 .text mf_w.l(dadd.o)
+ 0x08000276 0x08000276 0x000000de Code RO 332 .text mf_w.l(ddiv.o)
+ 0x08000354 0x08000354 0x00000022 Code RO 334 .text mf_w.l(dflti.o)
+ 0x08000376 0x08000376 0x00000028 Code RO 336 .text mf_w.l(ffixui.o)
+ 0x0800039e 0x0800039e 0x00000026 Code RO 338 .text mf_w.l(f2d.o)
+ 0x080003c4 0x080003c4 0x00000038 Code RO 340 .text mf_w.l(d2f.o)
+ 0x080003fc 0x080003fc 0x0000001e Code RO 358 .text mc_w.l(llshl.o)
+ 0x0800041a 0x0800041a 0x00000024 Code RO 360 .text mc_w.l(llsshr.o)
+ 0x0800043e 0x0800043e 0x00000000 Code RO 362 .text mc_w.l(iusefp.o)
+ 0x0800043e 0x0800043e 0x0000006e Code RO 363 .text mf_w.l(fepilogue.o)
+ 0x080004ac 0x080004ac 0x000000ba Code RO 365 .text mf_w.l(depilogue.o)
+ 0x08000566 0x08000566 0x00000002 PAD
+ 0x08000568 0x08000568 0x00000024 Code RO 367 .text mc_w.l(init.o)
+ 0x0800058c 0x0800058c 0x00000020 Code RO 369 .text mc_w.l(llushr.o)
+ 0x080005ac 0x080005ac 0x000000cc Code RO 72 i.MyGPIO_Init driver_gpio.o
+ 0x08000678 0x08000678 0x0000007c Code RO 134 i.MyTimer_Base_Init mytimer.o
+ 0x080006f4 0x080006f4 0x00000078 Code RO 136 i.MyTimer_PWM mytimer.o
+ 0x0800076c 0x0800076c 0x0000000a Code RO 244 i.Roulis_Handler bordage.o
+ 0x08000776 0x08000776 0x00000008 Code RO 284 i.SetSysClock system_stm32f10x.o
+ 0x0800077e 0x0800077e 0x00000002 PAD
+ 0x08000780 0x08000780 0x000000e0 Code RO 285 i.SetSysClockTo72 system_stm32f10x.o
+ 0x08000860 0x08000860 0x0000004c Code RO 137 i.Set_Duty_Cycle mytimer.o
+ 0x080008ac 0x080008ac 0x00000060 Code RO 287 i.SystemInit system_stm32f10x.o
+ 0x0800090c 0x0800090c 0x00000024 Code RO 138 i.TIM1_UP_IRQHandler mytimer.o
+ 0x08000930 0x08000930 0x00000024 Code RO 139 i.TIM2_IRQHandler mytimer.o
+ 0x08000954 0x08000954 0x00000024 Code RO 140 i.TIM3_IRQHandler mytimer.o
+ 0x08000978 0x08000978 0x00000024 Code RO 141 i.TIM4_IRQHandler mytimer.o
+ 0x0800099c 0x0800099c 0x0000000e Code RO 373 i.__scatterload_copy mc_w.l(handlers.o)
+ 0x080009aa 0x080009aa 0x00000002 Code RO 374 i.__scatterload_null mc_w.l(handlers.o)
+ 0x080009ac 0x080009ac 0x0000000e Code RO 375 i.__scatterload_zeroinit mc_w.l(handlers.o)
+ 0x080009ba 0x080009ba 0x00000002 PAD
+ 0x080009bc 0x080009bc 0x00000088 Code RO 245 i.bordage bordage.o
+ 0x08000a44 0x08000a44 0x00000024 Code RO 4 i.main principal.o
+ 0x08000a68 0x08000a68 0x00000020 Data RO 371 Region$$Table anon$$obj.o
- Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000a64, Size: 0x0000000c, Max: 0xffffffff, ABSOLUTE)
+ Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000a88, Size: 0x0000000c, Max: 0xffffffff, ABSOLUTE)
Exec Addr Load Addr Size Type Attr Idx E Section Name Object
- 0x20000000 0x08000a64 0x00000008 Data RW 5 .data principal.o
- 0x20000008 0x08000a6c 0x00000004 Data RW 132 .data mytimer.o
+ 0x20000000 0x08000a88 0x00000008 Data RW 5 .data principal.o
+ 0x20000008 0x08000a90 0x00000004 Data RW 142 .data mytimer.o
- Execution Region ER_ZI (Exec base: 0x2000000c, Load base: 0x08000a70, Size: 0x00000404, Max: 0xffffffff, ABSOLUTE)
+ Execution Region ER_ZI (Exec base: 0x2000000c, Load base: 0x08000a94, Size: 0x00000404, Max: 0xffffffff, ABSOLUTE)
Exec Addr Load Addr Size Type Attr Idx E Section Name Object
- 0x2000000c 0x08000a70 0x00000004 PAD
- 0x20000010 - 0x00000400 Zero RW 264 STACK startup_stm32f10x_md.o
+ 0x2000000c 0x08000a94 0x00000004 PAD
+ 0x20000010 - 0x00000400 Zero RW 274 STACK startup_stm32f10x_md.o
==============================================================================
@@ -405,15 +405,15 @@ Image component sizes
Code (inc. data) RO Data RW Data ZI Data Debug Object Name
- 126 14 0 0 0 1063 bordage.o
- 204 20 0 0 0 1566 driver_gpio.o
+ 146 16 0 0 0 1091 bordage.o
+ 204 20 0 0 0 203386 driver_gpio.o
464 46 0 4 0 4761 mytimer.o
36 8 0 8 0 207677 principal.o
36 8 236 0 1024 844 startup_stm32f10x_md.o
328 28 0 0 0 2109 system_stm32f10x.o
----------------------------------------------------------------------
- 1196 124 268 12 1028 218020 Object Totals
+ 1216 126 268 12 1028 419868 Object Totals
0 0 32 0 0 0 (incl. Generated)
2 0 0 0 4 0 (incl. Padding)
@@ -440,13 +440,13 @@ Image component sizes
334 0 0 0 0 148 dadd.o
222 0 0 0 0 100 ddiv.o
186 0 0 0 0 176 depilogue.o
+ 34 0 0 0 0 76 dflti.o
38 0 0 0 0 68 f2d.o
110 0 0 0 0 168 fepilogue.o
40 0 0 0 0 68 ffixui.o
- 18 0 0 0 0 68 fflti.o
----------------------------------------------------------------------
- 1196 16 0 0 0 1156 Library Totals
+ 1212 16 0 0 0 1164 Library Totals
4 0 0 0 0 0 (incl. Padding)
----------------------------------------------------------------------
@@ -454,10 +454,10 @@ Image component sizes
Code (inc. data) RO Data RW Data ZI Data Debug Library Name
188 16 0 0 0 272 mc_w.l
- 1004 0 0 0 0 884 mf_w.l
+ 1020 0 0 0 0 892 mf_w.l
----------------------------------------------------------------------
- 1196 16 0 0 0 1156 Library Totals
+ 1212 16 0 0 0 1164 Library Totals
----------------------------------------------------------------------
@@ -466,15 +466,15 @@ Image component sizes
Code (inc. data) RO Data RW Data ZI Data Debug
- 2392 140 268 12 1028 218184 Grand Totals
- 2392 140 268 12 1028 218184 ELF Image Totals
- 2392 140 268 12 0 0 ROM Totals
+ 2428 142 268 12 1028 420040 Grand Totals
+ 2428 142 268 12 1028 420040 ELF Image Totals
+ 2428 142 268 12 0 0 ROM Totals
==============================================================================
- Total RO Size (Code + RO Data) 2660 ( 2.60kB)
+ Total RO Size (Code + RO Data) 2696 ( 2.63kB)
Total RW Size (RW Data + ZI Data) 1040 ( 1.02kB)
- Total ROM Size (Code + RO Data + RW Data) 2672 ( 2.61kB)
+ Total ROM Size (Code + RO Data + RW Data) 2708 ( 2.64kB)
==============================================================================
diff --git a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/bordage.crf b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/bordage.crf
index 509a7e8..687aacf 100644
Binary files a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/bordage.crf and b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/bordage.crf differ
diff --git a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/bordage.d b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/bordage.d
index 9bcbc2e..c7fb8d4 100644
--- a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/bordage.d
+++ b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/bordage.d
@@ -1,7 +1,7 @@
.\objects\bordage.o: Include\bordage.c
.\objects\bordage.o: Include\Driver_GPIO.h
.\objects\bordage.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h
-.\objects\bordage.o: .\RTE\_Simul_\RTE_Components.h
+.\objects\bordage.o: .\RTE\_R_el\RTE_Components.h
.\objects\bordage.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h
.\objects\bordage.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
.\objects\bordage.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h
diff --git a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/bordage.o b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/bordage.o
index 2de8780..87ffb5f 100644
Binary files a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/bordage.o and b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/bordage.o differ
diff --git a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/driver_gpio.crf b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/driver_gpio.crf
index 15794c1..1b109a2 100644
Binary files a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/driver_gpio.crf and b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/driver_gpio.crf differ
diff --git a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/driver_gpio.d b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/driver_gpio.d
index 9fd5488..05d8136 100644
--- a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/driver_gpio.d
+++ b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/driver_gpio.d
@@ -1,7 +1,7 @@
.\objects\driver_gpio.o: Include\Driver_GPIO.c
.\objects\driver_gpio.o: Include\Driver_GPIO.h
.\objects\driver_gpio.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h
-.\objects\driver_gpio.o: .\RTE\_Simul_\RTE_Components.h
+.\objects\driver_gpio.o: .\RTE\_R_el\RTE_Components.h
.\objects\driver_gpio.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h
.\objects\driver_gpio.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
.\objects\driver_gpio.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h
diff --git a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/driver_gpio.o b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/driver_gpio.o
index 4c13bcc..09a99b4 100644
Binary files a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/driver_gpio.o and b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/driver_gpio.o differ
diff --git a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_Réel.dep b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_Réel.dep
index 501d934..2b9321a 100644
--- a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_Réel.dep
+++ b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_Réel.dep
@@ -1,9 +1,9 @@
Dependencies for Project 'drivers', Target 'Réel': (DO NOT MODIFY !)
CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC
-F (.\Source\principal.c)(0x618418A8)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Include
-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\principal.o --omf_browse .\objects\principal.crf --depend .\objects\principal.d)
+F (.\Source\principal.c)(0x61851991)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Include
-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\principal.o --omf_browse .\objects\principal.crf --depend .\objects\principal.d)
I (.\Include\Driver_GPIO.h)(0x61487FC8)
I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
-I (.\RTE\_R_el\RTE_Components.h)(0x614734C5)
+I (.\RTE\_Simul_\RTE_Components.h)(0x614494D8)
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)
@@ -47,7 +47,7 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.
I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
F (.\Include\MyADC.h)(0x615B16F8)()
F (.\Include\bordage.h)(0x618418F1)()
-F (.\Include\bordage.c)(0x61841870)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Include
-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\bordage.o --omf_browse .\objects\bordage.crf --depend .\objects\bordage.d)
+F (.\Include\bordage.c)(0x61851DC2)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Include
-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\bordage.o --omf_browse .\objects\bordage.crf --depend .\objects\bordage.d)
I (Include\Driver_GPIO.h)(0x61487FC8)
I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
I (.\RTE\_R_el\RTE_Components.h)(0x614734C5)
diff --git a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_Simulé.dep b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_Simulé.dep
index 53fd9de..06e7a3a 100644
--- a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_Simulé.dep
+++ b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_Simulé.dep
@@ -1,6 +1,6 @@
Dependencies for Project 'drivers', Target 'Simulé': (DO NOT MODIFY !)
CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC
-F (.\Source\principal.c)(0x618518AB)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Include
-I.\RTE\Device\STM32F103RB
-I.\RTE\_Simul_
-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\principal.o --omf_browse .\objects\principal.crf --depend .\objects\principal.d)
+F (.\Source\principal.c)(0x61851991)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Include
-I.\RTE\Device\STM32F103RB
-I.\RTE\_Simul_
-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\principal.o --omf_browse .\objects\principal.crf --depend .\objects\principal.d)
I (.\Include\Driver_GPIO.h)(0x61487FC8)
I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
I (.\RTE\_Simul_\RTE_Components.h)(0x614494D8)
diff --git a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_simule.axf b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_simule.axf
index 74a6821..6a10fef 100644
Binary files a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_simule.axf and b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_simule.axf differ
diff --git a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_simule.build_log.htm b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_simule.build_log.htm
index e591a72..6c6ce22 100644
--- a/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_simule.build_log.htm
+++ b/Keil_Elise_Yuwei/Local_Sources/bordage/Objects/drivers_simule.build_log.htm
@@ -26,10 +26,9 @@ Project File Date: 11/04/2021
Output:
*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
-Build target 'Simulé'
-compiling principal.c...
+Build target 'Réel'
linking...
-Program Size: Code=2392 RO-data=268 RW-data=12 ZI-data=1028
+Program Size: Code=2428 RO-data=268 RW-data=12 ZI-data=1028
".\Objects\drivers_simule.axf" - 0 Error(s), 0 Warning(s).
Software Packages used:
@@ -48,7 +47,7 @@ Package Vendor: Keil
Collection of Component include folders:
.\RTE\Device\STM32F103RB
- .\RTE\_Simul_
+ .\RTE\_R_el
C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include
C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include
@@ -57,11 +56,11 @@ Package Vendor: Keil
* Component: ARM::CMSIS:CORE:5.4.0
* Component: Keil::Device:Startup:1.0.0
- Source file: Device\Source\ARM\startup_stm32f10x_md.s
- Include file: RTE_Driver\Config\RTE_Device.h
- Source file: Device\Source\system_stm32f10x.c
Source file: Device\Source\ARM\STM32F1xx_OPT.s
-Build Time Elapsed: 00:00:01
+ Include file: RTE_Driver\Config\RTE_Device.h
+ Source file: Device\Source\ARM\startup_stm32f10x_md.s
+ Source file: Device\Source\system_stm32f10x.c
+Build Time Elapsed: 00:00:00