From cc9194aa8f09259f56ad6aeacda76f36ff518f40 Mon Sep 17 00:00:00 2001 From: joelimgu Date: Mon, 14 Nov 2022 18:29:14 +0100 Subject: [PATCH] EXTI0 PB0 --- FileInclude/MyGirouette.c | 31 ++- Listings/Projet1_Simulation.map | 328 +++++++++-------------- Objects/Projet1_Réel.dep | 27 +- Objects/Projet1_SImulation.dep | 44 ++- Objects/Projet1_Simulation.axf | Bin 239924 -> 231168 bytes Objects/Projet1_Simulation.build_log.htm | 20 +- Objects/Projet1_Simulation.htm | 257 +++--------------- Objects/driver_gpio.crf | Bin 238682 -> 238682 bytes Objects/driver_gpio.o | Bin 259760 -> 259760 bytes Objects/main.crf | Bin 239821 -> 239748 bytes Objects/main.d | 2 +- Objects/main.o | Bin 260244 -> 259884 bytes Objects/myadc.crf | Bin 239586 -> 239586 bytes Objects/myadc.o | Bin 258344 -> 258344 bytes Objects/mygirouette.crf | Bin 239603 -> 239717 bytes Objects/mygirouette.o | Bin 257872 -> 259680 bytes Objects/mytimer.crf | Bin 242802 -> 242802 bytes Objects/mytimer.o | Bin 273544 -> 273544 bytes Objects/myvoile.crf | Bin 238683 -> 238683 bytes Objects/myvoile.o | Bin 257096 -> 257096 bytes Objects/system_stm32f10x.o | Bin 258328 -> 258328 bytes Projet1.uvguix.imbergam | 263 ++++++++---------- Projet1.uvoptx | 127 ++++----- Projet1.uvprojx | 50 ---- Sources/main.c | 12 +- 25 files changed, 423 insertions(+), 738 deletions(-) diff --git a/FileInclude/MyGirouette.c b/FileInclude/MyGirouette.c index b1ab612..00327b5 100644 --- a/FileInclude/MyGirouette.c +++ b/FileInclude/MyGirouette.c @@ -1,6 +1,16 @@ #include "MyGirouette.h" #include "Driver_GPIO.h" #include "MyTimer.h" + +int x = 0; + +void EXTI0_IRQHandler(void) { + x++; + //EXTI->PR &= ~(1<<0) ; + EXTI->PR |= (1<<0) ; +} + + void Init_Girouette(void){ MyGPIO_Struct_TypeDef GPIOA0={ @@ -13,9 +23,14 @@ void Init_Girouette(void){ 1, In_Floating }; + MyGPIO_Struct_TypeDef GPIOB0={ + GPIOB, + 0, + In_Floating + }; // Configuration du timer - MyTimer_Struct_TypeDef TIM; +/* MyTimer_Struct_TypeDef TIM; TIM.Timer = TIM2; TIM.ARR = 360*2; TIM.PSC = 0; @@ -27,11 +42,21 @@ void Init_Girouette(void){ TIM2->SMCR |= 0x1 << 0; // Capture Mode : 1 => seulement les fronts montants 2 => seulement les fronts descendants 3 => les 2 //TIM2->CCMR1 |= 0x1 << 2; +*/ + // 0 Reset + NVIC->ISER[0] |= 1 << 6; + NVIC->IP[6] = 1<<4; + MyGPIO_Init(&GPIOB0); + RCC->APB2ENR |= RCC_APB2ENR_AFIOEN ; + AFIO->EXTICR[0] |= 0x0001; // PB0 AFIO + EXTI->RTSR |= 1 <<0 ; // rising + EXTI->IMR |= 1<<0 ; //mask - MyGPIO_Init(&GPIOA0); + +/* MyGPIO_Init(&GPIOA0); MyGPIO_Init(&GPIOA1); - MyTimer_Base_Start(TIM2); + MyTimer_Base_Start(TIM2);*/ } uint16_t Get_Angle(void){return (TIM2 -> CNT)/2;} diff --git a/Listings/Projet1_Simulation.map b/Listings/Projet1_Simulation.map index 4934cc1..af21612 100644 --- a/Listings/Projet1_Simulation.map +++ b/Listings/Projet1_Simulation.map @@ -9,19 +9,14 @@ Section Cross References main.o(i.Callback) refers to fflti.o(.text) for __aeabi_i2f main.o(i.Callback) refers to main.o(.data) for a main.o(i.main) refers to mygirouette.o(i.Init_Girouette) for Init_Girouette - main.o(i.main) refers to myvoile.o(i.MyVoile_Init) for MyVoile_Init - main.o(i.main) refers to mygirouette.o(i.Get_Angle) for Get_Angle - main.o(i.main) refers to myvoile.o(i.Set_Voile) for Set_Voile - main.o(i.main) refers to main.o(.constdata) for .constdata 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.EXTI0_IRQHandler) refers to mygirouette.o(.data) for x 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 myvoile.o(i.MyVoile_Init) refers to mytimer.o(i.MyTimer_Base_Init) for MyTimer_Base_Init myvoile.o(i.MyVoile_Init) refers to mytimer.o(i.MyTimer_PWM) for MyTimer_PWM @@ -40,6 +35,7 @@ Section Cross References myvoile.o(i.Set_Voile) refers to mytimer.o(i.Set_Duty_Cycle) for Set_Duty_Cycle 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 mygirouette.o(i.EXTI0_IRQHandler) for EXTI0_IRQHandler startup_stm32f10x_md.o(RESET) refers to mytimer.o(i.TIM1_UP_IRQHandler) for TIM1_UP_IRQHandler startup_stm32f10x_md.o(RESET) refers to mytimer.o(i.TIM2_IRQHandler) for TIM2_IRQHandler startup_stm32f10x_md.o(RESET) refers to mytimer.o(i.TIM3_IRQHandler) for TIM3_IRQHandler @@ -100,9 +96,14 @@ Removing Unused input sections from the image. Removing mytimer.o(.rev16_text), (4 bytes). Removing mytimer.o(.revsh_text), (4 bytes). Removing mytimer.o(.rrx_text), (6 bytes). + Removing mytimer.o(i.Get_Max_Duty), (6 bytes). Removing mytimer.o(i.Get_Timer_Count), (6 bytes). Removing mytimer.o(i.MyTimer_ActiveIT), (176 bytes). + Removing mytimer.o(i.MyTimer_Base_Init), (108 bytes). + Removing mytimer.o(i.MyTimer_Base_Start), (10 bytes). Removing mytimer.o(i.MyTimer_Base_Stop), (10 bytes). + Removing mytimer.o(i.MyTimer_PWM), (488 bytes). + Removing mytimer.o(i.Set_Duty_Cycle), (40 bytes). Removing mytimer.o(i.Set_PWM_PRCT), (56 bytes). Removing myadc.o(.rev16_text), (4 bytes). Removing myadc.o(.revsh_text), (4 bytes). @@ -120,18 +121,33 @@ Removing Unused input sections from the image. Removing mygirouette.o(.rev16_text), (4 bytes). Removing mygirouette.o(.revsh_text), (4 bytes). Removing mygirouette.o(.rrx_text), (6 bytes). + Removing mygirouette.o(i.Get_Angle), (14 bytes). Removing myvoile.o(.rev16_text), (4 bytes). Removing myvoile.o(.revsh_text), (4 bytes). Removing myvoile.o(.rrx_text), (6 bytes). + Removing myvoile.o(i.MyVoile_Init), (40 bytes). + Removing myvoile.o(i.Set_Voile), (236 bytes). + Removing myvoile.o(.constdata), (8 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). Removing system_stm32f10x.o(.rrx_text), (6 bytes). Removing system_stm32f10x.o(i.SystemCoreClockUpdate), (164 bytes). Removing system_stm32f10x.o(.data), (20 bytes). + Removing fmul.o(.text), (100 bytes). + Removing dadd.o(.text), (334 bytes). + Removing dmul.o(.text), (228 bytes). + Removing ddiv.o(.text), (222 bytes). Removing fflti.o(.text), (18 bytes). + Removing ffltui.o(.text), (10 bytes). + Removing dfltui.o(.text), (26 bytes). + Removing ffixui.o(.text), (40 bytes). + Removing cdcmple.o(.text), (48 bytes). + Removing d2f.o(.text), (56 bytes). + Removing fepilogue.o(.text), (110 bytes). + Removing depilogue.o(.text), (186 bytes). -38 unused section(s) (total 1262 bytes) removed from the image. +58 unused section(s) (total 3572 bytes) removed from the image. ============================================================================== @@ -141,24 +157,24 @@ Image Symbol Table Symbol Name Value Ov Type Size Object(Section) - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12a.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 entry7a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12b.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 entry9a.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.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/longlong.c 0x00000000 Number 0 llshl.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7a.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12b.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/longlong.c 0x00000000 Number 0 llsshr.o ABSOLUTE ../clib/microlib/longlong.c 0x00000000 Number 0 llushr.o ABSOLUTE + ../clib/microlib/longlong.c 0x00000000 Number 0 llshl.o ABSOLUTE ../clib/microlib/stubs.s 0x00000000 Number 0 iusefp.o ABSOLUTE ../fplib/microlib/d2f.c 0x00000000 Number 0 d2f.o ABSOLUTE ../fplib/microlib/fpadd.c 0x00000000 Number 0 dadd.o ABSOLUTE @@ -166,11 +182,11 @@ Image Symbol Table ../fplib/microlib/fpepilogue.c 0x00000000 Number 0 depilogue.o ABSOLUTE ../fplib/microlib/fpepilogue.c 0x00000000 Number 0 fepilogue.o ABSOLUTE ../fplib/microlib/fpfix.c 0x00000000 Number 0 ffixui.o ABSOLUTE - ../fplib/microlib/fpflt.c 0x00000000 Number 0 ffltui.o ABSOLUTE - ../fplib/microlib/fpflt.c 0x00000000 Number 0 fflti.o ABSOLUTE ../fplib/microlib/fpflt.c 0x00000000 Number 0 dfltui.o ABSOLUTE - ../fplib/microlib/fpmul.c 0x00000000 Number 0 fmul.o ABSOLUTE + ../fplib/microlib/fpflt.c 0x00000000 Number 0 fflti.o ABSOLUTE + ../fplib/microlib/fpflt.c 0x00000000 Number 0 ffltui.o ABSOLUTE ../fplib/microlib/fpmul.c 0x00000000 Number 0 dmul.o ABSOLUTE + ../fplib/microlib/fpmul.c 0x00000000 Number 0 fmul.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 @@ -203,50 +219,27 @@ Image Symbol Table .ARM.Collect$$$$00002712 0x08000100 Section 4 entry2.o(.ARM.Collect$$$$00002712) __lit__00000000 0x08000100 Data 4 entry2.o(.ARM.Collect$$$$00002712) .text 0x08000104 Section 36 startup_stm32f10x_md.o(.text) - .text 0x08000128 Section 0 fmul.o(.text) - .text 0x0800018c Section 0 dadd.o(.text) - .text 0x080002da Section 0 dmul.o(.text) - .text 0x080003be Section 0 ddiv.o(.text) - .text 0x0800049c Section 0 ffltui.o(.text) - .text 0x080004a6 Section 0 dfltui.o(.text) - .text 0x080004c0 Section 0 ffixui.o(.text) - .text 0x080004e8 Section 48 cdcmple.o(.text) - .text 0x08000518 Section 0 d2f.o(.text) - .text 0x08000550 Section 0 llshl.o(.text) - .text 0x0800056e Section 0 llsshr.o(.text) - .text 0x08000592 Section 0 iusefp.o(.text) - .text 0x08000592 Section 0 fepilogue.o(.text) - .text 0x08000600 Section 0 depilogue.o(.text) - .text 0x080006bc Section 36 init.o(.text) - .text 0x080006e0 Section 0 llushr.o(.text) - i.Get_Angle 0x08000700 Section 0 mygirouette.o(i.Get_Angle) - i.Get_Max_Duty 0x0800070e Section 0 mytimer.o(i.Get_Max_Duty) - i.Init_Girouette 0x08000714 Section 0 mygirouette.o(i.Init_Girouette) - i.MyGPIO_Init 0x08000784 Section 0 driver_gpio.o(i.MyGPIO_Init) - i.MyTimer_Base_Init 0x08000838 Section 0 mytimer.o(i.MyTimer_Base_Init) - i.MyTimer_Base_Start 0x080008a4 Section 0 mytimer.o(i.MyTimer_Base_Start) - i.MyTimer_PWM 0x080008b0 Section 0 mytimer.o(i.MyTimer_PWM) - i.MyVoile_Init 0x08000a98 Section 0 myvoile.o(i.MyVoile_Init) - i.SetSysClock 0x08000ac0 Section 0 system_stm32f10x.o(i.SetSysClock) - SetSysClock 0x08000ac1 Thumb Code 8 system_stm32f10x.o(i.SetSysClock) - i.SetSysClockTo72 0x08000ac8 Section 0 system_stm32f10x.o(i.SetSysClockTo72) - SetSysClockTo72 0x08000ac9 Thumb Code 214 system_stm32f10x.o(i.SetSysClockTo72) - i.Set_Duty_Cycle 0x08000ba8 Section 0 mytimer.o(i.Set_Duty_Cycle) - i.Set_Voile 0x08000bd0 Section 0 myvoile.o(i.Set_Voile) - i.SystemInit 0x08000cbc Section 0 system_stm32f10x.o(i.SystemInit) - i.TIM1_UP_IRQHandler 0x08000d1c Section 0 mytimer.o(i.TIM1_UP_IRQHandler) - i.TIM2_IRQHandler 0x08000d40 Section 0 mytimer.o(i.TIM2_IRQHandler) - i.TIM3_IRQHandler 0x08000d64 Section 0 mytimer.o(i.TIM3_IRQHandler) - i.TIM4_IRQHandler 0x08000d88 Section 0 mytimer.o(i.TIM4_IRQHandler) - i.__scatterload_copy 0x08000dac Section 14 handlers.o(i.__scatterload_copy) - i.__scatterload_null 0x08000dba Section 2 handlers.o(i.__scatterload_null) - i.__scatterload_zeroinit 0x08000dbc Section 14 handlers.o(i.__scatterload_zeroinit) - i.main 0x08000dcc Section 0 main.o(i.main) - .constdata 0x08000df0 Section 12 main.o(.constdata) - .constdata 0x08000dfc Section 24 mygirouette.o(.constdata) - .constdata 0x08000e14 Section 8 myvoile.o(.constdata) + .text 0x08000128 Section 36 init.o(.text) + i.EXTI0_IRQHandler 0x0800014c Section 0 mygirouette.o(i.EXTI0_IRQHandler) + i.Init_Girouette 0x0800016c Section 0 mygirouette.o(i.Init_Girouette) + i.MyGPIO_Init 0x0800020c Section 0 driver_gpio.o(i.MyGPIO_Init) + i.SetSysClock 0x080002c0 Section 0 system_stm32f10x.o(i.SetSysClock) + SetSysClock 0x080002c1 Thumb Code 8 system_stm32f10x.o(i.SetSysClock) + i.SetSysClockTo72 0x080002c8 Section 0 system_stm32f10x.o(i.SetSysClockTo72) + SetSysClockTo72 0x080002c9 Thumb Code 214 system_stm32f10x.o(i.SetSysClockTo72) + i.SystemInit 0x080003a8 Section 0 system_stm32f10x.o(i.SystemInit) + i.TIM1_UP_IRQHandler 0x08000408 Section 0 mytimer.o(i.TIM1_UP_IRQHandler) + i.TIM2_IRQHandler 0x0800042c Section 0 mytimer.o(i.TIM2_IRQHandler) + i.TIM3_IRQHandler 0x08000450 Section 0 mytimer.o(i.TIM3_IRQHandler) + i.TIM4_IRQHandler 0x08000474 Section 0 mytimer.o(i.TIM4_IRQHandler) + i.__scatterload_copy 0x08000498 Section 14 handlers.o(i.__scatterload_copy) + i.__scatterload_null 0x080004a6 Section 2 handlers.o(i.__scatterload_null) + i.__scatterload_zeroinit 0x080004a8 Section 14 handlers.o(i.__scatterload_zeroinit) + i.main 0x080004b6 Section 0 main.o(i.main) + .constdata 0x080004c0 Section 36 mygirouette.o(.constdata) .data 0x20000000 Section 16 mytimer.o(.data) - STACK 0x20000010 Section 1024 startup_stm32f10x_md.o(STACK) + .data 0x20000010 Section 4 mygirouette.o(.data) + STACK 0x20000018 Section 1024 startup_stm32f10x_md.o(STACK) Global Symbols @@ -293,7 +286,6 @@ Image Symbol Table DMA1_Channel5_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) DMA1_Channel6_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) DMA1_Channel7_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) - EXTI0_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) EXTI15_10_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) EXTI1_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) EXTI2_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) @@ -322,57 +314,28 @@ Image Symbol Table USB_HP_CAN1_TX_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) USB_LP_CAN1_RX0_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) WWDG_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) - __aeabi_fmul 0x08000129 Thumb Code 100 fmul.o(.text) - __aeabi_dadd 0x0800018d Thumb Code 322 dadd.o(.text) - __aeabi_dsub 0x080002cf Thumb Code 6 dadd.o(.text) - __aeabi_drsub 0x080002d5 Thumb Code 6 dadd.o(.text) - __aeabi_dmul 0x080002db Thumb Code 228 dmul.o(.text) - __aeabi_ddiv 0x080003bf Thumb Code 222 ddiv.o(.text) - __aeabi_ui2f 0x0800049d Thumb Code 10 ffltui.o(.text) - __aeabi_ui2d 0x080004a7 Thumb Code 26 dfltui.o(.text) - __aeabi_f2uiz 0x080004c1 Thumb Code 40 ffixui.o(.text) - __aeabi_cdcmpeq 0x080004e9 Thumb Code 0 cdcmple.o(.text) - __aeabi_cdcmple 0x080004e9 Thumb Code 48 cdcmple.o(.text) - __aeabi_d2f 0x08000519 Thumb Code 56 d2f.o(.text) - __aeabi_llsl 0x08000551 Thumb Code 30 llshl.o(.text) - _ll_shift_l 0x08000551 Thumb Code 0 llshl.o(.text) - __aeabi_lasr 0x0800056f Thumb Code 36 llsshr.o(.text) - _ll_sshift_r 0x0800056f Thumb Code 0 llsshr.o(.text) - __I$use$fp 0x08000593 Thumb Code 0 iusefp.o(.text) - _float_round 0x08000593 Thumb Code 18 fepilogue.o(.text) - _float_epilogue 0x080005a5 Thumb Code 92 fepilogue.o(.text) - _double_round 0x08000601 Thumb Code 30 depilogue.o(.text) - _double_epilogue 0x0800061f Thumb Code 156 depilogue.o(.text) - __scatterload 0x080006bd Thumb Code 28 init.o(.text) - __scatterload_rt2 0x080006bd Thumb Code 0 init.o(.text) - __aeabi_llsr 0x080006e1 Thumb Code 32 llushr.o(.text) - _ll_ushift_r 0x080006e1 Thumb Code 0 llushr.o(.text) - Get_Angle 0x08000701 Thumb Code 14 mygirouette.o(i.Get_Angle) - Get_Max_Duty 0x0800070f Thumb Code 6 mytimer.o(i.Get_Max_Duty) - Init_Girouette 0x08000715 Thumb Code 108 mygirouette.o(i.Init_Girouette) - MyGPIO_Init 0x08000785 Thumb Code 166 driver_gpio.o(i.MyGPIO_Init) - MyTimer_Base_Init 0x08000839 Thumb Code 98 mytimer.o(i.MyTimer_Base_Init) - MyTimer_Base_Start 0x080008a5 Thumb Code 10 mytimer.o(i.MyTimer_Base_Start) - MyTimer_PWM 0x080008b1 Thumb Code 472 mytimer.o(i.MyTimer_PWM) - MyVoile_Init 0x08000a99 Thumb Code 32 myvoile.o(i.MyVoile_Init) - Set_Duty_Cycle 0x08000ba9 Thumb Code 40 mytimer.o(i.Set_Duty_Cycle) - Set_Voile 0x08000bd1 Thumb Code 210 myvoile.o(i.Set_Voile) - SystemInit 0x08000cbd Thumb Code 78 system_stm32f10x.o(i.SystemInit) - TIM1_UP_IRQHandler 0x08000d1d Thumb Code 28 mytimer.o(i.TIM1_UP_IRQHandler) - TIM2_IRQHandler 0x08000d41 Thumb Code 32 mytimer.o(i.TIM2_IRQHandler) - TIM3_IRQHandler 0x08000d65 Thumb Code 28 mytimer.o(i.TIM3_IRQHandler) - TIM4_IRQHandler 0x08000d89 Thumb Code 28 mytimer.o(i.TIM4_IRQHandler) - __scatterload_copy 0x08000dad Thumb Code 14 handlers.o(i.__scatterload_copy) - __scatterload_null 0x08000dbb Thumb Code 2 handlers.o(i.__scatterload_null) - __scatterload_zeroinit 0x08000dbd Thumb Code 14 handlers.o(i.__scatterload_zeroinit) - main 0x08000dcd Thumb Code 32 main.o(i.main) - Region$$Table$$Base 0x08000e1c Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x08000e3c Number 0 anon$$obj.o(Region$$Table) + __scatterload 0x08000129 Thumb Code 28 init.o(.text) + __scatterload_rt2 0x08000129 Thumb Code 0 init.o(.text) + EXTI0_IRQHandler 0x0800014d Thumb Code 24 mygirouette.o(i.EXTI0_IRQHandler) + Init_Girouette 0x0800016d Thumb Code 134 mygirouette.o(i.Init_Girouette) + MyGPIO_Init 0x0800020d Thumb Code 166 driver_gpio.o(i.MyGPIO_Init) + SystemInit 0x080003a9 Thumb Code 78 system_stm32f10x.o(i.SystemInit) + TIM1_UP_IRQHandler 0x08000409 Thumb Code 28 mytimer.o(i.TIM1_UP_IRQHandler) + TIM2_IRQHandler 0x0800042d Thumb Code 32 mytimer.o(i.TIM2_IRQHandler) + TIM3_IRQHandler 0x08000451 Thumb Code 28 mytimer.o(i.TIM3_IRQHandler) + TIM4_IRQHandler 0x08000475 Thumb Code 28 mytimer.o(i.TIM4_IRQHandler) + __scatterload_copy 0x08000499 Thumb Code 14 handlers.o(i.__scatterload_copy) + __scatterload_null 0x080004a7 Thumb Code 2 handlers.o(i.__scatterload_null) + __scatterload_zeroinit 0x080004a9 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) + main 0x080004b7 Thumb Code 8 main.o(i.main) + Region$$Table$$Base 0x080004e4 Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x08000504 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) ptr4 0x2000000c Data 4 mytimer.o(.data) - __initial_sp 0x20000410 Data 0 startup_stm32f10x_md.o(STACK) + x 0x20000010 Data 4 mygirouette.o(.data) + __initial_sp 0x20000418 Data 0 startup_stm32f10x_md.o(STACK) @@ -382,76 +345,52 @@ Memory Map of the image Image Entry point : 0x080000ed - Load Region LR_IROM1 (Base: 0x08000000, Size: 0x00000e4c, Max: 0x00020000, ABSOLUTE) + Load Region LR_IROM1 (Base: 0x08000000, Size: 0x00000518, Max: 0x00020000, ABSOLUTE) - Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000e3c, Max: 0x00020000, ABSOLUTE) + Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000504, Max: 0x00020000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x08000000 0x08000000 0x000000ec Data RO 338 RESET startup_stm32f10x_md.o - 0x080000ec 0x080000ec 0x00000000 Code RO 389 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) - 0x080000ec 0x080000ec 0x00000004 Code RO 412 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) - 0x080000f0 0x080000f0 0x00000004 Code RO 415 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 417 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 419 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) - 0x080000f4 0x080000f4 0x00000008 Code RO 420 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) - 0x080000fc 0x080000fc 0x00000004 Code RO 427 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o) - 0x08000100 0x08000100 0x00000000 Code RO 422 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o) - 0x08000100 0x08000100 0x00000000 Code RO 424 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o) - 0x08000100 0x08000100 0x00000004 Code RO 413 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) - 0x08000104 0x08000104 0x00000024 Code RO 339 .text startup_stm32f10x_md.o - 0x08000128 0x08000128 0x00000064 Code RO 392 .text mf_w.l(fmul.o) - 0x0800018c 0x0800018c 0x0000014e Code RO 394 .text mf_w.l(dadd.o) - 0x080002da 0x080002da 0x000000e4 Code RO 396 .text mf_w.l(dmul.o) - 0x080003be 0x080003be 0x000000de Code RO 398 .text mf_w.l(ddiv.o) - 0x0800049c 0x0800049c 0x0000000a Code RO 402 .text mf_w.l(ffltui.o) - 0x080004a6 0x080004a6 0x0000001a Code RO 404 .text mf_w.l(dfltui.o) - 0x080004c0 0x080004c0 0x00000028 Code RO 406 .text mf_w.l(ffixui.o) - 0x080004e8 0x080004e8 0x00000030 Code RO 408 .text mf_w.l(cdcmple.o) - 0x08000518 0x08000518 0x00000038 Code RO 410 .text mf_w.l(d2f.o) - 0x08000550 0x08000550 0x0000001e Code RO 428 .text mc_w.l(llshl.o) - 0x0800056e 0x0800056e 0x00000024 Code RO 430 .text mc_w.l(llsshr.o) - 0x08000592 0x08000592 0x00000000 Code RO 432 .text mc_w.l(iusefp.o) - 0x08000592 0x08000592 0x0000006e Code RO 433 .text mf_w.l(fepilogue.o) - 0x08000600 0x08000600 0x000000ba Code RO 435 .text mf_w.l(depilogue.o) - 0x080006ba 0x080006ba 0x00000002 PAD - 0x080006bc 0x080006bc 0x00000024 Code RO 437 .text mc_w.l(init.o) - 0x080006e0 0x080006e0 0x00000020 Code RO 439 .text mc_w.l(llushr.o) - 0x08000700 0x08000700 0x0000000e Code RO 274 i.Get_Angle mygirouette.o - 0x0800070e 0x0800070e 0x00000006 Code RO 82 i.Get_Max_Duty mytimer.o - 0x08000714 0x08000714 0x00000070 Code RO 275 i.Init_Girouette mygirouette.o - 0x08000784 0x08000784 0x000000b4 Code RO 226 i.MyGPIO_Init driver_gpio.o - 0x08000838 0x08000838 0x0000006c Code RO 85 i.MyTimer_Base_Init mytimer.o - 0x080008a4 0x080008a4 0x0000000a Code RO 86 i.MyTimer_Base_Start mytimer.o - 0x080008ae 0x080008ae 0x00000002 PAD - 0x080008b0 0x080008b0 0x000001e8 Code RO 88 i.MyTimer_PWM mytimer.o - 0x08000a98 0x08000a98 0x00000028 Code RO 308 i.MyVoile_Init myvoile.o - 0x08000ac0 0x08000ac0 0x00000008 Code RO 346 i.SetSysClock system_stm32f10x.o - 0x08000ac8 0x08000ac8 0x000000e0 Code RO 347 i.SetSysClockTo72 system_stm32f10x.o - 0x08000ba8 0x08000ba8 0x00000028 Code RO 89 i.Set_Duty_Cycle mytimer.o - 0x08000bd0 0x08000bd0 0x000000ec Code RO 309 i.Set_Voile myvoile.o - 0x08000cbc 0x08000cbc 0x00000060 Code RO 349 i.SystemInit system_stm32f10x.o - 0x08000d1c 0x08000d1c 0x00000024 Code RO 91 i.TIM1_UP_IRQHandler mytimer.o - 0x08000d40 0x08000d40 0x00000024 Code RO 92 i.TIM2_IRQHandler mytimer.o - 0x08000d64 0x08000d64 0x00000024 Code RO 93 i.TIM3_IRQHandler mytimer.o - 0x08000d88 0x08000d88 0x00000024 Code RO 94 i.TIM4_IRQHandler mytimer.o - 0x08000dac 0x08000dac 0x0000000e Code RO 443 i.__scatterload_copy mc_w.l(handlers.o) - 0x08000dba 0x08000dba 0x00000002 Code RO 444 i.__scatterload_null mc_w.l(handlers.o) - 0x08000dbc 0x08000dbc 0x0000000e Code RO 445 i.__scatterload_zeroinit mc_w.l(handlers.o) - 0x08000dca 0x08000dca 0x00000002 PAD - 0x08000dcc 0x08000dcc 0x00000024 Code RO 5 i.main main.o - 0x08000df0 0x08000df0 0x0000000c Data RO 6 .constdata main.o - 0x08000dfc 0x08000dfc 0x00000018 Data RO 276 .constdata mygirouette.o - 0x08000e14 0x08000e14 0x00000008 Data RO 310 .constdata myvoile.o - 0x08000e1c 0x08000e1c 0x00000020 Data RO 441 Region$$Table anon$$obj.o + 0x08000000 0x08000000 0x000000ec Data RO 346 RESET startup_stm32f10x_md.o + 0x080000ec 0x080000ec 0x00000000 Code RO 397 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) + 0x080000ec 0x080000ec 0x00000004 Code RO 420 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) + 0x080000f0 0x080000f0 0x00000004 Code RO 423 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 425 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 427 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) + 0x080000f4 0x080000f4 0x00000008 Code RO 428 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) + 0x080000fc 0x080000fc 0x00000004 Code RO 435 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o) + 0x08000100 0x08000100 0x00000000 Code RO 430 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o) + 0x08000100 0x08000100 0x00000000 Code RO 432 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o) + 0x08000100 0x08000100 0x00000004 Code RO 421 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) + 0x08000104 0x08000104 0x00000024 Code RO 347 .text startup_stm32f10x_md.o + 0x08000128 0x08000128 0x00000024 Code RO 445 .text mc_w.l(init.o) + 0x0800014c 0x0800014c 0x00000020 Code RO 273 i.EXTI0_IRQHandler mygirouette.o + 0x0800016c 0x0800016c 0x000000a0 Code RO 275 i.Init_Girouette mygirouette.o + 0x0800020c 0x0800020c 0x000000b4 Code RO 225 i.MyGPIO_Init driver_gpio.o + 0x080002c0 0x080002c0 0x00000008 Code RO 354 i.SetSysClock system_stm32f10x.o + 0x080002c8 0x080002c8 0x000000e0 Code RO 355 i.SetSysClockTo72 system_stm32f10x.o + 0x080003a8 0x080003a8 0x00000060 Code RO 357 i.SystemInit system_stm32f10x.o + 0x08000408 0x08000408 0x00000024 Code RO 90 i.TIM1_UP_IRQHandler mytimer.o + 0x0800042c 0x0800042c 0x00000024 Code RO 91 i.TIM2_IRQHandler mytimer.o + 0x08000450 0x08000450 0x00000024 Code RO 92 i.TIM3_IRQHandler mytimer.o + 0x08000474 0x08000474 0x00000024 Code RO 93 i.TIM4_IRQHandler mytimer.o + 0x08000498 0x08000498 0x0000000e Code RO 451 i.__scatterload_copy mc_w.l(handlers.o) + 0x080004a6 0x080004a6 0x00000002 Code RO 452 i.__scatterload_null mc_w.l(handlers.o) + 0x080004a8 0x080004a8 0x0000000e Code RO 453 i.__scatterload_zeroinit mc_w.l(handlers.o) + 0x080004b6 0x080004b6 0x00000008 Code RO 5 i.main main.o + 0x080004be 0x080004be 0x00000002 PAD + 0x080004c0 0x080004c0 0x00000024 Data RO 276 .constdata mygirouette.o + 0x080004e4 0x080004e4 0x00000020 Data RO 449 Region$$Table anon$$obj.o - Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x08000e3c, Size: 0x00000410, Max: 0x00005000, ABSOLUTE) + Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x08000504, Size: 0x00000418, Max: 0x00005000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 0x08000e3c 0x00000010 Data RW 95 .data mytimer.o - 0x20000010 - 0x00000400 Zero RW 336 STACK startup_stm32f10x_md.o + 0x20000000 0x08000504 0x00000010 Data RW 94 .data mytimer.o + 0x20000010 0x08000514 0x00000004 Data RW 277 .data mygirouette.o + 0x20000014 0x08000518 0x00000004 PAD + 0x20000018 - 0x00000400 Zero RW 344 STACK startup_stm32f10x_md.o ============================================================================== @@ -462,17 +401,16 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name 180 14 0 0 0 878 driver_gpio.o - 36 4 12 0 0 207779 main.o - 126 4 24 0 0 957 mygirouette.o - 796 54 0 16 0 6216 mytimer.o - 276 34 8 0 0 935 myvoile.o + 8 0 0 0 0 206747 main.o + 192 34 36 4 0 1136 mygirouette.o + 144 28 0 16 0 3385 mytimer.o 36 8 236 0 1024 792 startup_stm32f10x_md.o 328 28 0 0 0 1901 system_stm32f10x.o ---------------------------------------------------------------------- - 1780 146 312 16 1024 219458 Object Totals + 890 112 304 20 1028 214839 Object Totals 0 0 32 0 0 0 (incl. Generated) - 2 0 0 0 0 0 (incl. Padding) + 2 0 0 0 4 0 (incl. Padding) ---------------------------------------------------------------------- @@ -489,35 +427,19 @@ Image component sizes 8 4 0 0 0 0 entry9a.o 30 0 0 0 0 0 handlers.o 36 8 0 0 0 68 init.o - 0 0 0 0 0 0 iusefp.o - 30 0 0 0 0 68 llshl.o - 36 0 0 0 0 68 llsshr.o - 32 0 0 0 0 68 llushr.o - 48 0 0 0 0 68 cdcmple.o - 56 0 0 0 0 88 d2f.o - 334 0 0 0 0 148 dadd.o - 222 0 0 0 0 100 ddiv.o - 186 0 0 0 0 176 depilogue.o - 26 0 0 0 0 76 dfltui.o - 228 0 0 0 0 96 dmul.o - 110 0 0 0 0 168 fepilogue.o - 40 0 0 0 0 68 ffixui.o - 10 0 0 0 0 68 ffltui.o - 100 0 0 0 0 76 fmul.o ---------------------------------------------------------------------- - 1552 16 0 0 0 1404 Library Totals - 4 0 0 0 0 0 (incl. Padding) + 90 16 0 0 0 68 Library Totals + 0 0 0 0 0 0 (incl. Padding) ---------------------------------------------------------------------- Code (inc. data) RO Data RW Data ZI Data Debug Library Name - 188 16 0 0 0 272 mc_w.l - 1360 0 0 0 0 1132 mf_w.l + 90 16 0 0 0 68 mc_w.l ---------------------------------------------------------------------- - 1552 16 0 0 0 1404 Library Totals + 90 16 0 0 0 68 Library Totals ---------------------------------------------------------------------- @@ -526,15 +448,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 3332 162 312 16 1024 219506 Grand Totals - 3332 162 312 16 1024 219506 ELF Image Totals - 3332 162 312 16 0 0 ROM Totals + 980 128 304 20 1028 214591 Grand Totals + 980 128 304 20 1028 214591 ELF Image Totals + 980 128 304 20 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 3644 ( 3.56kB) - Total RW Size (RW Data + ZI Data) 1040 ( 1.02kB) - Total ROM Size (Code + RO Data + RW Data) 3660 ( 3.57kB) + Total RO Size (Code + RO Data) 1284 ( 1.25kB) + Total RW Size (RW Data + ZI Data) 1048 ( 1.02kB) + Total ROM Size (Code + RO Data + RW Data) 1304 ( 1.27kB) ============================================================================== diff --git a/Objects/Projet1_Réel.dep b/Objects/Projet1_Réel.dep index c9e77cb..32583f7 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)(0x6368DDB4)(-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)(0x6372735F)(-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) @@ -9,11 +9,11 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_versio 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) +I (.\FileInclude\Driver_GPIO.h)(0x63726BB4) I (.\FileInclude\MyADC.h)(0x6352AB45) I (.\FileInclude\MyGirouette.h)(0x635BBB64) -I (.\FileInclude\MyVoile.h)(0x6368DE4B) +I (.\FileInclude\MyVoile.h)(0x6368DF83) +I (.\FileInclude\MyTimer.h)(0x6352B1EA) F (.\FileInclude\MyTimer.c)(0x635BD048)(-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) @@ -24,8 +24,7 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_versio 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) -F (.\FileInclude\MyTimer.h)(0x6352B1EA)() +I (FileInclude\Driver_GPIO.h)(0x63726BB4) F (.\FileInclude\MyADC.c)(0x6352AB45)(-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\myadc.o --omf_browse .\objects\myadc.crf --depend .\objects\myadc.d) I (FileInclude\MyADC.h)(0x6352AB45) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) @@ -37,10 +36,9 @@ 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) I (FileInclude\MyTimer.h)(0x6352B1EA) -I (FileInclude\Driver_GPIO.h)(0x6352AB45) -F (.\FileInclude\MyADC.h)(0x6352AB45)() +I (FileInclude\Driver_GPIO.h)(0x63726BB4) F (.\FileInclude\Driver_GPIO.c)(0x6352AB45)(-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\driver_gpio.o --omf_browse .\objects\driver_gpio.crf --depend .\objects\driver_gpio.d) -I (FileInclude\Driver_GPIO.h)(0x6352AB45) +I (FileInclude\Driver_GPIO.h)(0x63726BB4) 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) @@ -49,8 +47,7 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_versio 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) -F (.\FileInclude\Driver_GPIO.h)(0x6352AB45)() -F (.\FileInclude\MyGirouette.c)(0x6368D7A4)(-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) +F (.\FileInclude\MyGirouette.c)(0x63727A50)(-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) @@ -60,12 +57,10 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_versio 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\Driver_GPIO.h)(0x63726BB4) I (FileInclude\MyTimer.h)(0x6352B1EA) -F (.\FileInclude\MyGirouette.h)(0x635BBB64)() -F (.\FileInclude\MyVoile.h)(0x6368DE4B)() F (.\MyVoile.c)(0x6368DE1F)(-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\myvoile.o --omf_browse .\objects\myvoile.crf --depend .\objects\myvoile.d) -I (.\FileInclude\MyVoile.h)(0x6368DE4B) +I (.\FileInclude\MyVoile.h)(0x6368DF83) 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) @@ -76,7 +71,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) I (.\FileInclude\MyTimer.h)(0x6352B1EA) 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\startup_stm32f10x_md.s)(0x63725E20)(--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) 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) diff --git a/Objects/Projet1_SImulation.dep b/Objects/Projet1_SImulation.dep index 614a9e3..47ebd82 100644 --- a/Objects/Projet1_SImulation.dep +++ b/Objects/Projet1_SImulation.dep @@ -1,6 +1,6 @@ Dependencies for Project 'Projet1', Target 'SImulation': (DO NOT MODIFY !) CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC -F (.\Sources\main.c)(0x6352B867)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -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)(0x6372735F)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -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\_SImulation\RTE_Components.h)(0x6352AB45) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) @@ -9,10 +9,12 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_versio 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) +I (.\FileInclude\Driver_GPIO.h)(0x63726BB4) I (.\FileInclude\MyADC.h)(0x6352AB45) -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\_SImulation -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\MyGirouette.h)(0x635BBB64) +I (.\FileInclude\MyVoile.h)(0x6368DF83) +I (.\FileInclude\MyTimer.h)(0x6352B1EA) +F (.\FileInclude\MyTimer.c)(0x635BD048)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -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) I (.\RTE\_SImulation\RTE_Components.h)(0x6352AB45) @@ -22,8 +24,7 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_versio 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) -F (.\FileInclude\MyTimer.h)(0x6352B1EA)() +I (FileInclude\Driver_GPIO.h)(0x63726BB4) F (.\FileInclude\MyADC.c)(0x6352AB45)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -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\myadc.o --omf_browse .\objects\myadc.crf --depend .\objects\myadc.d) I (FileInclude\MyADC.h)(0x6352AB45) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) @@ -35,10 +36,9 @@ 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) I (FileInclude\MyTimer.h)(0x6352B1EA) -I (FileInclude\Driver_GPIO.h)(0x6352AB45) -F (.\FileInclude\MyADC.h)(0x6352AB45)() +I (FileInclude\Driver_GPIO.h)(0x63726BB4) F (.\FileInclude\Driver_GPIO.c)(0x6352AB45)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -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\driver_gpio.o --omf_browse .\objects\driver_gpio.crf --depend .\objects\driver_gpio.d) -I (FileInclude\Driver_GPIO.h)(0x6352AB45) +I (FileInclude\Driver_GPIO.h)(0x63726BB4) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) I (.\RTE\_SImulation\RTE_Components.h)(0x6352AB45) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) @@ -47,9 +47,31 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_versio 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) -F (.\FileInclude\Driver_GPIO.h)(0x6352AB45)() +F (.\FileInclude\MyGirouette.c)(0x6372759F)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -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\_SImulation\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)(0x63726BB4) +I (FileInclude\MyTimer.h)(0x6352B1EA) +F (.\MyVoile.c)(0x6368DE1F)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -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\myvoile.o --omf_browse .\objects\myvoile.crf --depend .\objects\myvoile.d) +I (.\FileInclude\MyVoile.h)(0x6368DF83) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) +I (.\RTE\_SImulation\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\MyTimer.h)(0x6352B1EA) 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\_SImulation -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\startup_stm32f10x_md.s)(0x63725E20)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -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\_SImulation -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) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) I (.\RTE\_SImulation\RTE_Components.h)(0x6352AB45) diff --git a/Objects/Projet1_Simulation.axf b/Objects/Projet1_Simulation.axf index 6d42f45ca984dc386676a1b6019d8beecf92ab82..a611662a4976605dd3f4a0b273b8585a0f27699d 100644 GIT binary patch delta 5533 zcma)=4RBP|701tg_wCCrZo=l15JCtL6(vFfA%dkCAdn3o1_eu`LXw7rEG8ksVnbWp zObLqh1H!d^*jj2!nkxt?vjOBRY-_(-}H#y+@}hV3ZMwGA}x)o=G~Y&W$;%2KiT{SKonJ;J^v@HJuM&b#af8ws4EabScau>ff!iWp~ToTYKL#yJ}2YMd8mcV=HQ z$om!#Mm1yyN&wt@eVU`l`Wq7T?&zi=Sg!hc&TgxDz@TzpU*Ux5(kj3_WO)15=lyP~ z(dJPV6_eG{MXwsBrCuz*MlD+WnJQee*ElKFu_cchM@h}yVfZd?-co-XlH9SYIhDO0 z+#QtaOy#85U7u&!kPv6p?Q6!{b03y|b<>iD>AaqwK+a;JuKz%Y6pI_IsR(V|vb`Z3 zZXn@$)T*?qg7k`2l~s$1DDZDn$}vq(s5MM&?UZ&ec_bes7%j>G+8U>7tG4-&wB9En z`ReVeyz5+g3_hXqx^Nu@=3hlxEYrtl=?GpcD>&B=y+pz1Q&0 z*avygLZADEXtdT;t}GeVW!J?koEp5xnjz=nHEOuV>`^sbmuXIoF}zz>K-MHFar5{Q z492Xy#|t1wlhm=BbNwzhVc6>awOth-qq82&C?=wAS-@w^Zy*PJ*s`&iUhupSV?8Z(p;i)U_c^B!d+b5A^))qH z8@6q44igMwl~A*888V_$O<#AnFjU{VO~UA#@J){p9qNr+zh1%F;>nT8max)2c~+*C zZk0mjgAAEzU5opLZGWSjSTWV1TZ^!b zac4s=**wrWzW@g1787-Y_CwlPO?eQ5ju+d-jWWkO#i66K>|>3xz-XIo|CO(WCAM!9 zu4hZ^nVaNf?<~iwdyaj0lPn3emlB?e9;mTfl4&PX{{16mY8$@t5w;~tc{jVv_Tvc*dxQ?+cuaKQGtp%Zz{jV{9DtYJWw!JF za+&SCBVA@Y?@pK5>ZGfXXqV1O+?rnQ+m8XkP-eou3a}J8!__rhVOJxgf&1$9jpG zn-_C%{+cv6yh`Inusaa;|1Q|=IP?8rx1-EI1H1iVegce=&jZAhAocT1x`i9$ymSlm zX%}#1{#@fsjKp0!ZeS{pEMC}ufyUKfH&xjGHi7ot++fA`;J{C21qkBy7`@Fm9X9B0 zEuhX_n*DijHtO@^n#8{sVs`I8kVFo`d=i> z&?1f(FYK@LhKu%yv#-B>QSqhxBhCIYb_GB37N8Lxq29nxHUB7>4?w)gIR3}L&RYSPg{- z4&34ta2+@q%-fZ@1w1x^BjD5o?gFPL@GrnPo=56G1s<2cC&1%z{){-Bf?`5~!x`|z z1RezQ=K=J`>5xns&Eqtlu5r1>>m80<40wm;uvg=##wRrXi^d;o%q=AjAe9;C&&Y_T zXb!VAUaIk0jW=t&Q{#Oa9|A`bd-SB{a6;oZHGWUya~hj?s85WarSa81vWK?GiIJN% z!zPV)Xne26k7)d?#&2r;H}F-MdH#}tI2VKYixj_`bN%^XAI_6_15^d(Z(8|rdkvVsZ^i6Lf-O*NA5mamfFA<$iNyi; zgL}ce9hrX#KAd2G4$L3OumX<#1em{x0dYVHdJ`P~T;%WvU=-)UCN+qUav!sUs{o$^ zqjt;z{BN*7fiHmFC!WZto}PYq|dOscgeizm&DPctlYt`(KW2KH+IU`0_{{&69R?m znrpVTVQLoamPe$VRaewMxJP~=&DlkB>iY-plgXwrZ|>7wGSw8N_QHqc$^N%~C__@# zmDbxZztErbV_7TB;&0W*x#*xgU>dWF?6QYo-Frx8N(BP!GF!d~h3@priu(3$qaUOClR;jtTgO^HQ90E*UnxlmdmYrt_br#yhULM3+G^hul@qKl)=COo dWBieO?U=M_ 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 diff --git a/Objects/Projet1_Simulation.build_log.htm b/Objects/Projet1_Simulation.build_log.htm index 847c0e1..1c27857 100644 --- a/Objects/Projet1_Simulation.build_log.htm +++ b/Objects/Projet1_Simulation.build_log.htm @@ -22,25 +22,27 @@ Dialog DLL: TARMSTM.DLL V1.66.0.0

