From 1b7c5f8b28da58f8239a0140022b3003b71300b0 Mon Sep 17 00:00:00 2001 From: Robin M Date: Fri, 7 Apr 2023 14:21:38 +0200 Subject: [PATCH] Encoder working need to implement GPIO interrupt --- driver/Driver_GPIO.c | 2 +- driver/Driver_Timer.c | 44 ++- driver/Driver_Timer.h | 7 +- driver/Driver_UART.c | 20 +- projet-voilier/Listings/projet-voilier.map | 252 ++++++------- projet-voilier/Objects/driver_gpio.o | Bin 5436 -> 5436 bytes projet-voilier/Objects/driver_timer.o | Bin 13916 -> 15368 bytes projet-voilier/Objects/driver_uart.o | Bin 4652 -> 5268 bytes projet-voilier/Objects/main.d | 15 - projet-voilier/Objects/main.o | Bin 5276 -> 4448 bytes projet-voilier/Objects/projet-voilier.axf | Bin 30648 -> 30644 bytes .../Objects/projet-voilier.build_log.htm | 18 +- projet-voilier/Objects/projet-voilier.htm | 138 +++---- projet-voilier/Objects/projet-voilier_sim.dep | 26 +- projet-voilier/projet-voilier.uvguix.robin | 111 +++--- projet-voilier/projet-voilier.uvoptx | 340 +++--------------- projet-voilier/projet-voilier.uvprojx | 22 -- projet-voilier/src/main.c | 145 +++++--- 18 files changed, 464 insertions(+), 676 deletions(-) diff --git a/driver/Driver_GPIO.c b/driver/Driver_GPIO.c index 7017943..fdf024b 100644 --- a/driver/Driver_GPIO.c +++ b/driver/Driver_GPIO.c @@ -27,7 +27,7 @@ void MyGPIO_Init ( MyGPIO_Struct_TypeDef * GPIOStructPtr ) /* Reset, and then configuration writing of the selected GPIO Pin */ if(GPIOStructPtr->GPIO_Pin <= 8) { - GPIOStructPtr->GPIO->CRL &= ~0xF<<(4*(GPIOStructPtr->GPIO_Pin)); + GPIOStructPtr->GPIO->CRL &= ~(0xF<<(4*(GPIOStructPtr->GPIO_Pin))); GPIOStructPtr->GPIO->CRL |= (GPIOStructPtr->GPIO_Conf)<<(4*(GPIOStructPtr->GPIO_Pin)); } else diff --git a/driver/Driver_Timer.c b/driver/Driver_Timer.c index b75e1b2..48161dd 100644 --- a/driver/Driver_Timer.c +++ b/driver/Driver_Timer.c @@ -37,41 +37,63 @@ void MyTimer_Stop(MyTimer_Struct_TypeDef * Timer) Timer->Timer->CR1 &= ~TIM_CR1_CEN; } -// Note : PWM Tested on PA0 -void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint8_t channel, uint16_t duty_cycle) { +// Note : PWM Tested on PA0 and PA1 +void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint16_t duty_cycle) { uint16_t CCR_Value = (duty_cycle * TIM2->ARR) / 100; - // Configurer le Timer en mode PWM - - // Configurer le Channel - if (channel == 1) { + if (Timer->channel == 1) { Timer->Timer->CCMR1 = TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC1M_1; Timer->Timer->CCMR1 |= TIM_CCMR1_OC1PE; // activer la précharge du registre de comparaison Timer->Timer->CCER |= TIM_CCER_CC1E; Timer->Timer->CCR1 = CCR_Value; - } else if (channel == 2) { + } else if (Timer->channel == 2) { Timer->Timer->CCMR1 = TIM_CCMR1_OC2M_2 | TIM_CCMR1_OC2M_1; Timer->Timer->CCMR1 |= TIM_CCMR1_OC2PE; // activer la précharge du registre de comparaison Timer->Timer->CCER |= TIM_CCER_CC2E; Timer->Timer->CCR2 = CCR_Value; - } else if (channel == 3) { + } else if (Timer->channel == 3) { Timer->Timer->CCMR2 = TIM_CCMR2_OC3M_2 | TIM_CCMR2_OC3M_1; Timer->Timer->CCMR2 |= TIM_CCMR2_OC3PE; // activer la précharge du registre de comparaison Timer->Timer->CCER |= TIM_CCER_CC3E; Timer->Timer->CCER &= ~TIM_CCER_CC3P; Timer->Timer->CCR3 = CCR_Value; - } else if (channel == 4) { + } else if (Timer->channel == 4) { Timer->Timer->CCMR2 = TIM_CCMR2_OC4M_2 | TIM_CCMR2_OC4M_1; Timer->Timer->CCMR2 |= TIM_CCMR2_OC4PE; // activer la précharge du registre de comparaison Timer->Timer->CCER |= TIM_CCER_CC4E; Timer->Timer->CCR4 = CCR_Value; } +} - - +void MyTimer_SetPWMDutyCycle(MyTimer_Struct_TypeDef *Timer, uint16_t duty_cycle) { + uint16_t CCR_Value = (duty_cycle * TIM2->ARR) / 100; + if (Timer->channel == 1) { + Timer->Timer->CCR1 = CCR_Value; + } else if (Timer->channel == 2) { + Timer->Timer->CCR2 = CCR_Value; + } else if (Timer->channel == 3) { + Timer->Timer->CCER &= ~TIM_CCER_CC3P; + Timer->Timer->CCR3 = CCR_Value; + } else if (Timer->channel == 4) { + Timer->Timer->CCR4 = CCR_Value; + } +} + +// Utiliser le TIM4 +void MyTimer_ConfigureEncoder(MyTimer_Struct_TypeDef *Timer) { + Timer->Timer->PSC = 0; // Configurer le prescaler à 0 (pour diviser l'horloge de base de 72 MHz par 1) + Timer->Timer->ARR = 359; // Configurer la valeur maximale du compteur (pour éviter les problèmes de débordement) + + Timer->Timer->CCMR1 |= TIM_CCMR1_CC1S_0; + Timer->Timer->CCMR1 |= TIM_CCMR1_CC2S_0; + Timer->Timer->CCER &= ~TIM_CCER_CC1P; + Timer->Timer->CCMR1 &= ~(TIM_CCMR1_IC1F_0 | TIM_CCMR1_IC1F_1 | TIM_CCMR1_IC1F_2 | TIM_CCMR1_IC1F_3); + Timer->Timer->CCER &= ~TIM_CCER_CC2P; + Timer->Timer->CCMR1 &= ~(TIM_CCMR1_IC2F_0 | TIM_CCMR1_IC2F_1 | TIM_CCMR1_IC2F_2 | TIM_CCMR1_IC2F_3); + Timer->Timer->SMCR |= TIM_SMCR_SMS_0 | TIM_SMCR_SMS_1; } void Bug (void) diff --git a/driver/Driver_Timer.h b/driver/Driver_Timer.h index 95e4ccd..89a5564 100644 --- a/driver/Driver_Timer.h +++ b/driver/Driver_Timer.h @@ -8,6 +8,7 @@ typedef struct TIM_TypeDef * Timer; unsigned short ARR; unsigned short PSC; + uint8_t channel; // 1 2 3 or 4 } MyTimer_Struct_TypeDef; /** @@ -46,6 +47,10 @@ void MyTimer_ActiveIT (TIM_TypeDef * Timer, char Prio, void (*IT_function)(void) */ void MyTimer_PWM(TIM_TypeDef * Timer, char Channel); -void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint8_t pwm_channel, uint16_t duty_cycle); +void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint16_t duty_cycle); + +void MyTimer_SetPWMDutyCycle(MyTimer_Struct_TypeDef *Timer, uint16_t duty_cycle); + +void MyTimer_ConfigureEncoder(MyTimer_Struct_TypeDef *Timer); #endif diff --git a/driver/Driver_UART.c b/driver/Driver_UART.c index 915853c..55258a8 100644 --- a/driver/Driver_UART.c +++ b/driver/Driver_UART.c @@ -17,19 +17,21 @@ void MyUART_Init(MyUART_Struct_TypeDef *UART) { UART->UART->CR1 |= USART_CR1_TE | USART_CR1_RE; UART->UART->CR2 &= ~(0x11 << 12); + + USART3->CR1 |= USART_CR1_RXNEIE | USART_CR1_TXEIE; // Active les interruptions de l'UART + __enable_irq();// Active les interruptions globales } void MyUART_SendByte(MyUART_Struct_TypeDef *UART, uint8_t data) { // Attendre que le registre de données soit prêt à être envoyé - while (!(UART->UART->SR & USART_SR_TXE)); + //while (!(UART->UART->SR & USART_SR_TXE)); // Envoyer la donnée UART->UART->DR = data; - // Attendre que la donnée soit envoyée - while (!(UART->UART->SR & USART_SR_TC)); + USART3->CR1 |= USART_CR1_TXEIE; // Active l'interruption d'envoi de données } uint8_t MyUART_ReceiveByte(MyUART_Struct_TypeDef *UART) { @@ -44,4 +46,14 @@ uint8_t MyUART_ReceiveByte(MyUART_Struct_TypeDef *UART) { // Renvoyer la donnée lue return data; -} \ No newline at end of file +} + +void USART3_IRQHandler(void) { + if (USART3->SR & USART_SR_RXNE) { + + } + + if (USART3->SR & USART_SR_TXE) { + + } +} diff --git a/projet-voilier/Listings/projet-voilier.map b/projet-voilier/Listings/projet-voilier.map index ebe2563..e5d9e2c 100644 --- a/projet-voilier/Listings/projet-voilier.map +++ b/projet-voilier/Listings/projet-voilier.map @@ -5,13 +5,9 @@ Component: Arm Compiler for Embedded 6.19 Tool: armlink [5e73cb00] Section Cross References main.o(.text.main) refers to driver_gpio.o(.text.MyGPIO_Init) for MyGPIO_Init - main.o(.text.main) refers to driver_gpio.o(.text.MyGPIO_Set) for MyGPIO_Set main.o(.text.main) refers to driver_timer.o(.text.MyTimer_Base_Init) for MyTimer_Base_Init - main.o(.text.main) refers to driver_timer.o(.text.MyTimer_ConfigurePWM) for MyTimer_ConfigurePWM + main.o(.text.main) refers to driver_timer.o(.text.MyTimer_ConfigureEncoder) for MyTimer_ConfigureEncoder main.o(.text.main) refers to driver_timer.o(.text.MyTimer_Start) for MyTimer_Start - main.o(.text.main) refers to driver_uart.o(.text.MyUART_Init) for MyUART_Init - main.o(.text.main) refers to driver_uart.o(.text.MyUART_SendByte) for MyUART_SendByte - main.o(.text.main) refers to driver_uart.o(.text.MyUART_ReceiveByte) for MyUART_ReceiveByte main.o(.ARM.exidx.text.main) refers to main.o(.text.main) for [Anonymous Symbol] driver_gpio.o(.ARM.exidx.text.MyGPIO_Init) refers to driver_gpio.o(.text.MyGPIO_Init) for [Anonymous Symbol] driver_gpio.o(.ARM.exidx.text.MyGPIO_Read) refers to driver_gpio.o(.text.MyGPIO_Read) for [Anonymous Symbol] @@ -22,6 +18,8 @@ Section Cross References driver_timer.o(.ARM.exidx.text.MyTimer_Start) refers to driver_timer.o(.text.MyTimer_Start) for [Anonymous Symbol] driver_timer.o(.ARM.exidx.text.MyTimer_Stop) refers to driver_timer.o(.text.MyTimer_Stop) for [Anonymous Symbol] driver_timer.o(.ARM.exidx.text.MyTimer_ConfigurePWM) refers to driver_timer.o(.text.MyTimer_ConfigurePWM) for [Anonymous Symbol] + driver_timer.o(.ARM.exidx.text.MyTimer_SetPWMDutyCycle) refers to driver_timer.o(.text.MyTimer_SetPWMDutyCycle) for [Anonymous Symbol] + driver_timer.o(.ARM.exidx.text.MyTimer_ConfigureEncoder) refers to driver_timer.o(.text.MyTimer_ConfigureEncoder) for [Anonymous Symbol] driver_timer.o(.ARM.exidx.text.Bug) refers to driver_timer.o(.text.Bug) for [Anonymous Symbol] driver_timer.o(.text.MyTimer_ActiveIT) refers to driver_timer.o(.data.TIM2_fx) for TIM2_fx driver_timer.o(.text.MyTimer_ActiveIT) refers to driver_timer.o(.data.TIM4_fx) for TIM4_fx @@ -39,6 +37,7 @@ Section Cross References driver_uart.o(.ARM.exidx.text.MyUART_Init) refers to driver_uart.o(.text.MyUART_Init) for [Anonymous Symbol] driver_uart.o(.ARM.exidx.text.MyUART_SendByte) refers to driver_uart.o(.text.MyUART_SendByte) for [Anonymous Symbol] driver_uart.o(.ARM.exidx.text.MyUART_ReceiveByte) refers to driver_uart.o(.text.MyUART_ReceiveByte) for [Anonymous Symbol] + driver_uart.o(.ARM.exidx.text.USART3_IRQHandler) refers to driver_uart.o(.text.USART3_IRQHandler) for [Anonymous Symbol] startup_stm32f10x_md.o(STACK) refers (Special) to heapauxi.o(.text) for __use_two_region_memory startup_stm32f10x_md.o(HEAP) refers (Special) to heapauxi.o(.text) for __use_two_region_memory startup_stm32f10x_md.o(RESET) refers (Special) to heapauxi.o(.text) for __use_two_region_memory @@ -47,6 +46,7 @@ Section Cross References startup_stm32f10x_md.o(RESET) refers to driver_timer.o(.text.TIM2_IRQHandler) for TIM2_IRQHandler startup_stm32f10x_md.o(RESET) refers to driver_timer.o(.text.TIM3_IRQHandler) for TIM3_IRQHandler startup_stm32f10x_md.o(RESET) refers to driver_timer.o(.text.TIM4_IRQHandler) for TIM4_IRQHandler + startup_stm32f10x_md.o(RESET) refers to driver_uart.o(.text.USART3_IRQHandler) for USART3_IRQHandler startup_stm32f10x_md.o(.text) refers (Special) to heapauxi.o(.text) for __use_two_region_memory startup_stm32f10x_md.o(.text) refers to system_stm32f10x.o(.text.SystemInit) for SystemInit startup_stm32f10x_md.o(.text) refers to __main.o(!!!main) for __main @@ -174,6 +174,7 @@ Removing Unused input sections from the image. Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Init), (8 bytes). Removing driver_gpio.o(.text.MyGPIO_Read), (12 bytes). Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Read), (8 bytes). + Removing driver_gpio.o(.text.MyGPIO_Set), (14 bytes). Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Set), (8 bytes). Removing driver_gpio.o(.text.MyGPIO_Reset), (16 bytes). Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Reset), (8 bytes). @@ -184,7 +185,11 @@ Removing Unused input sections from the image. Removing driver_timer.o(.ARM.exidx.text.MyTimer_Start), (8 bytes). Removing driver_timer.o(.text.MyTimer_Stop), (12 bytes). Removing driver_timer.o(.ARM.exidx.text.MyTimer_Stop), (8 bytes). + Removing driver_timer.o(.text.MyTimer_ConfigurePWM), (166 bytes). Removing driver_timer.o(.ARM.exidx.text.MyTimer_ConfigurePWM), (8 bytes). + Removing driver_timer.o(.text.MyTimer_SetPWMDutyCycle), (82 bytes). + Removing driver_timer.o(.ARM.exidx.text.MyTimer_SetPWMDutyCycle), (8 bytes). + Removing driver_timer.o(.ARM.exidx.text.MyTimer_ConfigureEncoder), (8 bytes). Removing driver_timer.o(.ARM.exidx.text.Bug), (8 bytes). Removing driver_timer.o(.text.MyTimer_ActiveIT), (150 bytes). Removing driver_timer.o(.ARM.exidx.text.MyTimer_ActiveIT), (8 bytes). @@ -192,9 +197,13 @@ Removing Unused input sections from the image. Removing driver_timer.o(.ARM.exidx.text.TIM3_IRQHandler), (8 bytes). Removing driver_timer.o(.ARM.exidx.text.TIM4_IRQHandler), (8 bytes). Removing driver_uart.o(.text), (0 bytes). + Removing driver_uart.o(.text.MyUART_Init), (76 bytes). Removing driver_uart.o(.ARM.exidx.text.MyUART_Init), (8 bytes). + Removing driver_uart.o(.text.MyUART_SendByte), (22 bytes). Removing driver_uart.o(.ARM.exidx.text.MyUART_SendByte), (8 bytes). + Removing driver_uart.o(.text.MyUART_ReceiveByte), (24 bytes). Removing driver_uart.o(.ARM.exidx.text.MyUART_ReceiveByte), (8 bytes). + Removing driver_uart.o(.ARM.exidx.text.USART3_IRQHandler), (8 bytes). Removing system_stm32f10x.o(.text), (0 bytes). Removing system_stm32f10x.o(.ARM.exidx.text.SystemInit), (8 bytes). Removing system_stm32f10x.o(.text.SystemCoreClockUpdate), (110 bytes). @@ -202,7 +211,7 @@ Removing Unused input sections from the image. Removing system_stm32f10x.o(.data.SystemCoreClock), (4 bytes). Removing system_stm32f10x.o(.rodata.AHBPrescTable), (16 bytes). -34 unused section(s) (total 498 bytes) removed from the image. +43 unused section(s) (total 906 bytes) removed from the image. ============================================================================== @@ -328,18 +337,15 @@ Image Symbol Table .text 0x08000242 Section 0 indicate_semi.o(.text) [Anonymous Symbol] 0x08000244 Section 0 driver_timer.o(.text.Bug) [Anonymous Symbol] 0x08000248 Section 0 driver_gpio.o(.text.MyGPIO_Init) - [Anonymous Symbol] 0x080002e4 Section 0 driver_gpio.o(.text.MyGPIO_Set) - [Anonymous Symbol] 0x080002f4 Section 0 driver_timer.o(.text.MyTimer_Base_Init) - [Anonymous Symbol] 0x08000380 Section 0 driver_timer.o(.text.MyTimer_ConfigurePWM) - [Anonymous Symbol] 0x08000428 Section 0 driver_timer.o(.text.MyTimer_Start) - [Anonymous Symbol] 0x08000434 Section 0 driver_uart.o(.text.MyUART_Init) - [Anonymous Symbol] 0x08000470 Section 0 driver_uart.o(.text.MyUART_ReceiveByte) - [Anonymous Symbol] 0x08000488 Section 0 driver_uart.o(.text.MyUART_SendByte) - [Anonymous Symbol] 0x0800049c Section 0 system_stm32f10x.o(.text.SystemInit) - [Anonymous Symbol] 0x080005ac Section 0 driver_timer.o(.text.TIM2_IRQHandler) - [Anonymous Symbol] 0x080005c8 Section 0 driver_timer.o(.text.TIM3_IRQHandler) - [Anonymous Symbol] 0x080005e4 Section 0 driver_timer.o(.text.TIM4_IRQHandler) - [Anonymous Symbol] 0x08000600 Section 0 main.o(.text.main) + [Anonymous Symbol] 0x080002e4 Section 0 driver_timer.o(.text.MyTimer_Base_Init) + [Anonymous Symbol] 0x08000370 Section 0 driver_timer.o(.text.MyTimer_ConfigureEncoder) + [Anonymous Symbol] 0x080003b8 Section 0 driver_timer.o(.text.MyTimer_Start) + [Anonymous Symbol] 0x080003c4 Section 0 system_stm32f10x.o(.text.SystemInit) + [Anonymous Symbol] 0x080004d4 Section 0 driver_timer.o(.text.TIM2_IRQHandler) + [Anonymous Symbol] 0x080004f0 Section 0 driver_timer.o(.text.TIM3_IRQHandler) + [Anonymous Symbol] 0x0800050c Section 0 driver_timer.o(.text.TIM4_IRQHandler) + [Anonymous Symbol] 0x08000528 Section 0 driver_uart.o(.text.USART3_IRQHandler) + [Anonymous Symbol] 0x08000538 Section 0 main.o(.text.main) .bss 0x20000010 Section 96 libspace.o(.bss) Heap_Mem 0x20000070 Data 512 startup_stm32f10x_md.o(HEAP) HEAP 0x20000070 Section 512 startup_stm32f10x_md.o(HEAP) @@ -479,7 +485,6 @@ Image Symbol Table TIM1_UP_IRQHandler 0x080001a3 Thumb Code 0 startup_stm32f10x_md.o(.text) USART1_IRQHandler 0x080001a3 Thumb Code 0 startup_stm32f10x_md.o(.text) USART2_IRQHandler 0x080001a3 Thumb Code 0 startup_stm32f10x_md.o(.text) - USART3_IRQHandler 0x080001a3 Thumb Code 0 startup_stm32f10x_md.o(.text) USBWakeUp_IRQHandler 0x080001a3 Thumb Code 0 startup_stm32f10x_md.o(.text) USB_HP_CAN1_TX_IRQHandler 0x080001a3 Thumb Code 0 startup_stm32f10x_md.o(.text) USB_LP_CAN1_RX0_IRQHandler 0x080001a3 Thumb Code 0 startup_stm32f10x_md.o(.text) @@ -499,20 +504,17 @@ Image Symbol Table __semihosting_library_function 0x08000243 Thumb Code 0 indicate_semi.o(.text) Bug 0x08000245 Thumb Code 2 driver_timer.o(.text.Bug) MyGPIO_Init 0x08000249 Thumb Code 140 driver_gpio.o(.text.MyGPIO_Init) - MyGPIO_Set 0x080002e5 Thumb Code 14 driver_gpio.o(.text.MyGPIO_Set) - MyTimer_Base_Init 0x080002f5 Thumb Code 140 driver_timer.o(.text.MyTimer_Base_Init) - MyTimer_ConfigurePWM 0x08000381 Thumb Code 168 driver_timer.o(.text.MyTimer_ConfigurePWM) - MyTimer_Start 0x08000429 Thumb Code 12 driver_timer.o(.text.MyTimer_Start) - MyUART_Init 0x08000435 Thumb Code 58 driver_uart.o(.text.MyUART_Init) - MyUART_ReceiveByte 0x08000471 Thumb Code 24 driver_uart.o(.text.MyUART_ReceiveByte) - MyUART_SendByte 0x08000489 Thumb Code 20 driver_uart.o(.text.MyUART_SendByte) - SystemInit 0x0800049d Thumb Code 272 system_stm32f10x.o(.text.SystemInit) - TIM2_IRQHandler 0x080005ad Thumb Code 26 driver_timer.o(.text.TIM2_IRQHandler) - TIM3_IRQHandler 0x080005c9 Thumb Code 28 driver_timer.o(.text.TIM3_IRQHandler) - TIM4_IRQHandler 0x080005e5 Thumb Code 28 driver_timer.o(.text.TIM4_IRQHandler) - main 0x08000601 Thumb Code 168 main.o(.text.main) - Region$$Table$$Base 0x080006a8 Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x080006c8 Number 0 anon$$obj.o(Region$$Table) + MyTimer_Base_Init 0x080002e5 Thumb Code 140 driver_timer.o(.text.MyTimer_Base_Init) + MyTimer_ConfigureEncoder 0x08000371 Thumb Code 70 driver_timer.o(.text.MyTimer_ConfigureEncoder) + MyTimer_Start 0x080003b9 Thumb Code 12 driver_timer.o(.text.MyTimer_Start) + SystemInit 0x080003c5 Thumb Code 272 system_stm32f10x.o(.text.SystemInit) + TIM2_IRQHandler 0x080004d5 Thumb Code 26 driver_timer.o(.text.TIM2_IRQHandler) + TIM3_IRQHandler 0x080004f1 Thumb Code 28 driver_timer.o(.text.TIM3_IRQHandler) + TIM4_IRQHandler 0x0800050d Thumb Code 28 driver_timer.o(.text.TIM4_IRQHandler) + USART3_IRQHandler 0x08000529 Thumb Code 14 driver_uart.o(.text.USART3_IRQHandler) + main 0x08000539 Thumb Code 78 main.o(.text.main) + Region$$Table$$Base 0x08000588 Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x080005a8 Number 0 anon$$obj.o(Region$$Table) TIM2_fx 0x20000000 Data 4 driver_timer.o(.data.TIM2_fx) TIM3_fx 0x20000004 Data 4 driver_timer.o(.data.TIM3_fx) TIM4_fx 0x20000008 Data 4 driver_timer.o(.data.TIM4_fx) @@ -527,108 +529,106 @@ Memory Map of the image Image Entry point : 0x08000189 - Load Region LR_1 (Base: 0x08000000, Size: 0x000006d4, Max: 0xffffffff, ABSOLUTE) + Load Region LR_1 (Base: 0x08000000, Size: 0x000005b4, Max: 0xffffffff, ABSOLUTE) - Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000006c8, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000005a8, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x08000000 0x08000000 0x000000ec Data RO 73 RESET startup_stm32f10x_md.o - 0x080000ec 0x080000ec 0x00000008 Code RO 98 * !!!main c_w.l(__main.o) - 0x080000f4 0x080000f4 0x00000034 Code RO 263 !!!scatter c_w.l(__scatter.o) - 0x08000128 0x08000128 0x0000001a Code RO 265 !!handler_copy c_w.l(__scatter_copy.o) + 0x08000000 0x08000000 0x000000ec Data RO 79 RESET startup_stm32f10x_md.o + 0x080000ec 0x080000ec 0x00000008 Code RO 104 * !!!main c_w.l(__main.o) + 0x080000f4 0x080000f4 0x00000034 Code RO 269 !!!scatter c_w.l(__scatter.o) + 0x08000128 0x08000128 0x0000001a Code RO 271 !!handler_copy c_w.l(__scatter_copy.o) 0x08000142 0x08000142 0x00000002 PAD - 0x08000144 0x08000144 0x0000001c Code RO 267 !!handler_zi c_w.l(__scatter_zi.o) - 0x08000160 0x08000160 0x00000002 Code RO 125 .ARM.Collect$$libinit$$00000000 c_w.l(libinit.o) - 0x08000162 0x08000162 0x00000000 Code RO 132 .ARM.Collect$$libinit$$00000002 c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 134 .ARM.Collect$$libinit$$00000004 c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 136 .ARM.Collect$$libinit$$00000006 c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 139 .ARM.Collect$$libinit$$0000000C c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 141 .ARM.Collect$$libinit$$0000000E c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 143 .ARM.Collect$$libinit$$00000010 c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 146 .ARM.Collect$$libinit$$00000013 c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 148 .ARM.Collect$$libinit$$00000015 c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 150 .ARM.Collect$$libinit$$00000017 c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 152 .ARM.Collect$$libinit$$00000019 c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 154 .ARM.Collect$$libinit$$0000001B c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 156 .ARM.Collect$$libinit$$0000001D c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 158 .ARM.Collect$$libinit$$0000001F c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 160 .ARM.Collect$$libinit$$00000021 c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 162 .ARM.Collect$$libinit$$00000023 c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 164 .ARM.Collect$$libinit$$00000025 c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 166 .ARM.Collect$$libinit$$00000027 c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 170 .ARM.Collect$$libinit$$0000002E c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 172 .ARM.Collect$$libinit$$00000030 c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 174 .ARM.Collect$$libinit$$00000032 c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000000 Code RO 176 .ARM.Collect$$libinit$$00000034 c_w.l(libinit2.o) - 0x08000162 0x08000162 0x00000002 Code RO 177 .ARM.Collect$$libinit$$00000035 c_w.l(libinit2.o) - 0x08000164 0x08000164 0x00000002 Code RO 199 .ARM.Collect$$libshutdown$$00000000 c_w.l(libshutdown.o) - 0x08000166 0x08000166 0x00000000 Code RO 214 .ARM.Collect$$libshutdown$$00000002 c_w.l(libshutdown2.o) - 0x08000166 0x08000166 0x00000000 Code RO 216 .ARM.Collect$$libshutdown$$00000004 c_w.l(libshutdown2.o) - 0x08000166 0x08000166 0x00000000 Code RO 219 .ARM.Collect$$libshutdown$$00000007 c_w.l(libshutdown2.o) - 0x08000166 0x08000166 0x00000000 Code RO 222 .ARM.Collect$$libshutdown$$0000000A c_w.l(libshutdown2.o) - 0x08000166 0x08000166 0x00000000 Code RO 224 .ARM.Collect$$libshutdown$$0000000C c_w.l(libshutdown2.o) - 0x08000166 0x08000166 0x00000000 Code RO 227 .ARM.Collect$$libshutdown$$0000000F c_w.l(libshutdown2.o) - 0x08000166 0x08000166 0x00000002 Code RO 228 .ARM.Collect$$libshutdown$$00000010 c_w.l(libshutdown2.o) - 0x08000168 0x08000168 0x00000000 Code RO 100 .ARM.Collect$$rtentry$$00000000 c_w.l(__rtentry.o) - 0x08000168 0x08000168 0x00000000 Code RO 102 .ARM.Collect$$rtentry$$00000002 c_w.l(__rtentry2.o) - 0x08000168 0x08000168 0x00000006 Code RO 114 .ARM.Collect$$rtentry$$00000004 c_w.l(__rtentry4.o) - 0x0800016e 0x0800016e 0x00000000 Code RO 104 .ARM.Collect$$rtentry$$00000009 c_w.l(__rtentry2.o) - 0x0800016e 0x0800016e 0x00000004 Code RO 105 .ARM.Collect$$rtentry$$0000000A c_w.l(__rtentry2.o) - 0x08000172 0x08000172 0x00000000 Code RO 107 .ARM.Collect$$rtentry$$0000000C c_w.l(__rtentry2.o) - 0x08000172 0x08000172 0x00000008 Code RO 108 .ARM.Collect$$rtentry$$0000000D c_w.l(__rtentry2.o) - 0x0800017a 0x0800017a 0x00000002 Code RO 129 .ARM.Collect$$rtexit$$00000000 c_w.l(rtexit.o) - 0x0800017c 0x0800017c 0x00000000 Code RO 179 .ARM.Collect$$rtexit$$00000002 c_w.l(rtexit2.o) - 0x0800017c 0x0800017c 0x00000004 Code RO 180 .ARM.Collect$$rtexit$$00000003 c_w.l(rtexit2.o) - 0x08000180 0x08000180 0x00000006 Code RO 181 .ARM.Collect$$rtexit$$00000004 c_w.l(rtexit2.o) + 0x08000144 0x08000144 0x0000001c Code RO 273 !!handler_zi c_w.l(__scatter_zi.o) + 0x08000160 0x08000160 0x00000002 Code RO 131 .ARM.Collect$$libinit$$00000000 c_w.l(libinit.o) + 0x08000162 0x08000162 0x00000000 Code RO 138 .ARM.Collect$$libinit$$00000002 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 140 .ARM.Collect$$libinit$$00000004 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 142 .ARM.Collect$$libinit$$00000006 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 145 .ARM.Collect$$libinit$$0000000C c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 147 .ARM.Collect$$libinit$$0000000E c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 149 .ARM.Collect$$libinit$$00000010 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 152 .ARM.Collect$$libinit$$00000013 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 154 .ARM.Collect$$libinit$$00000015 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 156 .ARM.Collect$$libinit$$00000017 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 158 .ARM.Collect$$libinit$$00000019 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 160 .ARM.Collect$$libinit$$0000001B c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 162 .ARM.Collect$$libinit$$0000001D c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 164 .ARM.Collect$$libinit$$0000001F c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 166 .ARM.Collect$$libinit$$00000021 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 168 .ARM.Collect$$libinit$$00000023 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 170 .ARM.Collect$$libinit$$00000025 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 172 .ARM.Collect$$libinit$$00000027 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 176 .ARM.Collect$$libinit$$0000002E c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 178 .ARM.Collect$$libinit$$00000030 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 180 .ARM.Collect$$libinit$$00000032 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000000 Code RO 182 .ARM.Collect$$libinit$$00000034 c_w.l(libinit2.o) + 0x08000162 0x08000162 0x00000002 Code RO 183 .ARM.Collect$$libinit$$00000035 c_w.l(libinit2.o) + 0x08000164 0x08000164 0x00000002 Code RO 205 .ARM.Collect$$libshutdown$$00000000 c_w.l(libshutdown.o) + 0x08000166 0x08000166 0x00000000 Code RO 220 .ARM.Collect$$libshutdown$$00000002 c_w.l(libshutdown2.o) + 0x08000166 0x08000166 0x00000000 Code RO 222 .ARM.Collect$$libshutdown$$00000004 c_w.l(libshutdown2.o) + 0x08000166 0x08000166 0x00000000 Code RO 225 .ARM.Collect$$libshutdown$$00000007 c_w.l(libshutdown2.o) + 0x08000166 0x08000166 0x00000000 Code RO 228 .ARM.Collect$$libshutdown$$0000000A c_w.l(libshutdown2.o) + 0x08000166 0x08000166 0x00000000 Code RO 230 .ARM.Collect$$libshutdown$$0000000C c_w.l(libshutdown2.o) + 0x08000166 0x08000166 0x00000000 Code RO 233 .ARM.Collect$$libshutdown$$0000000F c_w.l(libshutdown2.o) + 0x08000166 0x08000166 0x00000002 Code RO 234 .ARM.Collect$$libshutdown$$00000010 c_w.l(libshutdown2.o) + 0x08000168 0x08000168 0x00000000 Code RO 106 .ARM.Collect$$rtentry$$00000000 c_w.l(__rtentry.o) + 0x08000168 0x08000168 0x00000000 Code RO 108 .ARM.Collect$$rtentry$$00000002 c_w.l(__rtentry2.o) + 0x08000168 0x08000168 0x00000006 Code RO 120 .ARM.Collect$$rtentry$$00000004 c_w.l(__rtentry4.o) + 0x0800016e 0x0800016e 0x00000000 Code RO 110 .ARM.Collect$$rtentry$$00000009 c_w.l(__rtentry2.o) + 0x0800016e 0x0800016e 0x00000004 Code RO 111 .ARM.Collect$$rtentry$$0000000A c_w.l(__rtentry2.o) + 0x08000172 0x08000172 0x00000000 Code RO 113 .ARM.Collect$$rtentry$$0000000C c_w.l(__rtentry2.o) + 0x08000172 0x08000172 0x00000008 Code RO 114 .ARM.Collect$$rtentry$$0000000D c_w.l(__rtentry2.o) + 0x0800017a 0x0800017a 0x00000002 Code RO 135 .ARM.Collect$$rtexit$$00000000 c_w.l(rtexit.o) + 0x0800017c 0x0800017c 0x00000000 Code RO 185 .ARM.Collect$$rtexit$$00000002 c_w.l(rtexit2.o) + 0x0800017c 0x0800017c 0x00000004 Code RO 186 .ARM.Collect$$rtexit$$00000003 c_w.l(rtexit2.o) + 0x08000180 0x08000180 0x00000006 Code RO 187 .ARM.Collect$$rtexit$$00000004 c_w.l(rtexit2.o) 0x08000186 0x08000186 0x00000002 PAD - 0x08000188 0x08000188 0x00000040 Code RO 74 * .text startup_stm32f10x_md.o - 0x080001c8 0x080001c8 0x00000006 Code RO 96 .text c_w.l(heapauxi.o) - 0x080001ce 0x080001ce 0x0000004a Code RO 116 .text c_w.l(sys_stackheap_outer.o) - 0x08000218 0x08000218 0x00000012 Code RO 118 .text c_w.l(exit.o) + 0x08000188 0x08000188 0x00000040 Code RO 80 * .text startup_stm32f10x_md.o + 0x080001c8 0x080001c8 0x00000006 Code RO 102 .text c_w.l(heapauxi.o) + 0x080001ce 0x080001ce 0x0000004a Code RO 122 .text c_w.l(sys_stackheap_outer.o) + 0x08000218 0x08000218 0x00000012 Code RO 124 .text c_w.l(exit.o) 0x0800022a 0x0800022a 0x00000002 PAD - 0x0800022c 0x0800022c 0x00000008 Code RO 126 .text c_w.l(libspace.o) - 0x08000234 0x08000234 0x0000000c Code RO 189 .text c_w.l(sys_exit.o) - 0x08000240 0x08000240 0x00000002 Code RO 204 .text c_w.l(use_no_semi.o) - 0x08000242 0x08000242 0x00000000 Code RO 206 .text c_w.l(indicate_semi.o) + 0x0800022c 0x0800022c 0x00000008 Code RO 132 .text c_w.l(libspace.o) + 0x08000234 0x08000234 0x0000000c Code RO 195 .text c_w.l(sys_exit.o) + 0x08000240 0x08000240 0x00000002 Code RO 210 .text c_w.l(use_no_semi.o) + 0x08000242 0x08000242 0x00000000 Code RO 212 .text c_w.l(indicate_semi.o) 0x08000242 0x08000242 0x00000002 PAD - 0x08000244 0x08000244 0x00000002 Code RO 37 .text.Bug driver_timer.o + 0x08000244 0x08000244 0x00000002 Code RO 41 .text.Bug driver_timer.o 0x08000246 0x08000246 0x00000002 PAD 0x08000248 0x08000248 0x0000009c Code RO 11 .text.MyGPIO_Init driver_gpio.o - 0x080002e4 0x080002e4 0x0000000e Code RO 15 .text.MyGPIO_Set driver_gpio.o - 0x080002f2 0x080002f2 0x00000002 PAD - 0x080002f4 0x080002f4 0x0000008c Code RO 29 .text.MyTimer_Base_Init driver_timer.o - 0x08000380 0x08000380 0x000000a8 Code RO 35 .text.MyTimer_ConfigurePWM driver_timer.o - 0x08000428 0x08000428 0x0000000c Code RO 31 .text.MyTimer_Start driver_timer.o - 0x08000434 0x08000434 0x0000003a Code RO 58 .text.MyUART_Init driver_uart.o - 0x0800046e 0x0800046e 0x00000002 PAD - 0x08000470 0x08000470 0x00000018 Code RO 62 .text.MyUART_ReceiveByte driver_uart.o - 0x08000488 0x08000488 0x00000014 Code RO 60 .text.MyUART_SendByte driver_uart.o - 0x0800049c 0x0800049c 0x00000110 Code RO 81 .text.SystemInit system_stm32f10x.o - 0x080005ac 0x080005ac 0x0000001a Code RO 41 .text.TIM2_IRQHandler driver_timer.o - 0x080005c6 0x080005c6 0x00000002 PAD - 0x080005c8 0x080005c8 0x0000001c Code RO 43 .text.TIM3_IRQHandler driver_timer.o - 0x080005e4 0x080005e4 0x0000001c Code RO 45 .text.TIM4_IRQHandler driver_timer.o - 0x08000600 0x08000600 0x000000a8 Code RO 2 .text.main main.o - 0x080006a8 0x080006a8 0x00000020 Data RO 262 Region$$Table anon$$obj.o + 0x080002e4 0x080002e4 0x0000008c Code RO 29 .text.MyTimer_Base_Init driver_timer.o + 0x08000370 0x08000370 0x00000046 Code RO 39 .text.MyTimer_ConfigureEncoder driver_timer.o + 0x080003b6 0x080003b6 0x00000002 PAD + 0x080003b8 0x080003b8 0x0000000c Code RO 31 .text.MyTimer_Start driver_timer.o + 0x080003c4 0x080003c4 0x00000110 Code RO 87 .text.SystemInit system_stm32f10x.o + 0x080004d4 0x080004d4 0x0000001a Code RO 45 .text.TIM2_IRQHandler driver_timer.o + 0x080004ee 0x080004ee 0x00000002 PAD + 0x080004f0 0x080004f0 0x0000001c Code RO 47 .text.TIM3_IRQHandler driver_timer.o + 0x0800050c 0x0800050c 0x0000001c Code RO 49 .text.TIM4_IRQHandler driver_timer.o + 0x08000528 0x08000528 0x0000000e Code RO 68 .text.USART3_IRQHandler driver_uart.o + 0x08000536 0x08000536 0x00000002 PAD + 0x08000538 0x08000538 0x0000004e Code RO 2 .text.main main.o + 0x08000586 0x08000586 0x00000002 PAD + 0x08000588 0x08000588 0x00000020 Data RO 268 Region$$Table anon$$obj.o - Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x080006c8, Size: 0x0000000c, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x080005a8, Size: 0x0000000c, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 0x080006c8 0x00000004 Data RW 47 .data.TIM2_fx driver_timer.o - 0x20000004 0x080006cc 0x00000004 Data RW 48 .data.TIM3_fx driver_timer.o - 0x20000008 0x080006d0 0x00000004 Data RW 49 .data.TIM4_fx driver_timer.o + 0x20000000 0x080005a8 0x00000004 Data RW 51 .data.TIM2_fx driver_timer.o + 0x20000004 0x080005ac 0x00000004 Data RW 52 .data.TIM3_fx driver_timer.o + 0x20000008 0x080005b0 0x00000004 Data RW 53 .data.TIM4_fx driver_timer.o - Execution Region ER_ZI (Exec base: 0x20000010, Load base: 0x080006d4, Size: 0x00000660, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_ZI (Exec base: 0x20000010, Load base: 0x080005b4, Size: 0x00000660, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000010 - 0x00000060 Zero RW 127 .bss c_w.l(libspace.o) - 0x20000070 - 0x00000200 Zero RW 72 HEAP startup_stm32f10x_md.o - 0x20000270 - 0x00000400 Zero RW 71 STACK startup_stm32f10x_md.o + 0x20000010 - 0x00000060 Zero RW 133 .bss c_w.l(libspace.o) + 0x20000070 - 0x00000200 Zero RW 78 HEAP startup_stm32f10x_md.o + 0x20000270 - 0x00000400 Zero RW 77 STACK startup_stm32f10x_md.o ============================================================================== @@ -638,17 +638,17 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name - 170 16 0 0 0 2108 driver_gpio.o - 404 4 0 12 0 6789 driver_timer.o - 102 0 0 0 0 1970 driver_uart.o - 168 0 0 0 0 2559 main.o + 156 16 0 0 0 2108 driver_gpio.o + 306 0 0 12 0 7375 driver_timer.o + 14 0 0 0 0 2250 driver_uart.o + 78 0 0 0 0 2136 main.o 64 26 236 0 1536 864 startup_stm32f10x_md.o 272 0 0 0 0 2813 system_stm32f10x.o ---------------------------------------------------------------------- - 1188 46 268 12 1536 17103 Object Totals + 900 42 268 12 1536 17546 Object Totals 0 0 32 0 0 0 (incl. Generated) - 8 0 0 0 0 0 (incl. Padding) + 10 0 0 0 0 0 (incl. Padding) ---------------------------------------------------------------------- @@ -695,15 +695,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 1468 62 268 12 1632 17499 Grand Totals - 1468 62 268 12 1632 17499 ELF Image Totals - 1468 62 268 12 0 0 ROM Totals + 1180 58 268 12 1632 17942 Grand Totals + 1180 58 268 12 1632 17942 ELF Image Totals + 1180 58 268 12 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 1736 ( 1.70kB) + Total RO Size (Code + RO Data) 1448 ( 1.41kB) Total RW Size (RW Data + ZI Data) 1644 ( 1.61kB) - Total ROM Size (Code + RO Data + RW Data) 1748 ( 1.71kB) + Total ROM Size (Code + RO Data + RW Data) 1460 ( 1.43kB) ============================================================================== diff --git a/projet-voilier/Objects/driver_gpio.o b/projet-voilier/Objects/driver_gpio.o index 5f720ba63fc6c3268df5dca4180a80fd5821e768..ed751f0baca12af99f883246995cdf66c8ab5b36 100644 GIT binary patch delta 71 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 J>cuy~zX2J3Y4ZR8 diff --git a/projet-voilier/Objects/main.d b/projet-voilier/Objects/main.d index 05cd3e8..d9e2675 100644 --- a/projet-voilier/Objects/main.d +++ b/projet-voilier/Objects/main.d @@ -1,4 +1,3 @@ -<<<<<<< HEAD ./objects/main.o: src\main.c \ C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h \ RTE\_sim\RTE_Components.h \ @@ -10,17 +9,3 @@ C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h \ ..\driver\Driver_GPIO.h ..\driver\Driver_Timer.h \ ..\driver\Driver_UART.h -======= -.\objects\main.o: src\main.c -.\objects\main.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\objects\main.o: .\RTE\_reel\RTE_Components.h -.\objects\main.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h -.\objects\main.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h -.\objects\main.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h -.\objects\main.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h -.\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: ..\driver\Driver_GPIO.h -.\objects\main.o: ..\driver\Driver_Timer.h -.\objects\main.o: ..\driver\Driver_ADC.h ->>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110 diff --git a/projet-voilier/Objects/main.o b/projet-voilier/Objects/main.o index 3dc02b9089f3271a08ef5f8e076a9213527f0ccd..4d571fef7498a84838ce8923829b1ccdbd06eed1 100644 GIT binary patch delta 1678 zcmZ8hU1%It6#nkao!Qx)X|n648cV>fCM6Y(NvRrQkkOjhP05cX`X+JPth)orv}|?} z5!wFu5Kw8t^ueO|N5vv7)&@ldDTu!4li-U868fO{AWBdhAKZG*+&jtI3v<8k{N8iV zxy&1T*Y8{@H2n_nvi8T&k1hxp#2xyUFZ&y|@BfX*E^YSUs|_LT3-;L?*IPIIjg)_B zvkUTqjOFuxof;G?MnPPBb<;y(oPFANTy6alA3)imzMSam$Xlz|Pxj=6>yEe&xq!C= zW=Ap4!Z3;W#Ed==1u?but@zStra8kD$3NXqC7O1h31p1b?je>Y?om><%F>LMrH7-?EHDmC8%e33sQ+MCaT)#O~-bce?rgl!;s7G-{Y7&WLQhCtI5| zt#n$moOmc4W;K;aHS)?K1>8y`L*wSLFpe;00H4t%k8vj6TFbj8nmk99}MXgxV*iFS5HqgUJ#r%$FS2h@Z ze5N=(R}6zX1|B&)IZ&$CYr&C5y}X2h`SOuQWp1fn!{qbvu;&gO3!e=tjapefg6NCv zM09ssp%?#|0?Dy$7z>1Mf=CVin7q4;P@ZW z&I9L_SHQcY9|wh<-A?Ckd9)Q!ka#VAPH}YayW2^&1GVmRYGl`;_c)mQp?WeR@D4Jv z+IGCIM@9LR9tNu%ilCSm@h8X9oOv)i`{ZS^jm6F?ql(k{&y#LE#h&@*4+6g?$7&~f z`^nOGV$CA!j*~BDnB5e!J-mN!GD@CKGOgGKhkKUJ;-7eY#3i;~PN%PYlD+pgV)OKg s_#$n$ap1F44%CM%Un0*Z#mk|5{~NzUK59{mvI$>?@VI-ovtk|cKNCF5=Kufz delta 2507 zcmY*aZ)_Ar6o0cjv$yxB+iMR>K>`a@a<-vuuq041xt8{@2Thx637A;UmTuvYRxDSO zCdvUCLM(>D0YUWz7ACFbw*Bnr)Lbw|49T?I+7;u&brbul&rjMhepU?Iaf-9!Y(aFPtI-&n4A|P) z(Z;C|h&#J_?6`JRx+j9MQS^Cs%k7d@HhktzEVeBUDiwTb$Lkh6NOgDo;Qqr)gRF=Z z8vvmi(5>3w6TzkkKtY5BgJb|$1?X>zkg*(1_=4wFGMkNzb+8LsR=bId)+ceO!AHBv z`CRQ17f}ZAEjcc85ED4-doq6JnuwwznJb(N+%uQ?g&X2443o@NZi+&W`IQI64<2)k zhr~RO`Hfp5d(We;^RTG!s2jXkRCq7?ozD;}JZ7Aih$@fygO`dXkNK0&0Y7Gg5qwxj zJqGEI50N?3aY^$mS@TsWd`MRLapZzWF>e^3&?WLM zqttj@R-+-fZy8$KQ04vtlXI&D)x}721FUw`HzLh_-0JdlQ-Il_!A3BdZ#$AlkPyKF zQyA6(RNu$B!UXF8uI>s^es1mZ^nd}rcX7@|Bn*6?VOUi34KjUTeTH}v=Nl%^o%Y4Y zmW%6baYGVTB_D^??X5{z*H)KoPqhzjcN&}?=-y%@>ei+f zKn2>b+1Di7WteyDkH*zaYyO2Id zy%mL*v3w5y8b2)-q>Dp9mXJYrM|Eurs7 zh#7_+PKfXpBn-VbAwq^;k`RH<(cXN@(48I;Hgvm3gw_gejR-A~aUD3r&>u|*t=V&J zNQl`p4ZR{EimHV6iqQ9p;9jA1Y8o(>tFt1kB6r+BpRLb*>Tk(v#qb?gHKJqnQhI5m zV=!I9gUW81&V{{sMAri>S7Fnm&?z0A0RO503E`}3Npf83oO(`*kH(@B90GXmZNdOR zwX&Zg#C}f_h5$AY769}qey74igciUF!a{&|2vv3E+St*+C6@ggzl>DvT>kDoiQds&GK!N`T$U@w&n{6~3qNBZZ~7dm3KGa|y8kV7cOgbgk@=roMCr zyMn8hhcB~i-DyyU{UyExMd{IxIm-()p511 z;4)mnwaJ;(9rLn$or?v*BwBl!E_205LGB_wnp0(dG3l4UD|LJ?}SB8?t zI#kuC<-SOd8ZOX2p-!v7N@Ae43{J`Q`Q4I;qZFoBj0RiL%c>S1;my|OOE%dRTT zMu-zW*c>#djpO-faxgYMVhDXd67fJ7w7Q0>bI47Zh5Swv{VG0g8BsDZ28&TL4^eGL z{^fJ<>!1&pAI?`0rp-pdJa}br1UKVuyntLyCB#;Qr`40yaS!MPFvsr diff --git a/projet-voilier/Objects/projet-voilier.axf b/projet-voilier/Objects/projet-voilier.axf index 992d86401bec4b068cd466f90faaf7ad9712248b..f61c2e7491550fcae98048900f3a39a0adddf6ec 100644 GIT binary patch delta 11204 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 diff --git a/projet-voilier/Objects/projet-voilier.build_log.htm b/projet-voilier/Objects/projet-voilier.build_log.htm index dbb575e..8ffe164 100644 --- a/projet-voilier/Objects/projet-voilier.build_log.htm +++ b/projet-voilier/Objects/projet-voilier.build_log.htm @@ -22,24 +22,20 @@ Dialog DLL: TARMSTM.DLL V1.67.1.0