Project:

U:\Documents\4IR\TP_Voilier\Projet1.uvprojx -Project File Date: 11/07/2022 +Project File Date: 11/14/2022

Output:

*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin' Rebuild target 'Réel' assembling startup_stm32f10x_md.s... -compiling MyADC.c... -compiling MyGirouette.c... compiling MyVoile.c... compiling Driver_GPIO.c... compiling main.c... -Sources\main.c(19): warning: #177-D: variable "GPIOB8" was declared but never referenced - MyGPIO_Struct_TypeDef GPIOB8={ -Sources\main.c: 1 warning, 0 errors +compiling MyADC.c... +compiling MyGirouette.c... +FileInclude\MyGirouette.c(16): warning: #177-D: variable "GPIOA0" was declared but never referenced + MyGPIO_Struct_TypeDef GPIOA0={ +FileInclude\MyGirouette.c(21): warning: #177-D: variable "GPIOA1" was declared but never referenced + MyGPIO_Struct_TypeDef GPIOA1={ +FileInclude\MyGirouette.c: 2 warnings, 0 errors compiling MyTimer.c... compiling system_stm32f10x.c... linking... -Program Size: Code=3332 RO-data=312 RW-data=16 ZI-data=1024 -".\Objects\Projet1_Simulation.axf" - 0 Error(s), 1 Warning(s). +Program Size: Code=980 RO-data=304 RW-data=20 ZI-data=1028 +".\Objects\Projet1_Simulation.axf" - 0 Error(s), 2 Warning(s).

Software Packages used:

@@ -68,8 +70,8 @@ Package Vendor: Keil * Component: Keil::Device:Startup:1.0.0 Source file: Device\Source\system_stm32f10x.c - Source file: Device\Source\ARM\STM32F1xx_OPT.s Source file: Device\Source\ARM\startup_stm32f10x_md.s + Source file: Device\Source\ARM\STM32F1xx_OPT.s Include file: RTE_Driver\Config\RTE_Device.h Build Time Elapsed: 00:00:01 diff --git a/Objects/Projet1_Simulation.htm b/Objects/Projet1_Simulation.htm index ca10a68..605e13f 100644 --- a/Objects/Projet1_Simulation.htm +++ b/Objects/Projet1_Simulation.htm @@ -3,11 +3,11 @@ Static Call Graph - [.\Objects\Projet1_Simulation.axf]

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

-

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Mon Nov 07 11:30:38 2022 +

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Mon Nov 14 18:26:44 2022

-

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

+

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

Call chain for Maximum Stack Depth:

-main ⇒ Set_Voile ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round +main ⇒ Init_Girouette ⇒ MyGPIO_Init

Mutually Recursive functions @@ -38,7 +38,7 @@ Function Pointers
  • DMA1_Channel6_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • 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) +
  • EXTI0_IRQHandler from mygirouette.o(i.EXTI0_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) @@ -90,27 +90,27 @@ Global Symbols

    __main (Thumb, 0 bytes, Stack size unknown bytes, entry.o(.ARM.Collect$$$$00000000))
    [Address Reference Count : 1]

    • startup_stm32f10x_md.o(.text)
    -

    _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]

    • >>   __scatterload
    -

    __main_after_scatterload (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004)) +

    __main_after_scatterload (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004))

    [Called By]

    • >>   __scatterload
    -

    _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]

    • startup_stm32f10x_md.o(RESET) @@ -212,9 +212,6 @@ Global Symbols

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

      • startup_stm32f10x_md.o(RESET)
      -

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

      • startup_stm32f10x_md.o(RESET) -

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

      • startup_stm32f10x_md.o(RESET)
      @@ -299,224 +296,35 @@ Global Symbols

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

      • startup_stm32f10x_md.o(RESET)
      -

      __aeabi_fmul (Thumb, 100 bytes, Stack size 8 bytes, fmul.o(.text)) -

      [Stack]

      • Max Depth = 8
      • Call Chain = __aeabi_fmul -
      -
      [Called By]
      • >>   Set_Voile -
      - -

      __aeabi_dadd (Thumb, 322 bytes, Stack size 48 bytes, dadd.o(.text)) -

      [Stack]

      • Max Depth = 88
      • Call Chain = __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round -
      -
      [Calls]
      • >>   __aeabi_lasr -
      • >>   __aeabi_llsl -
      • >>   _double_round -
      • >>   _double_epilogue -
      -
      [Called By]
      • >>   __aeabi_dsub -
      • >>   __aeabi_drsub -
      - -

      __aeabi_dsub (Thumb, 6 bytes, Stack size 0 bytes, dadd.o(.text), UNUSED) -

      [Calls]

      • >>   __aeabi_dadd -
      - -

      __aeabi_drsub (Thumb, 6 bytes, Stack size 0 bytes, dadd.o(.text)) -

      [Stack]

      • Max Depth = 88
      • Call Chain = __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round -
      -
      [Calls]
      • >>   __aeabi_dadd -
      -
      [Called By]
      • >>   Set_Voile -
      - -

      __aeabi_dmul (Thumb, 228 bytes, Stack size 48 bytes, dmul.o(.text)) -

      [Stack]

      • Max Depth = 88
      • Call Chain = __aeabi_dmul ⇒ _double_epilogue ⇒ _double_round -
      -
      [Calls]
      • >>   _double_epilogue -
      -
      [Called By]
      • >>   Set_Voile -
      - -

      __aeabi_ddiv (Thumb, 222 bytes, Stack size 32 bytes, ddiv.o(.text)) -

      [Stack]

      • Max Depth = 40
      • Call Chain = __aeabi_ddiv ⇒ _double_round -
      -
      [Calls]
      • >>   _double_round -
      -
      [Called By]
      • >>   Set_Voile -
      - -

      __aeabi_ui2f (Thumb, 10 bytes, Stack size 0 bytes, ffltui.o(.text)) -

      [Stack]

      • Max Depth = 4
      • Call Chain = __aeabi_ui2f ⇒ _float_epilogue -
      -
      [Calls]
      • >>   _float_epilogue -
      -
      [Called By]
      • >>   Set_Voile -
      - -

      __aeabi_ui2d (Thumb, 26 bytes, Stack size 16 bytes, dfltui.o(.text)) -

      [Stack]

      • Max Depth = 56
      • Call Chain = __aeabi_ui2d ⇒ _double_epilogue ⇒ _double_round -
      -
      [Calls]
      • >>   _double_epilogue -
      -
      [Called By]
      • >>   Set_Voile -
      - -

      __aeabi_f2uiz (Thumb, 40 bytes, Stack size 0 bytes, ffixui.o(.text)) -

      [Called By]

      • >>   Set_Voile -
      - -

      __aeabi_cdcmpeq (Thumb, 0 bytes, Stack size 0 bytes, cdcmple.o(.text), UNUSED) - -

      __aeabi_cdcmple (Thumb, 48 bytes, Stack size 0 bytes, cdcmple.o(.text)) -

      [Called By]

      • >>   Set_Voile -
      - -

      __aeabi_d2f (Thumb, 56 bytes, Stack size 8 bytes, d2f.o(.text)) -

      [Stack]

      • Max Depth = 8
      • Call Chain = __aeabi_d2f -
      -
      [Calls]
      • >>   _float_round -
      -
      [Called By]
      • >>   Set_Voile -
      - -

      __aeabi_llsl (Thumb, 30 bytes, Stack size 0 bytes, llshl.o(.text)) -

      [Called By]

      • >>   _double_epilogue -
      • >>   __aeabi_dadd -
      - -

      _ll_shift_l (Thumb, 0 bytes, Stack size 0 bytes, llshl.o(.text), UNUSED) - -

      __aeabi_lasr (Thumb, 36 bytes, Stack size 0 bytes, llsshr.o(.text)) -

      [Called By]

      • >>   __aeabi_dadd -
      - -

      _ll_sshift_r (Thumb, 0 bytes, Stack size 0 bytes, llsshr.o(.text), UNUSED) - -

      __I$use$fp (Thumb, 0 bytes, Stack size 0 bytes, iusefp.o(.text), UNUSED) - -

      _float_round (Thumb, 18 bytes, Stack size 0 bytes, fepilogue.o(.text)) -

      [Called By]

      • >>   __aeabi_d2f -
      - -

      _float_epilogue (Thumb, 92 bytes, Stack size 4 bytes, fepilogue.o(.text)) -

      [Stack]

      • Max Depth = 4
      • Call Chain = _float_epilogue -
      -
      [Called By]
      • >>   __aeabi_ui2f -
      - -

      _double_round (Thumb, 30 bytes, Stack size 8 bytes, depilogue.o(.text)) -

      [Stack]

      • Max Depth = 8
      • Call Chain = _double_round -
      -
      [Called By]
      • >>   _double_epilogue -
      • >>   __aeabi_dadd -
      • >>   __aeabi_ddiv -
      - -

      _double_epilogue (Thumb, 156 bytes, Stack size 32 bytes, depilogue.o(.text)) -

      [Stack]

      • Max Depth = 40
      • Call Chain = _double_epilogue ⇒ _double_round -
      -
      [Calls]
      • >>   __aeabi_llsr -
      • >>   __aeabi_llsl -
      • >>   _double_round -
      -
      [Called By]
      • >>   __aeabi_dadd -
      • >>   __aeabi_ui2d -
      • >>   __aeabi_dmul -
      -

      __scatterload (Thumb, 28 bytes, Stack size 0 bytes, init.o(.text)) -

      [Calls]

      • >>   __main_after_scatterload +

        [Calls]
        • >>   __main_after_scatterload

        [Called By]
        • >>   _main_scatterload
        -

        __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) -

        __aeabi_llsr (Thumb, 32 bytes, Stack size 0 bytes, llushr.o(.text)) -

        [Called By]

        • >>   _double_epilogue +

          EXTI0_IRQHandler (Thumb, 24 bytes, Stack size 0 bytes, mygirouette.o(i.EXTI0_IRQHandler)) +
          [Address Reference Count : 1]

          • startup_stm32f10x_md.o(RESET)
          - -

          _ll_ushift_r (Thumb, 0 bytes, Stack size 0 bytes, llushr.o(.text), UNUSED) - -

          Get_Angle (Thumb, 14 bytes, Stack size 0 bytes, mygirouette.o(i.Get_Angle)) -

          [Called By]

          • >>   main -
          - -

          Get_Max_Duty (Thumb, 6 bytes, Stack size 0 bytes, mytimer.o(i.Get_Max_Duty)) -

          [Called By]

          • >>   Set_Voile -
          - -

          Init_Girouette (Thumb, 108 bytes, Stack size 40 bytes, mygirouette.o(i.Init_Girouette)) +

          Init_Girouette (Thumb, 134 bytes, Stack size 40 bytes, mygirouette.o(i.Init_Girouette))

          [Stack]

          • Max Depth = 52
          • Call Chain = Init_Girouette ⇒ MyGPIO_Init
          -
          [Calls]
          • >>   MyGPIO_Init -
          • >>   MyTimer_Base_Start -
          • >>   MyTimer_Base_Init +
            [Calls]
            • >>   MyGPIO_Init

            [Called By]
            • >>   main
            -

            MyGPIO_Init (Thumb, 166 bytes, Stack size 12 bytes, driver_gpio.o(i.MyGPIO_Init)) +

            MyGPIO_Init (Thumb, 166 bytes, Stack size 12 bytes, driver_gpio.o(i.MyGPIO_Init))

            [Stack]

            • Max Depth = 12
            • Call Chain = MyGPIO_Init
            -
            [Called By]
            • >>   MyTimer_PWM -
            • >>   Init_Girouette -
            - -

            MyTimer_Base_Init (Thumb, 98 bytes, Stack size 0 bytes, mytimer.o(i.MyTimer_Base_Init)) -

            [Called By]

            • >>   MyVoile_Init -
            • >>   Init_Girouette -
            - -

            MyTimer_Base_Start (Thumb, 10 bytes, Stack size 0 bytes, mytimer.o(i.MyTimer_Base_Start)) -

            [Called By]

            • >>   MyVoile_Init -
            • >>   Init_Girouette -
            - -

            MyTimer_PWM (Thumb, 472 bytes, Stack size 24 bytes, mytimer.o(i.MyTimer_PWM)) -

            [Stack]

            • Max Depth = 36
            • Call Chain = MyTimer_PWM ⇒ MyGPIO_Init -
            -
            [Calls]
            • >>   MyGPIO_Init -
            -
            [Called By]
            • >>   MyVoile_Init -
            - -

            MyVoile_Init (Thumb, 32 bytes, Stack size 16 bytes, myvoile.o(i.MyVoile_Init)) -

            [Stack]

            • Max Depth = 52
            • Call Chain = MyVoile_Init ⇒ MyTimer_PWM ⇒ MyGPIO_Init -
            -
            [Calls]
            • >>   MyTimer_PWM -
            • >>   MyTimer_Base_Start -
            • >>   MyTimer_Base_Init -
            -
            [Called By]
            • >>   main -
            - -

            Set_Duty_Cycle (Thumb, 40 bytes, Stack size 0 bytes, mytimer.o(i.Set_Duty_Cycle)) -

            [Called By]

            • >>   Set_Voile -
            - -

            Set_Voile (Thumb, 210 bytes, Stack size 56 bytes, myvoile.o(i.Set_Voile)) -

            [Stack]

            • Max Depth = 144
            • Call Chain = Set_Voile ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round -
            -
            [Calls]
            • >>   __aeabi_ui2f -
            • >>   __aeabi_ui2d -
            • >>   __aeabi_fmul -
            • >>   __aeabi_f2uiz -
            • >>   __aeabi_drsub -
            • >>   __aeabi_dmul -
            • >>   __aeabi_ddiv -
            • >>   __aeabi_d2f -
            • >>   __aeabi_cdcmple -
            • >>   Set_Duty_Cycle -
            • >>   Get_Max_Duty -
            -
            [Called By]
            • >>   main +
              [Called By]
              • >>   Init_Girouette

              SystemInit (Thumb, 78 bytes, Stack size 8 bytes, system_stm32f10x.o(i.SystemInit))

              [Stack]

              • Max Depth = 28
              • Call Chain = SystemInit ⇒ SetSysClock ⇒ SetSysClockTo72
              -
              [Calls]
              • >>   SetSysClock +
                [Calls]
                • >>   SetSysClock

                [Address Reference Count : 1]
                • startup_stm32f10x_md.o(.text)
                @@ -540,37 +348,34 @@ Global Symbols

              [Address Reference Count : 1]
              • startup_stm32f10x_md.o(RESET)
              -

              __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, 32 bytes, Stack size 16 bytes, main.o(i.main)) -

              [Stack]

              • Max Depth = 160
              • Call Chain = main ⇒ Set_Voile ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round +

                main (Thumb, 8 bytes, Stack size 0 bytes, main.o(i.main)) +

                [Stack]

                • Max Depth = 52
                • Call Chain = main ⇒ Init_Girouette ⇒ MyGPIO_Init
                -
                [Calls]
                • >>   Set_Voile -
                • >>   MyVoile_Init -
                • >>   Init_Girouette -
                • >>   Get_Angle +
                  [Calls]
                  • >>   Init_Girouette

                  [Address Reference Count : 1]
                  • entry9a.o(.ARM.Collect$$$$0000000B)

                  Local Symbols

                  -

                  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]

                  • Max Depth = 20
                  • Call Chain = SetSysClock ⇒ SetSysClockTo72
                  -
                  [Calls]
                  • >>   SetSysClockTo72 +
                    [Calls]
                    • >>   SetSysClockTo72

                    [Called By]
                    • >>   SystemInit
                    -

                    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]

                    • Max Depth = 12
                    • Call Chain = SetSysClockTo72
                    -
                    [Called By]
                    • >>   SetSysClock +
                      [Called By]
                      • >>   SetSysClock

                      diff --git a/Objects/driver_gpio.crf b/Objects/driver_gpio.crf index 2ca750198033780f99a2b9ef9f00d04fce341a23..37d15522d1d98beb29d835eb7035f4edeb964a79 100644 GIT binary patch delta 45 zcmcb0g74M|z6sj=Tdtp+&Bg!(2X4kOFa=GPXOf#dn@O{=v9*!0wUKFSBlFG00G=ul ATmS$7 delta 45 zcmcb0g74M|z6sj=TX&tB#l`>xcW%ZpFa=GPXOf#dn@O{=v9*!0wUKFSBlFG00G&(` ATmS$7 diff --git a/Objects/driver_gpio.o b/Objects/driver_gpio.o index be60f32bc3c17ced28bf2e88663bd6f2ce7d68f2..bb4a71c372bd3c78796b4762b4030d67c53459e3 100644 GIT binary patch delta 76 zcmdn+mVW~fsR_s$nkX0<7#S%sFfzo)hj{wB#>Xot8CqBwnOT__H#-ZoI}0!ZG1GQu d0p?{(Sj{YSjTt648e2|&%OtSfd@FOMBLFun6^sA? delta 76 zcmdn+mVW~fsR_s`m@60=7#S%sFfzo)hj{wB#>Xot85&v{8(0~eH#-ZoI}0!ZG1GQu d0p?{(SS^!vjTt648e2|&%OtSfd@FOMBLFo$6{7$E diff --git a/Objects/main.crf b/Objects/main.crf index c6cdbf76d645cb0adc3933a6d924bf5211018ae2..53a88119aac8d05380ca89b848567f5b50efe899 100644 GIT binary patch delta 860 zcmYk*+e;Kt90%}o&gjn0?94<+MJjSIx{1<{2zpg|DtZXB%O8-Dg%mw>1$ScAtuWZ! zWT;>Xq`)#w*P862-L$N%?B;GO2^I#@Lm5Op)pt$>4gBEqJ2&S1elw$EPUDzkWemmy zXHJ$_elo!q^{nU+X5aY8*$~6CGHGb_W^AziPx?MNC6*@1nNbGFdAbrZnceyxGg0*H(u^>@*n#vd}BJptVPJc9Bfn zBc0RPC8ge6gmsb`cDWOA`CMd|$;8bZ3-6UPSrjdozSRKT~0s5o+<9Y z;ByMvUJJcY+J=gZkrk4kG4zrwbR-VFqTo9VUjMaHEN8Gc;QbD5a zQL8R}!9z=1rM0egtGZv>Ql~xAXgx^E1Cij3{|*u-ndCSBo$t(C*PQ(~K%M)v?X^9VFlYDyf%t;efCwwbQHsAO=?JB9U%4#eg z)>xw9a3Cwhth_pkt=_P?XdCP9RZOcK&O{xhEm*mdiT{JbRf`x8H&%#z5iBbgtwE3w zRaw2mSo%1WxIGkKT)1S#!nw>2^Nxx#nJsgCE~jGT`P_~9+><_E96qWMOC&D{hS!SR zAu7w~v%~qdV(EfO6WM^|KjPYs``jLhF$!Ze#u%SR>*j}N2Za}#BJo@zm&oNfj0qV3 zw#tRE9S^#{h>xDbs$Bld)=_zV(Ee3SM|8sF2c(H6gg?KEe2(mz%WMB+ePO{jVOhw^ zJigyC>t=@YzKf#948PgyqXiBmMl2S_?bbTt$8Y$9g=%UdnsEMLuRzsJJjzgCzI`%QB z*{BL?p{Na&&=sTN3NSP*hprkOfv!>1tHaQBqeIXQql3^*in_QDx@A-fwHlQ`w~h8f zcPM(Pd!V~UyP+f+o5)fUe8wOq0tsJ;t@IA=Z?@D5I-gd zS0w>GF{(^C>?t|vXu0e2FPJ?e2Ny|sKL3p3=j5W;6?z>Wy&!jp&x;jW)Q{;)imsg+ z@AG$9`HDQO^n_lEx6naeOn<_fPV%Df9_#ZY_UxkQl9nKUZ4}jZrfl|xRJvB4XhUf? jDO(Q!ZzJ>rNm7pP1A0hh=wt@eODa>pPNw1C%5r`KNO=Z8 diff --git a/Objects/main.d b/Objects/main.d index f264302..e459cf1 100644 --- a/Objects/main.d +++ b/Objects/main.d @@ -8,7 +8,7 @@ .\objects\main.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h .\objects\main.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h .\objects\main.o: .\FileInclude\Driver_GPIO.h -.\objects\main.o: .\FileInclude\MyTimer.h .\objects\main.o: .\FileInclude\MyADC.h .\objects\main.o: .\FileInclude\MyGirouette.h .\objects\main.o: .\FileInclude\MyVoile.h +.\objects\main.o: .\FileInclude\MyTimer.h diff --git a/Objects/main.o b/Objects/main.o index 91186684300fb7aa44bf500f262fa79e44b61ca0..eea09eafa2e433f03cfbc74555fa3595f32ab43f 100644 GIT binary patch delta 11062 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 Gjei6GWGVyz diff --git a/Objects/mygirouette.o b/Objects/mygirouette.o index 24b65ade7985dfc84c4e3d5932405b5f75b0eb42..e2a99842d7edf188b6e398c4e8968b8cfe93daa3 100644 GIT binary patch delta 11813 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 delta 10467 zcmZ`<3v^ZGmEPx^o6Ef+frRh~PcPvq3X_C4K?ul82oN68P$|I&GoTc+6a}q#v4sH( z1IX=oS&mM}7L|uUY_wqsRHSrdDAU69AsvBcMyrm(h%N?P)-}wx_y3)H6V{r&a{lk% zkAMIB-~Z#Bdrq1!wm*HL{kBB1@?0RGoMBqZKzTw|iH}+gSLIvvQ;*`B{b{M7yu7yZ z>CN6}XX+~p>Zi(^&op$M-sWUCAWAJiXMBUC@HBIqUTcQVq5#DLTUWRo)?MUv0~ZEx~a<^ ze(2F9D_1TNPc_R^TjB$Y=HD?>3SI*1Kf6$+BBxS4V_WjuIY!3)tLODg-JiSCTbC+p zd;7R(L9{5RSF}^KDB2e_KZr&9q23Kw0#|olqksc&4aB87$aB1CBDKHmjP`w_9=NjT zExs2O&r9{l>yiHey7OhtK*i;$$$3M2CPpU8OUuhk5Nur?qMTe;mnbPK8#A6JQDFd&{ltv9ZcMz64s7w?N|KV1DA2Y0yMHa-y5n{f?l9Nz1F zFMcbkgK-UM?3$R-E?$ai8Lsli?+i(M`MUIm$h)Mzum*-H?7|u+}ANa5#rl%O=|k$m0-3PpMv^ST+^EF*cA-*W}!YCS9R0i*Mh(Dytz%^-WME;M*sTWQG#u)1o(mfA^CU3SgBX zPg?W-4Sa9|AGv|gk#X=Bt`_V$DR1RJdILZ20qN4hAR=E}Z%aOcpaRUs_4Y10$NTa> z z>dqFt_@1=p{Tui|rnj&U;NfVv0o0)%kpnIG09m3wscIPH$W9s*gAF7a8kk!AsQjRX z15XO1z7=06wXOILQrU_xk^!ywj?&(E_U}n2xt7fhCZV%jXvKGte{RJW%l=k;S4p+v zyUAm%`0lcx72iW_F3^8vFCAkc2dcX%*9{x?7ZQkPo0-5HmF$6ukzWQfzNol>DM zKbPF{-0vFa%OI7BHj|G)!2KB(RPc68DorC2hYOV?U2hdnsyq(CG@0f^5?2G% zfuN2U3Iv6A4@0dPCj-FPDv<^ktd^k1wTP9dBRazXVw0Ux%G*gy#mZv*XHml@8bnjO z=e+9rZiDz$=V-O_w6Rv5@FgGxbja!Y)iwxCu*IW>41>O%=MA(KMO_ zm+#v_W_A$vmcktQ7su%VTWEpi$VQ3)lM2gF=0Jh-SdVY5x|kwnt;{d%0M z{09|u#oTHYU-~L*byy}#S;Nic0@@XN{)>9+@G>UGpn!5wUwR*BS_~Y!2%^!yr4!f~ zJ?mQgBOPm#VqN+&*7Aj{VE>wI zSx_p$byO?u* zH^*4mhInKOJKCalcZ+OSoSl__Px-|ne~bRbpPyB{qWmI}J&JR)@}0^r6xpSSlhEcA zf!YXxAE_LegLSBwAXX5k6YnNIMog|}nV7F_$KiZ@g}BtE^$5aAn{XTM`o@Y zaXd~`^}m$(4Dog1l&J21H9)Qvw-XN$KO}l>oPGrHCo#u=N-T>zemC(9@oVCE98&84 z?}&dS7Pr;?4@DzREyd4?`8c(d?@OFXTu5A_c$>&h@_WetoP0C+7@qmmPdi1}myn-I z{^2Am&r$IL`3Ca8C9e;o>L`Z$fH_oDhvX*{XAtX%j}o^LcM*>flV@4^3o*C7>!61C z5OFe@BVHqR;Wisdyo}r9Czb(97|k8 zTub~h@i_4#VvO5x5V4B5g1C+N(>(6~-%)Ut_$}^+2I7Ac+jEtd5%pKEF2?>`oTG{N zb#U^Rh}A`oKS=zBI4Ft7CUx*2@pR z2@fmkcPKGAkCh!goZ@H1-xIG8i+VbJIdKlLp175`pZH=gXMcj&>n6vKB`$E7l*cG| zj@U#zOZ=MHE#Vx@AwERhLfl6@N&JKu>+RYNBu*tRF-(fAqu?jRW5oX?`X$am32`Fv zUgFclmx%8XuMj)*aqUZqvxv(T_5Qz!0(T&c4vks73FtPK11X)frHz!`VGo| zi*~a_{_6()Cgp3{z6#8c33Jo0{VI5(>9$ir+aNvbH$ipD{AJ%+@^Ib6dmdR*H*e)V z53iJ&kGBx%d(ftT_)V}OFI5_JjfHPm)8ozsy|dinb3vahx9(hUTlz2Og6i~l&j+0% z58c0QUD7vS2&VhxrRl8~f?~gHX!^i~plAB*g+0#k~5QjxB{6m%@D2IoemdkzF^ z3@fC}pjB}(Dxc``>Cz`mqnUZm!SC3{b=M|6=TcCV+zFv2B-Sd7O4`bYR>`K!8gDdP z+m<5)RFBAFL_w5SQN zFt88&3G zosv~f|C)lXN+W#{qZINjs$4dgRqeJiY_Y677d)gGhm}4a8^Xx`L#A0U8&zZ!*jmJ^ zDZHej$c1Rj$;+%%3&F)vs&?~zL|n`k4)VysN+W_YT-!F*buC6=1}-f%2y~m=tC`b? z_o|aAcuoLmGF;7$gB8}wdHE;RX9=-*ct6J;Ts~C0x`m1E{Gw#W$TY|8W$r@PPP<=; z%i@BMNoul6@Qk4v1c+r3gs+6fWl39F>z+LLwC{DeKvhtvKS$ntMf?OM@1Vcy8V_~K z+xe_VP?$IsdYKk{-71BX5t7TE$SrDPRCA&d==c@Pg?j_)^l)`HX;TsMaxhbqZ>(C? z!XM6RjqVLxjPh30?EudAfOmU9pfQ&*NyI0U!8>SWuwHPo31v2N$7G>R?tB+M%6kBv4 zAx%fcvmxP~jd{XCNYD8gdln%lOsiv1hd#b2+(4eJ^;}<2ETt05HM0&*YgMCcL2U2| zVy0%R=gvM%SjIMKYsQ*|O9Y$AYYrWS=N|YwwxZY>o(V{R^5_>iN5r3_?#X3bIuN7K zp)r{=Ub#`Ye7oZ$#Vgfd0*mNFRcb9v=Th<4s*C{#IsphNT(=?^XV_mdsY(3V7K7sja( zhKG@wjm7mcE^Uo?k;R(vDA89ZN&!YMukhZ$ac)cF6_X$=UAz{q2^dVRF$_=#dJzIo zt~jxkZtCG?qOoj<5Q0~wSqd=--ljArODarW4F{u3Q?qedl_YghY%{zq6va^4WlY9D zD%!Bhw+$08Q;=vjcZFslY6p?PLeNiJAh+l+H5?<>QR}dh#wP&B07>9eiAjINGUL8N#QeG4ZLX!lZAPJO)TE*zR^PWNm75C z#M+_?Lw!f?NS(nAJU9x%=R!DSP=}$xTGu8Bt(b=RFAw9Dja$$85=ppipe>B_PUNgc zCSBd!A8rRJdS(>bx%6=zWW0W2aTF zL{pB|zDH`L5y;0%pBm`(IMNT57}Z8p+-T7$vs?+;S&U^dFfs`RNQb6LfD<)GI`K(2 z>;eqP=Q}Qu)$ck%m3|3M$_{6&4if5G?OeLF1NF`^!n)QBsIER}y38n* z^X%&~<$$i%tLDS*dhf`uY=i~0@Fe}*2SK~CNzX#B`w|Zj@_SXjkE=dB^Hm_rtYqIh&0E2oBs-VqlyoAlfX)+%Ct=2*ga=<(Qd6HUa>dd1`f&q diff --git a/Objects/mytimer.o b/Objects/mytimer.o index 750b5bf4ebd97feeadda88b94c511eb53f43f103..dcc93d795d8136d3bd8897ac2344479d5e674d4b 100644 GIT binary patch delta 67 zcmeCUDbR6KV8ah3Swj;ABLgENB?d-@`1lY{U)T6}1tmiZD-&)VuTFV}{8GnLM{QuV+4L0{|Jd72N;; delta 74 zcmX?cga5=0{tY@@vI^!3Mg~SkN(_t)@$n&^zOM1{3QC5CR>lTa#^%kQT0zg diff --git a/Objects/system_stm32f10x.o b/Objects/system_stm32f10x.o index fcbcca6a22ab5026b0f886865207f1866edfe1bf..eea6d67f38be6bfda60b28009e081976acabf06a 100644 GIT binary patch delta 74 zcmbR7h=0Z-{tYUEvW6xKMg~SkN(_t)@$n&^zOM1{3QC3+Rz_x4CdSQlTa#^%kAg6)oij6lq^ d-BFOae-XQ3lDUDdF~j7CJeJ!9wlH(p0s!vs6R7|I diff --git a/Projet1.uvguix.imbergam b/Projet1.uvguix.imbergam index c63938a..0693efa 100644 --- a/Projet1.uvguix.imbergam +++ b/Projet1.uvguix.imbergam @@ -6,7 +6,7 @@
                      ### uVision Project, (C) Keil Software
                      - U:\Documents\4MIC\S1\Microcontroleur\Activite1\Sources + U:\Documents\4IR\TP_Voilier\FileInclude @@ -20,12 +20,12 @@ 346 Code Coverage - 1010 784 + 1010 656 204 Performance Analyzer - 1170 175 175 274 + 1170 175 175 146 @@ -64,7 +64,7 @@ 2506 Trace Data FiltIdx=0;DescrEn=0;DescrHeight=4;FuncTrc=1;FindType=8;ColWidths=004B00870082005F004600E600C80096 - 75 135 130 95 70 230 200 150 + 75 135 95 70 230 200 150 466 @@ -101,17 +101,17 @@ -1 - 26 - 26 - 1562 - 835 + 130 + 130 + 1570 + 889 0 - 1194 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000C0000000A0000000100000045553A5C446F63756D656E74735C3449525C54505F566F696C6965725C5254455C4465766963655C53544D33324631303352425C73797374656D5F73746D3332663130782E63000000001273797374656D5F73746D3332663130782E6300000000C5D4F200FFFFFFFF49553A5C446F63756D656E74735C3449525C54505F566F696C6965725C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000FFDC7800FFFFFFFF31553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D7954696D65722E6300000000094D7954696D65722E6300000000BECEA100FFFFFFFF31553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D7954696D65722E6800000000094D7954696D65722E6800000000F0A0A100FFFFFFFF2A553A5C446F63756D656E74735C3449525C54505F566F696C6965725C536F75726365735C6D61696E2E6300000000066D61696E2E6300000000BCA8E100FFFFFFFF35553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D794769726F75657474652E63000000000D4D794769726F75657474652E63000000009CC1B600FFFFFFFF35553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D794769726F75657474652E68000000000D4D794769726F75657474652E6800000000F7B88600FFFFFFFF35553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E6300000000D9ADC200FFFFFFFF35553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4472697665725F4750494F2E68000000000D4472697665725F4750494F2E6800000000A5C2D700FFFFFFFF51433A5C50726F6772616D646174615C4B65696C5C41726D5C5061636B735C4B65696C5C53544D3332463178785F4446505C322E332E305C4465766963655C496E636C7564655C73746D3332663130782E68000000000B73746D3332663130782E6800000000B3A6BE00FFFFFFFF31553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D79566F696C652E6800000000094D79566F696C652E6800000000EAD6A300FFFFFFFF25553A5C446F63756D656E74735C3449525C54505F566F696C6965725C4D79566F696C652E6300000000094D79566F696C652E6300000000F6FA7D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F400000066000000000800003D030000 + 929 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000900000002000000010000002A553A5C446F63756D656E74735C3449525C54505F566F696C6965725C536F75726365735C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF49553A5C446F63756D656E74735C3449525C54505F566F696C6965725C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000FFDC7800FFFFFFFF35553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D794769726F75657474652E63000000000D4D794769726F75657474652E6300000000BECEA100FFFFFFFF31553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D7954696D65722E6800000000094D7954696D65722E6800000000F0A0A100FFFFFFFF31553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D7954696D65722E6300000000094D7954696D65722E6300000000BCA8E100FFFFFFFF51433A5C50726F6772616D646174615C4B65696C5C41726D5C5061636B735C4B65696C5C53544D3332463178785F4446505C322E332E305C4465766963655C496E636C7564655C73746D3332663130782E68000000000B73746D3332663130782E68000000009CC1B600FFFFFFFF35553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4472697665725F4750494F2E68000000000D4472697665725F4750494F2E6800000000F7B88600FFFFFFFF35553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D794769726F75657474652E68000000000D4D794769726F75657474652E6800000000D9ADC200FFFFFFFF25553A5C446F63756D656E74735C3449525C54505F566F696C6965725C4D79566F696C652E6300000000094D79566F696C652E6300000000A5C2D700FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F40000006600000080070000F5020000 @@ -150,7 +150,7 @@ 0 16 - 0300000066000000ED0000000D030000 + 0300000066000000ED000000C5020000 16 @@ -170,7 +170,7 @@ 0 16 - 0300000066000000ED0000000D030000 + 0300000066000000ED000000C5020000 16 @@ -450,7 +450,7 @@ 0 16 - 0300000066000000ED0000000D030000 + 0300000066000000ED000000C5020000 16 @@ -470,7 +470,7 @@ 0 16 - 0300000066000000ED0000000D030000 + 0300000066000000ED000000C5020000 16 @@ -490,7 +490,7 @@ 0 16 - 0300000041030000FD07000015040000 + 03000000F90200007D070000CD030000 16 @@ -530,7 +530,7 @@ 0 16 - 0300000041030000FD07000015040000 + 03000000F90200007D070000CD030000 16 @@ -1150,7 +1150,7 @@ 0 16 - 0300000066000000ED0000000D030000 + 0300000066000000ED000000C5020000 16 @@ -1170,7 +1170,7 @@ 0 16 - 0300000041030000FD07000015040000 + 03000000F90200007D070000CD030000 16 @@ -1190,7 +1190,7 @@ 0 16 - 0300000041030000FD07000015040000 + 03000000F90200007D070000CD030000 16 @@ -1250,7 +1250,7 @@ 0 16 - 0300000041030000FD07000015040000 + 03000000F90200007D070000CD030000 16 @@ -1270,7 +1270,7 @@ 0 16 - 0300000041030000FD07000015040000 + 03000000F90200007D070000CD030000 16 @@ -1730,7 +1730,7 @@ 0 16 - 000000002E0400000008000041040000 + 00000000E603000080070000F9030000 16 @@ -1799,14 +1799,14 @@ 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F6000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F400000026030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F00000003D030000000000004F000000F0000000260300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000003002000090050000D4020000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000026030000000800002A03000001000000010000100400000001000000BAFCFFFF8E000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000000000000410300000008000045040000000000002A030000000800002E0400000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F6000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000DE020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F0000000F5020000000000004F000000F0000000DE0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000003002000090050000D4020000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000DE02000080070000E202000001000000010000100400000001000000BAFCFFFF8E000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000000000000F902000080070000FD03000000000000E202000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2537 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2590 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001254494D315F55505F49525148616E646C6572960000000000000002001254494D315F55505F49525148616E646C65720768616E646C65720000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 983 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050010000000452E9656C960000000000000002000A53496D756C6174696F6E0452E9656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050010000000452E9656C960000000000000002000A53496D756C6174696F6E0452E9656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1851,8 +1851,8 @@ 0 - 2048 - 1152 + 1920 + 1080 @@ -1871,11 +1871,11 @@ 0 16 - F40000004F00000000080000E0000000 + F40000004F00000080070000E1000000 16 - F40000006600000000080000F7000000 + F40000006600000080070000F8000000 @@ -1891,7 +1891,7 @@ 0 16 - 0300000066000000ED0000006D030000 + 0300000066000000ED00000092020000 16 @@ -1911,7 +1911,7 @@ 0 16 - 0300000066000000ED0000006D030000 + 0300000066000000ED00000092020000 16 @@ -1931,7 +1931,7 @@ 0 16 - 07040000A1030000FD07000015040000 + C7030000C60200007D070000CD030000 16 @@ -1951,7 +1951,7 @@ 0 16 - 07040000A1030000FD07000015040000 + C7030000C60200007D070000CD030000 16 @@ -1971,7 +1971,7 @@ 0 16 - 07040000A1030000FD07000015040000 + C7030000C60200007D070000CD030000 16 @@ -1991,7 +1991,7 @@ 0 16 - 07040000A1030000FD07000015040000 + C7030000C60200007D070000CD030000 16 @@ -2031,7 +2031,7 @@ 0 16 - F700000066000000FD070000C7000000 + F7000000660000007D070000C8000000 16 @@ -2051,7 +2051,7 @@ 0 16 - 07040000A1030000FD07000015040000 + C7030000C60200007D070000CD030000 16 @@ -2071,7 +2071,7 @@ 0 16 - 07040000A1030000FD07000015040000 + C7030000C60200007D070000CD030000 16 @@ -2091,7 +2091,7 @@ 0 16 - 07040000A1030000FD07000015040000 + C7030000C60200007D070000CD030000 16 @@ -2111,7 +2111,7 @@ 0 16 - 07040000A1030000FD07000015040000 + C7030000C60200007D070000CD030000 16 @@ -2131,7 +2131,7 @@ 0 16 - 07040000A1030000FD07000015040000 + C7030000C60200007D070000CD030000 16 @@ -2151,7 +2151,7 @@ 0 16 - 07040000A1030000FD07000015040000 + C7030000C60200007D070000CD030000 16 @@ -2171,7 +2171,7 @@ 0 16 - 07040000A1030000FD07000015040000 + C7030000C60200007D070000CD030000 16 @@ -2191,7 +2191,7 @@ 0 16 - 0300000066000000ED0000006D030000 + 0300000066000000ED00000092020000 16 @@ -2211,7 +2211,7 @@ 0 16 - 0300000066000000ED0000006D030000 + 0300000066000000ED00000092020000 16 @@ -2251,7 +2251,7 @@ 0 16 - 000000008A030000000400002E040000 + 00000000AF020000C0030000E6030000 16 @@ -2291,7 +2291,7 @@ 0 16 - F40000006300000000080000E0000000 + F40000006300000080070000E1000000 16 @@ -2311,7 +2311,7 @@ 0 16 - F700000066000000FD070000C7000000 + F7000000660000007D070000C8000000 16 @@ -2371,7 +2371,7 @@ 0 16 - 07040000A1030000FD07000015040000 + C7030000C60200007D070000CD030000 16 @@ -2391,7 +2391,7 @@ 0 16 - F700000066000000FD070000C7000000 + F7000000660000007D070000C8000000 16 @@ -2411,7 +2411,7 @@ 0 16 - F700000066000000FD070000C7000000 + F7000000660000007D070000C8000000 16 @@ -2431,7 +2431,7 @@ 0 16 - F700000066000000FD070000C7000000 + F7000000660000007D070000C8000000 16 @@ -2451,7 +2451,7 @@ 0 16 - F700000066000000FD070000C7000000 + F7000000660000007D070000C8000000 16 @@ -2891,7 +2891,7 @@ 0 16 - 0300000066000000ED0000006D030000 + 0300000066000000ED00000092020000 16 @@ -2951,7 +2951,7 @@ 0 16 - 07040000A1030000FD07000015040000 + C7030000C60200007D070000CD030000 16 @@ -2971,7 +2971,7 @@ 0 16 - 07040000A1030000FD07000015040000 + C7030000C60200007D070000CD030000 16 @@ -3031,7 +3031,7 @@ 0 16 - F700000066000000FD070000C7000000 + F7000000660000007D070000C8000000 16 @@ -3471,7 +3471,7 @@ 0 16 - 000000002E0400000008000041040000 + 00000000E603000080070000F9030000 16 @@ -3531,7 +3531,7 @@ 0 16 - 07040000A1030000FD07000015040000 + C7030000C60200007D070000CD030000 16 @@ -3540,14 +3540,14 @@ 3311 - 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFF4000000E000000000080000E40000000100000001000010040000000100000072FFFFFF9E020000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000F40000006600000000080000F7000000F40000004F00000000080000E00000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F400000086030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F00000009D030000000000004F000000F0000000860300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF0000000086030000000800008A03000001000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180008000000100000004040000A10300000008000045040000040400008A030000000800002E04000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF050000000000000001000000000000000100000001000000FFFFFFFF000400008A030000040400002E04000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF0000000029020000900500002D020000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000000000000000000004402000090050000D4020000000000002D02000090050000BD0200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFF4000000E100000080070000E50000000100000001000010040000000100000071FFFFFF9D020000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000F40000006600000080070000F8000000F40000004F00000080070000E10000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000AB020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F0000000C2020000000000004F000000F0000000AB0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000AB02000080070000AF02000001000000010000100400000001000000F3FDFFFF8600000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000C4030000C602000080070000FD030000C4030000AF02000080070000E603000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF050000000000000001000000000000000100000001000000FFFFFFFFC0030000AF020000C4030000E603000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF0000000029020000900500002D020000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000000000000000000004402000090050000D4020000000000002D02000090050000BD0200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2537 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2590 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001254494D315F55505F49525148616E646C6572960000000000000002001254494D315F55505F49525148616E646C65720768616E646C65720000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3592,8 +3592,8 @@ 0 - 2048 - 1152 + 1920 + 1080 @@ -3603,12 +3603,12 @@ 0 100 - 10 + 2 - RTE\Device\STM32F103RB\system_stm32f10x.c - 24 + .\Sources\main.c + 0 1 - 10 + 25 1 0 @@ -3616,87 +3616,15 @@ RTE\Device\STM32F103RB\startup_stm32f10x_md.s 0 - 121 + 126 133 0 0 - - .\FileInclude\MyTimer.c - 33 - 219 - 236 - 1 - - 0 - - - .\FileInclude\MyTimer.h - 17 - 1 - 42 - 1 - - 0 - - - .\Sources\main.c - 12 - 1 - 27 - 1 - - 0 - .\FileInclude\MyGirouette.c - 0 - 1 - 38 - 1 - - 0 - - - .\FileInclude\MyGirouette.h - 0 - 1 - 9 - 1 - - 0 - - - .\FileInclude\Driver_GPIO.c - 10 - 1 - 13 - 1 - - 0 - - - .\FileInclude\Driver_GPIO.h - 0 - 1 - 1 - 1 - - 0 - - - C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h - 25 - 4338 - 4373 - 1 - - 0 - - - .\FileInclude\MyVoile.h - 23 + 22 1 10 1 @@ -3704,10 +3632,55 @@ 0 - .\MyVoile.c + .\FileInclude\MyTimer.h + 13 + 1 + 28 + 1 + + 0 + + + .\FileInclude\MyTimer.c + 0 + 278 + 289 + 1 + + 0 + + + C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h + 106 + 3199 + 3200 + 1 + + 0 + + + .\FileInclude\Driver_GPIO.h 23 1 - 15 + 16 + 1 + + 0 + + + .\FileInclude\MyGirouette.h + 22 + 1 + 3 + 1 + + 0 + + + .\MyVoile.c + 0 + 1 + 17 1 0 diff --git a/Projet1.uvoptx b/Projet1.uvoptx index 394e6eb..bff4324 100644 --- a/Projet1.uvoptx +++ b/Projet1.uvoptx @@ -125,7 +125,7 @@ 0 DLGDARM - (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=61,96,281,556,0)(111=60,88,280,548,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=302,417,723,844,1)(121=-1,-1,-1,-1,0)(122=704,251,1125,678,0)(123=-1,-1,-1,-1,0)(140=848,409,1536,749,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=885,128,1479,879,0)(131=937,153,1531,904,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=1246,187,1849,938,0)(151=-1,-1,-1,-1,0) + (1010=1430,289,1806,846,1)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=15,39,661,712,0)(110=61,96,281,556,0)(111=60,88,280,548,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=1028,194,1449,621,0)(121=1016,366,1437,793,1)(122=704,251,1125,678,0)(123=-1,-1,-1,-1,0)(140=202,674,890,1014,1)(240=559,262,958,607,1)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=885,128,1479,879,0)(131=937,153,1531,904,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=1246,187,1849,938,0)(151=-1,-1,-1,-1,0) 0 @@ -138,7 +138,31 @@ UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)) - + + + 0 + 0 + 8 + 1 +
                      134218060
                      + 0 + 0 + 0 + 0 + 0 + 1 + .\FileInclude\MyGirouette.c + + \\Projet1_Simulation\FileInclude/MyGirouette.c\8 +                       +                       + + + 0 + 1 + x + + 0 @@ -302,7 +326,7 @@ 0 DLGTARM - (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=60,88,280,548,0)(111=60,88,280,548,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=757,193,1178,598,0)(121=75,104,496,509,0)(122=1260,243,1681,648,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=150,186,744,880,0)(131=1231,145,1825,839,0)(132=-1,-1,-1,-1,0)(133=1272,303,1866,997,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0) + (1010=1507,235,1883,792,1)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=60,88,280,548,0)(111=60,88,280,548,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=757,193,1178,598,0)(121=96,506,517,911,1)(122=1260,243,1681,648,0)(123=-1,-1,-1,-1,0)(140=699,144,1387,484,1)(240=647,562,1046,907,1)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=150,186,744,880,0)(131=1231,145,1825,839,0)(132=-1,-1,-1,-1,0)(133=1272,303,1866,997,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=1580,389,1907,750,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0) 0 @@ -335,7 +359,24 @@ UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)) - + + + 0 + 0 + 8 + 1 +
                      134218060
                      + 0 + 0 + 0 + 0 + 0 + 1 + .\FileInclude\MyGirouette.c + + \\Projet1_Simulation\FileInclude/MyGirouette.c\8 +                       +                       0 @@ -352,6 +393,16 @@ 1 a + + 3 + 1 + ID_acc,0x10 + + + 4 + 1 + x + 0 @@ -446,18 +497,6 @@ 2 3 - 5 - 0 - 0 - 0 - .\FileInclude\MyTimer.h - MyTimer.h - 0 - 0 - - - 2 - 4 1 0 0 @@ -469,19 +508,7 @@ 2 - 5 - 5 - 0 - 0 - 0 - .\FileInclude\MyADC.h - MyADC.h - 0 - 0 - - - 2 - 6 + 4 1 0 0 @@ -493,21 +520,9 @@ 2 - 7 - 5 - 0 - 0 - 0 - .\FileInclude\Driver_GPIO.h - Driver_GPIO.h - 0 - 0 - - - 2 - 8 + 5 1 - 0 + 1 0 0 .\FileInclude\MyGirouette.c @@ -517,31 +532,7 @@ 2 - 9 - 5 - 0 - 0 - 0 - .\FileInclude\MyGirouette.h - MyGirouette.h - 0 - 0 - - - 2 - 10 - 5 - 0 - 0 - 0 - .\FileInclude\MyVoile.h - MyVoile.h - 0 - 0 - - - 2 - 11 + 6 1 0 0 diff --git a/Projet1.uvprojx b/Projet1.uvprojx index 54674a1..b9ad3e3 100644 --- a/Projet1.uvprojx +++ b/Projet1.uvprojx @@ -398,46 +398,21 @@ 1 .\FileInclude\MyTimer.c - - MyTimer.h - 5 - .\FileInclude\MyTimer.h - MyADC.c 1 .\FileInclude\MyADC.c - - MyADC.h - 5 - .\FileInclude\MyADC.h - Driver_GPIO.c 1 .\FileInclude\Driver_GPIO.c - - Driver_GPIO.h - 5 - .\FileInclude\Driver_GPIO.h - MyGirouette.c 1 .\FileInclude\MyGirouette.c - - MyGirouette.h - 5 - .\FileInclude\MyGirouette.h - - - MyVoile.h - 5 - .\FileInclude\MyVoile.h - MyVoile.c 1 @@ -845,46 +820,21 @@ 1 .\FileInclude\MyTimer.c - - MyTimer.h - 5 - .\FileInclude\MyTimer.h - MyADC.c 1 .\FileInclude\MyADC.c - - MyADC.h - 5 - .\FileInclude\MyADC.h - Driver_GPIO.c 1 .\FileInclude\Driver_GPIO.c - - Driver_GPIO.h - 5 - .\FileInclude\Driver_GPIO.h - MyGirouette.c 1 .\FileInclude\MyGirouette.c - - MyGirouette.h - 5 - .\FileInclude\MyGirouette.h - - - MyVoile.h - 5 - .\FileInclude\MyVoile.h - MyVoile.c 1 diff --git a/Sources/main.c b/Sources/main.c index 38a8c10..967e82a 100644 --- a/Sources/main.c +++ b/Sources/main.c @@ -1,6 +1,5 @@ #include "stm32f10x.h" #include -#include #include #include #include @@ -16,17 +15,18 @@ void Callback(void){ int main (void) // (PSC+1)*(ARR+1)/fClk { - MyGPIO_Struct_TypeDef GPIOB8={ +/* MyGPIO_Struct_TypeDef GPIOB8={ GPIOB, 8, AltOut_Ppull - }; + };*/ // MyGPIO_Init(&GPIOB8); Init_Girouette(); - MyVoile_Init(); + /*MyVoile_Init(); while (1) { - Set_Voile(Get_Angle()); - } + Set_Voile(Get_Angle()); + }*/ + while (1){} }