Project:

C:\Users\robin\OneDrive\Documents\Dev\Projet-Voilier-3\projet-voilier\projet-voilier.uvprojx -Project File Date: 03/27/2023 +Project File Date: 04/01/2023

Output:

*** Using Compiler 'V6.19', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin' Rebuild target 'sim' assembling startup_stm32f10x_md.s... -compiling Driver_UART.c... -compiling Driver_GPIO.c... -src/main.c(51): warning: GCC does not allow variable declarations in for loop initializers before C99 [-Wgcc-compat] - for (int i = 0; i < 100000000; i++); - ^ -1 warning generated. compiling main.c... +compiling Driver_UART.c... compiling system_stm32f10x.c... +compiling Driver_GPIO.c... compiling Driver_Timer.c... linking... -Program Size: Code=1468 RO-data=268 RW-data=12 ZI-data=1632 -".\Objects\projet-voilier.axf" - 0 Error(s), 1 Warning(s). +Program Size: Code=1180 RO-data=268 RW-data=12 ZI-data=1632 +".\Objects\projet-voilier.axf" - 0 Error(s), 0 Warning(s).

Software Packages used:

@@ -66,11 +62,11 @@ Package Vendor: Keil * Component: ARM::CMSIS:CORE:5.6.0 * Component: Keil::Device:Startup:1.0.0 - Source file: Device/Source/ARM/startup_stm32f10x_md.s Include file: RTE_Driver/Config/RTE_Device.h Source file: Device/Source/system_stm32f10x.c Source file: Device/Source/ARM/STM32F1xx_OPT.s -Build Time Elapsed: 00:00:01 + Source file: Device/Source/ARM/startup_stm32f10x_md.s +Build Time Elapsed: 00:00:00 diff --git a/projet-voilier/Objects/projet-voilier.htm b/projet-voilier/Objects/projet-voilier.htm index 2c822d5..4ab9e62 100644 --- a/projet-voilier/Objects/projet-voilier.htm +++ b/projet-voilier/Objects/projet-voilier.htm @@ -3,9 +3,9 @@ Static Call Graph - [.\Objects\projet-voilier.axf]

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

-

#<CALLGRAPH># ARM Linker, 6190004: Last Updated: Fri Mar 31 11:59:13 2023 +

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

-

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

+

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

Call chain for Maximum Stack Depth:

__rt_entry_main ⇒ main ⇒ MyGPIO_Init

@@ -85,7 +85,7 @@ Function Pointers

  • TIM4_IRQHandler from driver_timer.o(.text.TIM4_IRQHandler) referenced from startup_stm32f10x_md.o(RESET)
  • USART1_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • USART2_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) -
  • USART3_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) +
  • USART3_IRQHandler from driver_uart.o(.text.USART3_IRQHandler) referenced from startup_stm32f10x_md.o(RESET)
  • USBWakeUp_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • USB_HP_CAN1_TX_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • USB_LP_CAN1_RX0_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) @@ -111,9 +111,9 @@ Global Symbols

    [Calls]
    • >>   __rt_entry
    -

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

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

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

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

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

    [Calls]

    • >>   __scatterload_copy @@ -121,80 +121,80 @@ Global Symbols
      [Called By]
      • >>   __scatterload_copy
      -

      __scatterload_zeroinit (Thumb, 28 bytes, Stack size unknown bytes, __scatter_zi.o(!!handler_zi), UNUSED) +

      __scatterload_zeroinit (Thumb, 28 bytes, Stack size unknown bytes, __scatter_zi.o(!!handler_zi), UNUSED)

      __rt_lib_init (Thumb, 0 bytes, Stack size unknown bytes, libinit.o(.ARM.Collect$$libinit$$00000000))

      [Called By]

      • >>   __rt_entry_li
      -

      __rt_lib_init_alloca_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000030)) +

      __rt_lib_init_alloca_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000030)) -

      __rt_lib_init_argv_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000002E)) +

      __rt_lib_init_argv_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000002E)) -

      __rt_lib_init_atexit_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000001D)) +

      __rt_lib_init_atexit_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000001D)) -

      __rt_lib_init_clock_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000023)) +

      __rt_lib_init_clock_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000023)) -

      __rt_lib_init_cpp_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000034)) +

      __rt_lib_init_cpp_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000034)) -

      __rt_lib_init_exceptions_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000032)) +

      __rt_lib_init_exceptions_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000032)) -

      __rt_lib_init_fp_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000002)) +

      __rt_lib_init_fp_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000002)) -

      __rt_lib_init_fp_trap_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000021)) +

      __rt_lib_init_fp_trap_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000021)) -

      __rt_lib_init_getenv_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000025)) +

      __rt_lib_init_getenv_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000025)) -

      __rt_lib_init_heap_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000000C)) +

      __rt_lib_init_heap_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000000C)) -

      __rt_lib_init_lc_collate_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000013)) +

      __rt_lib_init_lc_collate_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000013)) -

      __rt_lib_init_lc_ctype_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000015)) +

      __rt_lib_init_lc_ctype_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000015)) -

      __rt_lib_init_lc_monetary_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000017)) +

      __rt_lib_init_lc_monetary_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000017)) -

      __rt_lib_init_lc_numeric_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000019)) +

      __rt_lib_init_lc_numeric_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000019)) -

      __rt_lib_init_lc_time_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000001B)) +

      __rt_lib_init_lc_time_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000001B)) -

      __rt_lib_init_preinit_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000006)) +

      __rt_lib_init_preinit_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000006)) -

      __rt_lib_init_rand_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000010)) +

      __rt_lib_init_rand_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000010)) -

      __rt_lib_init_relocate_pie_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000004)) +

      __rt_lib_init_relocate_pie_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000004)) -

      __rt_lib_init_return (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000035)) +

      __rt_lib_init_return (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000035)) -

      __rt_lib_init_signal_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000001F)) +

      __rt_lib_init_signal_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000001F)) -

      __rt_lib_init_stdio_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000027)) +

      __rt_lib_init_stdio_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000027)) -

      __rt_lib_init_user_alloc_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000000E)) +

      __rt_lib_init_user_alloc_1 (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000000E))

      __rt_lib_shutdown (Thumb, 0 bytes, Stack size unknown bytes, libshutdown.o(.ARM.Collect$$libshutdown$$00000000))

      [Called By]

      • >>   __rt_exit_ls
      -

      __rt_lib_shutdown_cpp_1 (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000002)) +

      __rt_lib_shutdown_cpp_1 (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000002)) -

      __rt_lib_shutdown_fp_trap_1 (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000007)) +

      __rt_lib_shutdown_fp_trap_1 (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000007)) -

      __rt_lib_shutdown_heap_1 (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$0000000F)) +

      __rt_lib_shutdown_heap_1 (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$0000000F)) -

      __rt_lib_shutdown_return (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000010)) +

      __rt_lib_shutdown_return (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000010)) -

      __rt_lib_shutdown_signal_1 (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$0000000A)) +

      __rt_lib_shutdown_signal_1 (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$0000000A)) -

      __rt_lib_shutdown_stdio_1 (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000004)) +

      __rt_lib_shutdown_stdio_1 (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000004)) -

      __rt_lib_shutdown_user_alloc_1 (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$0000000C)) +

      __rt_lib_shutdown_user_alloc_1 (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$0000000C))

      __rt_entry (Thumb, 0 bytes, Stack size unknown bytes, __rtentry.o(.ARM.Collect$$rtentry$$00000000))

      [Called By]

      • >>   __scatterload_rt2
      • >>   __main
      -

      __rt_entry_presh_1 (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$00000002)) +

      __rt_entry_presh_1 (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$00000002))

      __rt_entry_sh (Thumb, 0 bytes, Stack size unknown bytes, __rtentry4.o(.ARM.Collect$$rtentry$$00000004))

      [Stack]

      • Max Depth = 8 + Unknown Stack Size @@ -207,17 +207,17 @@ Global Symbols

        [Calls]
        • >>   __rt_lib_init
        -

        __rt_entry_postsh_1 (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$00000009)) +

        __rt_entry_postsh_1 (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$00000009))

        __rt_entry_main (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$0000000D)) -

        [Stack]

        • Max Depth = 48 + Unknown Stack Size +

          [Stack]
          • Max Depth = 40 + Unknown Stack Size
          • Call Chain = __rt_entry_main ⇒ main ⇒ MyGPIO_Init

          [Calls]
          • >>   exit
          • >>   main
          -

          __rt_entry_postli_1 (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$0000000C)) +

          __rt_entry_postli_1 (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$0000000C))

          __rt_exit (Thumb, 0 bytes, Stack size unknown bytes, rtexit.o(.ARM.Collect$$rtexit$$00000000))

          [Called By]

          • >>   exit @@ -227,7 +227,7 @@ Global Symbols

            [Calls]
            • >>   __rt_lib_shutdown
            -

            __rt_exit_prels_1 (Thumb, 0 bytes, Stack size unknown bytes, rtexit2.o(.ARM.Collect$$rtexit$$00000002)) +

            __rt_exit_prels_1 (Thumb, 0 bytes, Stack size unknown bytes, rtexit2.o(.ARM.Collect$$rtexit$$00000002))

            __rt_exit_exit (Thumb, 0 bytes, Stack size unknown bytes, rtexit2.o(.ARM.Collect$$rtexit$$00000004))

            [Calls]

            • >>   _sys_exit @@ -408,9 +408,6 @@ Global Symbols

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

              • startup_stm32f10x_md.o(RESET)
              -

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

              • startup_stm32f10x_md.o(RESET) -

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

              • startup_stm32f10x_md.o(RESET)
              @@ -427,11 +424,11 @@ Global Symbols

              [Called By]
              • >>   __user_setup_stackheap
              -

              __use_two_region_memory (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED) +

              __use_two_region_memory (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED) -

              __rt_heap_escrow$2region (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED) +

              __rt_heap_escrow$2region (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED) -

              __rt_heap_expand$2region (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED) +

              __rt_heap_expand$2region (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED)

              __user_setup_stackheap (Thumb, 74 bytes, Stack size 8 bytes, sys_stackheap_outer.o(.text))

              [Stack]

              • Max Depth = 8 + Unknown Stack Size @@ -452,23 +449,23 @@ Global Symbols
                [Called By]
                • >>   __rt_entry_main
                -

                __user_libspace (Thumb, 8 bytes, Stack size 0 bytes, libspace.o(.text), UNUSED) +

                __user_libspace (Thumb, 8 bytes, Stack size 0 bytes, libspace.o(.text), UNUSED)

                __user_perproc_libspace (Thumb, 0 bytes, Stack size 0 bytes, libspace.o(.text))

                [Called By]

                • >>   __user_setup_stackheap
                -

                __user_perthread_libspace (Thumb, 0 bytes, Stack size 0 bytes, libspace.o(.text), UNUSED) +

                __user_perthread_libspace (Thumb, 0 bytes, Stack size 0 bytes, libspace.o(.text), UNUSED)

                _sys_exit (Thumb, 8 bytes, Stack size 0 bytes, sys_exit.o(.text))

                [Called By]

                • >>   __rt_exit_exit
                -

                __I$use$semihosting (Thumb, 0 bytes, Stack size 0 bytes, use_no_semi.o(.text), UNUSED) +

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

                __use_no_semihosting_swi (Thumb, 2 bytes, Stack size 0 bytes, use_no_semi.o(.text), UNUSED) +

                __use_no_semihosting_swi (Thumb, 2 bytes, Stack size 0 bytes, use_no_semi.o(.text), UNUSED) -

                __semihosting_library_function (Thumb, 0 bytes, Stack size unknown bytes, indicate_semi.o(.text), UNUSED) +

                __semihosting_library_function (Thumb, 0 bytes, Stack size unknown bytes, indicate_semi.o(.text), UNUSED)

                Bug (Thumb, 2 bytes, Stack size 0 bytes, driver_timer.o(.text.Bug))

                [Calls]

                • >>   Bug @@ -485,31 +482,15 @@ Global Symbols
                  [Called By]
                  • >>   main
                  -

                  MyGPIO_Set (Thumb, 14 bytes, Stack size 0 bytes, driver_gpio.o(.text.MyGPIO_Set)) +

                  MyTimer_Base_Init (Thumb, 140 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Base_Init))

                  [Called By]

                  • >>   main
                  -

                  MyTimer_Base_Init (Thumb, 140 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Base_Init)) +

                  MyTimer_ConfigureEncoder (Thumb, 70 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_ConfigureEncoder))

                  [Called By]

                  • >>   main
                  -

                  MyTimer_ConfigurePWM (Thumb, 168 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_ConfigurePWM)) -

                  [Called By]

                  • >>   main -
                  - -

                  MyTimer_Start (Thumb, 12 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Start)) -

                  [Called By]

                  • >>   main -
                  - -

                  MyUART_Init (Thumb, 58 bytes, Stack size 0 bytes, driver_uart.o(.text.MyUART_Init)) -

                  [Called By]

                  • >>   main -
                  - -

                  MyUART_ReceiveByte (Thumb, 24 bytes, Stack size 0 bytes, driver_uart.o(.text.MyUART_ReceiveByte)) -

                  [Called By]

                  • >>   main -
                  - -

                  MyUART_SendByte (Thumb, 20 bytes, Stack size 0 bytes, driver_uart.o(.text.MyUART_SendByte)) +

                  MyTimer_Start (Thumb, 12 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Start))

                  [Called By]

                  • >>   main
                  @@ -527,16 +508,15 @@ Global Symbols

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

                  • startup_stm32f10x_md.o(RESET)
                  -

                  main (Thumb, 168 bytes, Stack size 40 bytes, main.o(.text.main)) -

                  [Stack]

                  • Max Depth = 48
                  • Call Chain = main ⇒ MyGPIO_Init +

                    USART3_IRQHandler (Thumb, 14 bytes, Stack size 0 bytes, driver_uart.o(.text.USART3_IRQHandler)) +
                    [Address Reference Count : 1]

                    • startup_stm32f10x_md.o(RESET)
                    -
                    [Calls]
                    • >>   MyUART_ReceiveByte -
                    • >>   MyUART_SendByte -
                    • >>   MyUART_Init -
                    • >>   MyTimer_Start -
                    • >>   MyTimer_ConfigurePWM -
                    • >>   MyTimer_Base_Init -
                    • >>   MyGPIO_Set +

                      main (Thumb, 78 bytes, Stack size 32 bytes, main.o(.text.main)) +

                      [Stack]

                      • Max Depth = 40
                      • Call Chain = main ⇒ MyGPIO_Init +
                      +
                      [Calls]
                      • >>   MyTimer_Start +
                      • >>   MyTimer_ConfigureEncoder +
                      • >>   MyTimer_Base_Init
                      • >>   MyGPIO_Init

                      [Called By]
                      • >>   __rt_entry_main diff --git a/projet-voilier/Objects/projet-voilier_sim.dep b/projet-voilier/Objects/projet-voilier_sim.dep index 2cd7c0c..1e285f3 100644 --- a/projet-voilier/Objects/projet-voilier_sim.dep +++ b/projet-voilier/Objects/projet-voilier_sim.dep @@ -1,6 +1,6 @@ Dependencies for Project 'projet-voilier', Target 'sim': (DO NOT MODIFY !) CompilerVersion: 6190000::V6.19::ARMCLANG -F (.\src\main.c)(0x6426AEF0)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ../driver -I ./src -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) +F (.\src\main.c)(0x642FFEBA)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ../driver -I ./src -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_sim\RTE_Components.h)(0x6421A260) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -9,11 +9,11 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) -I (..\driver\Driver_GPIO.h)(0x641B050C) -I (..\driver\Driver_Timer.h)(0x6421D747) -I (..\driver\Driver_UART.h)(0x6425DA6A) -F (..\driver\Driver_GPIO.c)(0x641B050C)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ../driver -I ./src -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_gpio.o -MD) -I (..\driver\Driver_GPIO.h)(0x641B050C) +I (..\driver\Driver_GPIO.h)(0x642FF88E) +I (..\driver\Driver_Timer.h)(0x642C7C81) +I (..\driver\Driver_UART.h)(0x642C85A4) +F (..\driver\Driver_GPIO.c)(0x642FFBC6)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ../driver -I ./src -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_gpio.o -MD) +I (..\driver\Driver_GPIO.h)(0x642FF88E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_sim\RTE_Components.h)(0x6421A260) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -23,9 +23,9 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) I (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78) -F (..\driver\Driver_GPIO.h)(0x641B050C)() -F (..\driver\Driver_Timer.c)(0x6425CEE2)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ../driver -I ./src -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_timer.o -MD) -I (..\driver\Driver_Timer.h)(0x6421D747) +F (..\driver\Driver_GPIO.h)(0x642FF88E)() +F (..\driver\Driver_Timer.c)(0x64300A43)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ../driver -I ./src -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_timer.o -MD) +I (..\driver\Driver_Timer.h)(0x642C7C81) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_sim\RTE_Components.h)(0x6421A260) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -35,9 +35,9 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) I (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78) -F (..\driver\Driver_Timer.h)(0x6421D747)() -F (..\driver\Driver_UART.c)(0x6426ACD7)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ../driver -I ./src -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_uart.o -MD) -I (..\driver\Driver_UART.h)(0x6425DA6A) +F (..\driver\Driver_Timer.h)(0x642C7C81)() +F (..\driver\Driver_UART.c)(0x642C87D5)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ../driver -I ./src -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_uart.o -MD) +I (..\driver\Driver_UART.h)(0x642C85A4) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_sim\RTE_Components.h)(0x6421A260) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -46,7 +46,7 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) -F (..\driver\Driver_UART.h)(0x6425DA6A)() +F (..\driver\Driver_UART.h)(0x642C85A4)() F (RTE/Device/STM32F103RB/RTE_Device.h)(0x641B050C)() F (RTE/Device/STM32F103RB/startup_stm32f10x_md.s)(0x641B050C)(--target=arm-arm-none-eabi -mcpu=cortex-m3 -masm=auto -Wa,armasm,--diag_suppress=A1950W -c -gdwarf-4 -Wa,armasm,--pd,"__EVAL SETA 1" -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -Wa,armasm,--pd,"__UVISION_VERSION SETA 538" -Wa,armasm,--pd,"_RTE_ SETA 1" -Wa,armasm,--pd,"STM32F10X_MD SETA 1" -Wa,armasm,--pd,"_RTE_ SETA 1" -o ./objects/startup_stm32f10x_md.o) F (RTE/Device/STM32F103RB/system_stm32f10x.c)(0x641B050C)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ../driver -I ./src -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/system_stm32f10x.o -MD) diff --git a/projet-voilier/projet-voilier.uvguix.robin b/projet-voilier/projet-voilier.uvguix.robin index a4f89a9..7091364 100644 --- a/projet-voilier/projet-voilier.uvguix.robin +++ b/projet-voilier/projet-voilier.uvguix.robin @@ -15,17 +15,17 @@ 38003 Registers - 140 88 + 140 100 346 Code Coverage - 1010 656 + 1010 900 204 Performance Analyzer - 1170 175 175 146 + 1170 175 175 390 @@ -70,7 +70,7 @@ 466 Source Browser 500 - 300 + 166 @@ -110,8 +110,8 @@ 0 - 1231 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000009000000000000000100000050433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C7372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF4B433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F554152542E68000000000D4472697665725F554152542E6800000000FFDC7800FFFFFFFF4B433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F554152542E63000000000D4472697665725F554152542E6300000000BECEA100FFFFFFFF4C433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F54696D65722E63000000000E4472697665725F54696D65722E6300000000F0A0A100FFFFFFFF73433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000BCA8E100FFFFFFFF4C433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F54696D65722E68000000000E4472697665725F54696D65722E68000000009CC1B600FFFFFFFF6F433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C5254455C4465766963655C53544D33324631303352425C73797374656D5F73746D3332663130782E63000000001273797374656D5F73746D3332663130782E6300000000F7B88600FFFFFFFF5A433A5C55736572735C726F62696E5C417070446174615C4C6F63616C5C41726D5C5061636B735C4B65696C5C53544D3332463178785F4446505C322E342E305C4465766963655C496E636C7564655C73746D3332663130782E68000000000B73746D3332663130782E6800000000D9ADC200FFFFFFFF4B433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E6300000000A5C2D700FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F40000006600000080070000F3010000 + 1355 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000A000000030000000100000050433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C7372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF4B433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F554152542E68000000000D4472697665725F554152542E6800000000FFDC7800FFFFFFFF4B433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F554152542E63000000000D4472697665725F554152542E6300000000BECEA100FFFFFFFF4C433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F54696D65722E63000000000E4472697665725F54696D65722E6300000000F0A0A100FFFFFFFF73433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000BCA8E100FFFFFFFF4C433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F54696D65722E68000000000E4472697665725F54696D65722E68000000009CC1B600FFFFFFFF6F433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C5254455C4465766963655C53544D33324631303352425C73797374656D5F73746D3332663130782E63000000001273797374656D5F73746D3332663130782E6300000000F7B88600FFFFFFFF5A433A5C55736572735C726F62696E5C417070446174615C4C6F63616C5C41726D5C5061636B735C4B65696C5C53544D3332463178785F4446505C322E342E305C4465766963655C496E636C7564655C73746D3332663130782E68000000000B73746D3332663130782E6800000000D9ADC200FFFFFFFF4B433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E6300000000A5C2D700FFFFFFFF5A433A5C55736572735C726F62696E5C417070446174615C4C6F63616C5C41726D5C5061636B735C41524D5C434D5349535C352E392E305C434D5349535C436F72655C496E636C7564655C636D7369735F61726D636C616E672E680000000010636D7369735F61726D636C616E672E6800000000B3A6BE00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F40000006600000080070000C4020000 @@ -150,7 +150,7 @@ 0 16 - 0300000066000000ED000000C3010000 + 0300000066000000ED00000094020000 16 @@ -170,7 +170,7 @@ 0 16 - 0300000066000000ED000000C3010000 + 0300000066000000ED00000094020000 16 @@ -450,7 +450,7 @@ 0 16 - 0300000066000000ED000000C3010000 + 0300000066000000ED00000094020000 16 @@ -470,7 +470,7 @@ 0 16 - 0300000066000000ED000000C3010000 + 0300000066000000ED00000094020000 16 @@ -490,7 +490,7 @@ 0 16 - 00000000F401000080070000DE030000 + 03000000C80200007D070000C5030000 16 @@ -520,7 +520,7 @@ 199 199 - 0 + 1 0 0 0 @@ -530,7 +530,7 @@ 0 16 - 03000000F70100007D070000C5030000 + 03000000C80200007D070000C5030000 16 @@ -1150,7 +1150,7 @@ 0 16 - 0300000066000000ED000000C3010000 + 0300000066000000ED00000094020000 16 @@ -1170,7 +1170,7 @@ 0 16 - 03000000F70100007D070000C5030000 + 03000000C80200007D070000C5030000 16 @@ -1190,7 +1190,7 @@ 0 16 - 03000000F70100007D070000C5030000 + 03000000C80200007D070000C5030000 16 @@ -1250,7 +1250,7 @@ 0 16 - 03000000F70100007D070000C5030000 + 03000000C80200007D070000C5030000 16 @@ -1270,7 +1270,7 @@ 0 16 - 03000000F70100007D070000C5030000 + 03000000C80200007D070000C5030000 16 @@ -1799,14 +1799,14 @@ 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DD00000090050000E1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F4000000F40000004F00000090050000DD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000025020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A004000066000000900500003C020000A00400004F000000900500002502000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000DC010000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F0000000F3010000000000004F000000F0000000DC0100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000011020000900500001502000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000002C02000090050000CE020000000000001502000090050000B702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000015020000CC020000B702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000DC01000080070000E00100000100000001000010040000000100000008FDFFFF8C000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000000000000F701000080070000F503000000000000E001000080070000DE0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DD00000090050000E1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F4000000F40000004F00000090050000DD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000025020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A004000066000000900500003C020000A00400004F000000900500002502000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000AD020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F0000000C4020000000000004F000000F0000000AD0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000011020000900500001502000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000002C02000090050000CE020000000000001502000090050000B702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000015020000CC020000B702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000AD02000080070000B10200000100000001000010040000000100000078FEFFFFFC010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000000000000C802000080070000F503000000000000B102000080070000DE0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2537 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2600 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000003736D739600000000000000050003736D73001054494D5F43434D52315F494332465F3004534D52430C54494D5F534D52435F534D530000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 975 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000373696D960000000000000002000373696D047265656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000373696D960000000000000002000373696D047265656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -2031,7 +2031,7 @@ 0 16 - 030000006600000089060000C4000000 + 03000000660000007D070000C4000000 16 @@ -2311,7 +2311,7 @@ 0 16 - 030000006600000089060000C4000000 + 03000000660000007D070000C4000000 16 @@ -2391,7 +2391,7 @@ 0 16 - 030000006600000089060000C4000000 + 03000000660000007D070000C4000000 16 @@ -2411,7 +2411,7 @@ 0 16 - 030000006600000089060000C4000000 + 03000000660000007D070000C4000000 16 @@ -2431,7 +2431,7 @@ 0 16 - 030000006600000089060000C4000000 + 03000000660000007D070000C4000000 16 @@ -2451,7 +2451,7 @@ 0 16 - 030000006600000089060000C4000000 + 03000000660000007D070000C4000000 16 @@ -3031,7 +3031,7 @@ 0 16 - 030000006600000089060000C4000000 + 03000000660000007D070000C4000000 16 @@ -3540,14 +3540,14 @@ 3306 - 0000000009000000000000000020000001000000FFFFFFFFFFFFFFFF00000000DD00000080070000E1000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000F40000006600000080070000F4000000000000004F00000080070000DD0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF8C0600004F00000090060000FD020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C300000180004000000000000090060000660000008007000014030000900600004F00000080070000FD02000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0655534152543300000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000080000001000000FFFFFFFFFFFFFFFF00000000FD020000800700000103000001000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000C40300001803000080070000F5030000C40300000103000080070000DE03000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332010000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7301000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727301000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF000000000000000001000000000000000100000001000000FFFFFFFFC003000001030000C4030000DE03000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000DC01000080070000E00100000000000001000000040000000100000008FDFFFF8C000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000000000000000000F701000080070000F503000000000000E001000080070000DE0300000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC500000001000000FFFF02001200434D756C746950616E654672616D65576E64000100840000000066000000F00000001403000000000000FFFFFFFF0200000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000200000000000000000000066000000F000000014030000000000004F000000F0000000FD0200000000000040410046050000000750726F6A65637400000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFED0300000000000000000000 + 0000000009000000000000000020000001000000FFFFFFFFFFFFFFFF00000000DD00000080070000E1000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000000000006600000080070000F4000000000000004F00000080070000DD0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF8C0600004F00000090060000FD020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C300000180004000000000000090060000660000008007000014030000900600004F00000080070000FD02000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0655534152543300000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000080000001000000FFFFFFFFFFFFFFFF00000000FD020000800700000103000001000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000C40300001803000080070000F5030000C40300000103000080070000DE03000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332010000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7301000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727301000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF000000000000000001000000000000000100000001000000FFFFFFFFC003000001030000C4030000DE03000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000DC01000080070000E00100000000000001000000040000000100000008FDFFFF8C000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000000000000000000F701000080070000F503000000000000E001000080070000DE0300000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC500000001000000FFFF02001200434D756C746950616E654672616D65576E64000100840000000066000000F00000001403000000000000000000000200000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000400000000000000000000066000000F000000014030000000000004F000000F0000000FD0200000000000040410046050000000750726F6A65637400000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFED0300000000000000000000 59392 File - 2537 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020000001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2600 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000003736D739600000000000000050003736D73001054494D5F43434D52315F494332465F3004534D52430C54494D5F534D52435F534D530000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000000180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020000001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3563,7 +3563,7 @@ Build 976 - 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000004001D000000000000000000000000000000000100000001000000018030800000000004001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000004006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000040000000000000000000000000000000000000100000001000000960000000300205001000000047265656C960000000000000002000373696D047265656C00000000000000000180EB880000000004002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000400230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000004001D000000000000000000000000000000000100000001000000018030800000000004001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000004006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000040000000000000000000000000000000000000100000001000000960000000300205001000000047265656C960000000000000002000373696D047265656C00000000000000000180EB880000000004002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000400230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3579,7 +3579,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020000002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000004002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000004002800000000000000000000000000000000010000000100000001801B80000000000400290000000000000000000000000000000001000000010000000180E57F0000000004002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000004002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020000002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3603,12 +3603,12 @@ 0 100 - 0 + 3 .\src\main.c - 31 - 2 - 51 + 0 + 56 + 84 1 0 @@ -3625,8 +3625,8 @@ ..\driver\Driver_UART.c 0 - 1 - 37 + 6 + 29 1 0 @@ -3634,8 +3634,8 @@ ..\driver\Driver_Timer.c 0 - 41 - 60 + 82 + 91 1 0 @@ -3651,9 +3651,9 @@ ..\driver\Driver_Timer.h - 23 - 1 - 9 + 0 + 3 + 52 1 0 @@ -3669,9 +3669,9 @@ C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h - 0 - 1307 - 1308 + 21 + 4236 + 4240 1 0 @@ -3679,8 +3679,17 @@ ..\driver\Driver_GPIO.c 0 - 14 - 28 + 1 + 6 + 1 + + 0 + + + C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h + 0 + 730 + 739 1 0 diff --git a/projet-voilier/projet-voilier.uvoptx b/projet-voilier/projet-voilier.uvoptx index 68f5219..73a90f1 100644 --- a/projet-voilier/projet-voilier.uvoptx +++ b/projet-voilier/projet-voilier.uvoptx @@ -26,7 +26,7 @@ 0x4 ARM-ADS - 8000000 + 12000000 1 1 @@ -75,235 +75,6 @@ 1 0 -<<<<<<< HEAD -======= - 0 - - 18 - - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 0 - 0 - 1 - 0 - 0 - 0 - - - - - - - - - - - BIN\UL2CM3.DLL - - - - 0 - ARMRTXEVENTFLAGS - -L70 -Z18 -C0 -M0 -T1 - - - 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=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=75,104,496,531,0)(121=-1,-1,-1,-1,0)(122=75,104,496,531,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=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,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=1125,344,1728,1095,1)(151=-1,-1,-1,-1,0) - - - 0 - ARMDBGFLAGS - -T0 - - - 0 - UL2CM3 - UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)) - - - - - 0 - 0 - 23 - 1 -
                        134219356
                        - 0 - 0 - 0 - 0 - 0 - 1 - .\src\main.c - - \\projet_voilier\src/main.c\23 -                         - - 1 - 0 - 9 - 1 -
                        134219402
                        - 0 - 0 - 0 - 0 - 0 - 1 - .\src\main.c - - \\projet_voilier\src/main.c\9 -                         - - 2 - 0 - 62 - 1 -
                        134218310
                        - 0 - 0 - 0 - 0 - 0 - 1 - ..\driver\Driver_ADC.c - - \\projet_voilier\../driver/Driver_ADC.c\62 -                         -                         - - - 0 - 1 - val - - - - 0 - - - 0 - 1 - 1 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - 0 - 0 - 0 - - - - - - - - - - 1 - 1 - 0 - 2 - 10000000 - -                         - - - - reel - 0x4 - ARM-ADS - - 8000000 - - 1 - 1 - 0 - 1 - 0 - - - 1 - 65535 - 0 - 0 - 0 - - - 79 - 66 - 8 - .\Listings\ - - - 1 - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - 0 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - - - 1 - 0 ->>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110 1 18 @@ -354,11 +125,7 @@ 0 DLGTARM -<<<<<<< HEAD - (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=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=75,104,496,509,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,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=-1,-1,-1,-1,0)(131=1007,134,1601,828,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=1241,338,1689,752,0)(162=1244,281,1692,695,1)(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=-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=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=75,104,496,509,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,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=120,153,405,449,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,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)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=1048,459,1651,1093,1)(151=-1,-1,-1,-1,0) ->>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110 + (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=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=413,140,834,545,0)(121=641,191,1062,596,1)(122=-1,-1,-1,-1,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=-1,-1,-1,-1,0)(131=1007,134,1601,828,0)(132=-1,-1,-1,-1,0)(133=1104,210,1698,904,1)(160=-1,-1,-1,-1,0)(161=1241,338,1689,752,0)(162=1244,281,1692,695,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) 0 @@ -385,31 +152,9 @@ 0 0 -<<<<<<< HEAD - 53 + 84 1 -
                        134219424
                        -======= - 62 - 1 -
                        134218062
                        - 0 - 0 - 0 - 0 - 0 - 1 - ..\driver\Driver_ADC.c - - \\projet_voilier_reel\../driver/Driver_ADC.c\62 -                         - - 1 - 0 - 27 - 1 -
                        134219156
                        ->>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110 +
                        134219102
                        0 0 0 @@ -418,17 +163,28 @@ 1 .\src\main.c -<<<<<<< HEAD - \\projet_voilier\src/main.c\53 + \\projet_voilier\src/main.c\84                         - -======= - \\projet_voilier_reel\src/main.c\27 + + 1 + 0 + 78 + 1 +
                        134219086
                        + 0 + 0 + 0 + 0 + 0 + 1 + .\src\main.c + + \\projet_voilier\src/main.c\78                         2 0 - 64 + 55 1
                        0
                        0 @@ -437,19 +193,43 @@ 0 0 0 - ..\driver\Driver_ADC.c + .\src\main.c + + +                         + + 3 + 0 + 67 + 1 +
                        0
                        + 0 + 0 + 0 + 0 + 0 + 0 + .\src\main.c + + +                         + + 4 + 0 + 69 + 1 +
                        0
                        + 0 + 0 + 0 + 0 + 0 + 0 + .\src\main.c                         - - - 0 - 1 - val - - ->>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110 0 @@ -780,13 +560,8 @@ 0 0 0 -<<<<<<< HEAD ..\driver\Driver_UART.c Driver_UART.c -======= - ..\driver\Driver_ADC.c - Driver_ADC.c ->>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110 0 0 @@ -797,13 +572,8 @@ 0 0 0 -<<<<<<< HEAD ..\driver\Driver_UART.h Driver_UART.h -======= - ..\driver\Driver_ADC.h - Driver_ADC.h ->>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110 0 0 @@ -819,7 +589,7 @@ ::Device - 1 + 0 0 0 1 diff --git a/projet-voilier/projet-voilier.uvprojx b/projet-voilier/projet-voilier.uvprojx index 2f9403e..464c5a7 100644 --- a/projet-voilier/projet-voilier.uvprojx +++ b/projet-voilier/projet-voilier.uvprojx @@ -415,7 +415,6 @@ ..\driver\Driver_Timer.h -<<<<<<< HEAD Driver_UART.c 1 ..\driver\Driver_UART.c @@ -424,16 +423,6 @@ Driver_UART.h 5 ..\driver\Driver_UART.h -======= - Driver_ADC.c - 1 - ..\driver\Driver_ADC.c - - - Driver_ADC.h - 5 - ..\driver\Driver_ADC.h ->>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110 @@ -854,7 +843,6 @@ ..\driver\Driver_Timer.h -<<<<<<< HEAD Driver_UART.c 1 ..\driver\Driver_UART.c @@ -863,16 +851,6 @@ Driver_UART.h 5 ..\driver\Driver_UART.h -======= - Driver_ADC.c - 1 - ..\driver\Driver_ADC.c - - - Driver_ADC.h - 5 - ..\driver\Driver_ADC.h ->>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110 diff --git a/projet-voilier/src/main.c b/projet-voilier/src/main.c index 66883c4..f9fb4c9 100644 --- a/projet-voilier/src/main.c +++ b/projet-voilier/src/main.c @@ -1,78 +1,109 @@ #include "stm32f10x.h" #include "Driver_GPIO.h" #include "Driver_Timer.h" -<<<<<<< HEAD #include "Driver_UART.h" -======= -#include "Driver_ADC.h" - -void toto (void) -{ - static uint16_t val; - val = driver_adc_1_read(); -} ->>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110 int main() { - MyGPIO_Struct_TypeDef LED; - MyGPIO_Struct_TypeDef GPIO_ADC1; + + // MyGPIO_Struct_TypeDef PWM_GPIO; + // PWM_GPIO.GPIO_Pin = 1; + // PWM_GPIO.GPIO_Conf = AltOut_Ppull; + // PWM_GPIO.GPIO = GPIOA; + // MyGPIO_Init(&PWM_GPIO); + + // PWM_GPIO.GPIO_Pin = 0; + // PWM_GPIO.GPIO_Conf = AltOut_Ppull; + // PWM_GPIO.GPIO = GPIOA; + // MyGPIO_Init(&PWM_GPIO); - LED.GPIO_Pin = 5; - LED.GPIO_Conf = Out_Ppull; - LED.GPIO = GPIOA; - MyGPIO_Init(&LED); - MyGPIO_Set(LED.GPIO, LED.GPIO_Pin); -<<<<<<< HEAD - MyGPIO_Struct_TypeDef PWM_GPIO; - PWM_GPIO.GPIO_Pin = 0; - PWM_GPIO.GPIO_Conf = AltOut_Ppull; - PWM_GPIO.GPIO = GPIOA; - MyGPIO_Init(&PWM_GPIO); + // MyTimer_Struct_TypeDef PWM_VOILE; + // PWM_VOILE.Timer = TIM2; + // PWM_VOILE.PSC = 7200; + // PWM_VOILE.ARR = 200; + // PWM_VOILE.channel = 2; + // MyTimer_Base_Init(&PWM_VOILE); + // MyTimer_ConfigurePWM(&PWM_VOILE, 10); + // MyTimer_Start(&PWM_VOILE); - MyTimer_Struct_TypeDef PWM; - PWM.Timer = TIM2; - PWM.PSC = 7200; - PWM.ARR = 5000; - MyTimer_Base_Init(&PWM); - MyTimer_ConfigurePWM(&PWM, 1, 40); - MyTimer_Start(&PWM); + + // MyTimer_Struct_TypeDef PWM_PLATEAU; + // PWM_PLATEAU.Timer = TIM2; + // PWM_PLATEAU.PSC = 7200; + // PWM_PLATEAU.ARR = 200; + // PWM_VOILE.channel = 1; + // MyTimer_Base_Init(&PWM_PLATEAU); + // MyTimer_ConfigurePWM(&PWM_PLATEAU, 60); + // MyTimer_Start(&PWM_VOILE); + + // MyGPIO_Struct_TypeDef PHA; + // MyGPIO_Struct_TypeDef PHB; + + // MyTimer_Struct_TypeDef ENCODER; + // ENCODER.Timer = TIM4; + // ENCODER.PSC = 0; + // ENCODER.ARR = 0xFFFF; // Configurer la valeur maximale du compteur (pour éviter les problèmes de débordement) + // MyTimer_Base_Init(&ENCODER); + // MyTimer_ConfigureEncoder(&ENCODER); + // MyTimer_Start(&ENCODER); + + + // MyTimer_ConfigureEncoder(&ENCODER); + + // MyGPIO_Struct_TypeDef UART_GPIO; + // UART_GPIO.GPIO_Pin = 2; + // UART_GPIO.GPIO_Conf = AltOut_Ppull; + // UART_GPIO.GPIO = GPIOA; + // MyGPIO_Init(&UART_GPIO); + + // UART_GPIO.GPIO_Pin = 3; + // UART_GPIO.GPIO_Conf = In_Floating; + // UART_GPIO.GPIO = GPIOA; + // MyGPIO_Init(&UART_GPIO); - MyGPIO_Struct_TypeDef UART; - UART.GPIO_Pin = 10; - UART.GPIO_Conf = AltOut_Ppull; - UART.GPIO = GPIOB; - MyGPIO_Init(&UART); + // MyUART_Struct_TypeDef UART; + // UART.baudrate = 9600; + // MyUART_Init(&UART); - UART.GPIO_Pin = 11; - UART.GPIO_Conf = In_Floating; - UART.GPIO = GPIOB; - MyGPIO_Init(&UART); - MyUART_Struct_TypeDef UART_TEST; - UART_TEST.baudrate = 9600; - UART_TEST.UART = USART3; // USART3_TX : PB10 - MyUART_Init(&UART_TEST); + // PB6 PB7 + + MyGPIO_Struct_TypeDef TI1; + TI1.GPIO_Pin = 6; + TI1.GPIO_Conf = In_Floating; + TI1.GPIO = GPIOB; + MyGPIO_Init(&TI1); + + MyGPIO_Struct_TypeDef TI2; + TI2.GPIO_Pin = 7; + TI2.GPIO_Conf = In_Floating; + TI2.GPIO = GPIOB; + MyGPIO_Init(&TI2); + + MyTimer_Struct_TypeDef Encodeur; + Encodeur.Timer = TIM4; + Encodeur.channel = 2; + MyTimer_Base_Init(&Encodeur); + MyTimer_ConfigureEncoder(&Encodeur); + MyTimer_Start(&Encodeur); while(1) { - MyUART_SendByte(&UART_TEST, 'A'); + + // MyTimer_SetPWMDutyCycle(&PWM_VOILE, 5); + // MyTimer_SetPWMDutyCycle(&PWM_VOILE, 10); - for (int i = 0; i < 100000000; i++); + // MyTimer_ConfigurePWM(&PWM_PLATEAU, 60); + // MyTimer_SetPWMDutyCycle(&PWM_PLATEAU, 5); + // MyTimer_SetPWMDutyCycle(&PWM_PLATEAU, 10); + + + // for (int i = 0; i < 26; i++) { + // MyUART_SendByte(&UART, 'A'+i); + // } + - int a = MyUART_ReceiveByte(&UART_TEST); } -======= - - GPIO_ADC1.GPIO_Pin = 1; - GPIO_ADC1.GPIO_Conf = In_Analog; - GPIO_ADC1.GPIO = GPIOC; - MyGPIO_Init(&GPIO_ADC1); - - driver_adc_1_init(0x01,&toto); - driver_adc_1_launch_read(); - while(1); ->>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110 }