Merge

.vscode/settings.json

@@ -1,5 +1,11 @@
 {
     "files.associations": {
-        "driver_uart.h": "c"
+        "driver_uart.h": "c",
+<<<<<<< HEAD
+        "driver_imu.h": "c",
+        "myspi.h": "c"
+=======
+        "app_girouette.h": "c"
+>>>>>>> encoder
     }
 }

README.md

@@ -1,2 +1 @@
 # Projet-Voilier-3
-

driver/Driver_GPIO.c

@@ -33,7 +33,7 @@ void MyGPIO_Init ( MyGPIO_Struct_TypeDef * GPIOStructPtr )
 	}
 	else
 	{
-		GPIOStructPtr->GPIO->CRH &= ~0xF<<(4*((GPIOStructPtr->GPIO_Pin)%8));
+		GPIOStructPtr->GPIO->CRH &= ~(0xF<<(4*((GPIOStructPtr->GPIO_Pin)%8)));
 		GPIOStructPtr->GPIO->CRH |= (GPIOStructPtr->GPIO_Conf)<<(4*((GPIOStructPtr->GPIO_Pin)%8));
 	}
 	
@@ -70,3 +70,5 @@ void MyGPIO_Toggle ( GPIO_TypeDef * GPIO , char GPIO_Pin )
 {
 	GPIO->ODR ^= 0x1<<GPIO_Pin;
 }
+
+

driver/Driver_Timer.c

@@ -70,6 +70,39 @@ void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint8_t channel, uint16
   }
 }
 
+// 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 = 1440; // 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;
+
+
+    // activer la clock pour le port GPIOC
+    RCC->APB2ENR |= RCC_APB2ENR_IOPCEN;
+
+    // configurer PC3 en mode entrée avec une pull-up
+    GPIOC->CRL &= ~(GPIO_CRL_MODE3 | GPIO_CRL_CNF3);
+    GPIOC->CRL |= GPIO_CRL_CNF3_1 | GPIO_CRL_MODE3_0;
+
+    // configurer l'interruption pour PC3 en mode bord montant
+    EXTI->IMR |= EXTI_IMR_MR3;
+    EXTI->RTSR |= EXTI_RTSR_TR3;
+
+    // configurer la priorité de l'interruption
+    NVIC_SetPriority(EXTI3_IRQn, 1);
+
+    // activer l'interruption
+    NVIC_EnableIRQ(EXTI3_IRQn);
+}
+
+
 void Bug (void)
 {
 	while(1);
@@ -105,6 +138,12 @@ void MyTimer_ActiveIT (TIM_TypeDef * Timer, char Prio, void (*IT_function)(void)
 	}
 }
 
+uint16_t TIM_GetCounter(TIM_TypeDef * Timer)
+{
+    // Lit la valeur actuelle du compteur CNT du timer TIMx
+    return Timer->CNT;
+}
+
 void TIM2_IRQHandler (void)
 {
 	TIM2->SR &= ~TIM_SR_UIF;
@@ -123,3 +162,11 @@ void TIM4_IRQHandler (void)
 	(*TIM4_fx)();
 }
 
+int seed(int a) {
+	return a = 2;
+}
+
+void EXTI3_IRQHandler(void) {
+
+	int a = seed(a);	
+}

driver/Driver_Timer.h

@@ -65,4 +65,6 @@ 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_ConfigureEncoder(MyTimer_Struct_TypeDef *Timer);
+
 #endif

driver/Driver_UART.c

@@ -2,7 +2,14 @@
 
 void MyUART_Init(MyUART_Struct_TypeDef *UART) {
   // Active l'horloge du périphérique UART
-  RCC->APB1ENR |= RCC_APB1ENR_USART3EN;
+
+  if (UART->UART == USART1) {
+    RCC->APB2ENR |= RCC_APB2ENR_USART1EN;
+  } else if (UART->UART == USART2) {
+    RCC->APB1ENR |= RCC_APB1ENR_USART2EN;
+  } else if (UART->UART == USART3) {
+    RCC->APB1ENR |= RCC_APB1ENR_USART3EN;
+  }
 
 	// Active l'UART pour permettre la transmission/réception de données
   UART->UART->CR1 |= USART_CR1_UE;
@@ -25,13 +32,19 @@ void MyUART_Init(MyUART_Struct_TypeDef *UART) {
 }
 
 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));
-
   // Envoyer la donnée
   UART->UART->DR = data;
 
-  USART3->CR1 |= USART_CR1_TXEIE; // Active l'interruption d'envoi de données
+  // Attendre que la transmission soit terminée
+  while ((UART->UART->SR & USART_SR_TC) == 0);
+}
+
+void MyUART_SendString(MyUART_Struct_TypeDef *UART, const char *str) {
+  // Envoyer chaque caractère de la chaîne
+  while (*str != '\0') {
+    MyUART_SendByte(UART, *str);
+    str++;
+  }
 }
 
 uint8_t MyUART_ReceiveByte(MyUART_Struct_TypeDef *UART) {
@@ -57,3 +70,4 @@ void USART3_IRQHandler(void) {
    
   }
 }
+

driver/Driver_UART.h

@@ -11,5 +11,6 @@ typedef struct {
 void MyUART_Init(MyUART_Struct_TypeDef *UART);
 void MyUART_SendByte(MyUART_Struct_TypeDef *UART, uint8_t data);
 uint8_t MyUART_ReceiveByte(MyUART_Struct_TypeDef *UART);
+void MyUART_SendString(MyUART_Struct_TypeDef *UART, const char *str);
 
 #endif

projet-voilier/Listings/projet-voilier.map

@@ -4,10 +4,31 @@ Component: Arm Compiler for Embedded 6.19 Tool: armlink [5e73cb00]
 
 Section Cross References
 
+<<<<<<< HEAD
     main.o(.text.main) refers to driver_adc.o(.text.driver_adc_1_launch_read) for driver_adc_1_launch_read
     main.o(.text.main) refers to driver_imu.o(.text.driver_IMU_init) for driver_IMU_init
     main.o(.text.main) refers to driver_imu.o(.text.driver_IMU_read) for driver_IMU_read
+=======
+    main.o(.text.main) refers to driver_gpio.o(.text.MyGPIO_Init) for MyGPIO_Init
+    main.o(.text.main) refers to driver_uart.o(.text.MyUART_Init) for MyUART_Init
+<<<<<<< HEAD
+    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_ConfigureEncoder) for MyTimer_ConfigureEncoder
+    main.o(.text.main) refers to driver_timer.o(.text.MyTimer_Start) for MyTimer_Start
+>>>>>>> encoder
+=======
+    main.o(.text.main) refers to app_girouette.o(.text.App_Girouette_Init) for App_Girouette_Init
+    main.o(.text.main) refers to app_girouette.o(.text.App_Girouette_GetDirection) for App_Girouette_GetDirection
+    main.o(.text.main) refers to driver_uart.o(.text.MyUART_SendByte) for MyUART_SendByte
+>>>>>>> encoder
     main.o(.ARM.exidx.text.main) refers to main.o(.text.main) for [Anonymous Symbol]
+    app_girouette.o(.text.App_Girouette_Init) refers to driver_timer.o(.text.MyTimer_Base_Init) for MyTimer_Base_Init
+    app_girouette.o(.text.App_Girouette_Init) refers to driver_timer.o(.text.MyTimer_ConfigureEncoder) for MyTimer_ConfigureEncoder
+    app_girouette.o(.text.App_Girouette_Init) refers to driver_timer.o(.text.MyTimer_Start) for MyTimer_Start
+    app_girouette.o(.text.App_Girouette_Init) refers to driver_gpio.o(.text.MyGPIO_Init) for MyGPIO_Init
+    app_girouette.o(.ARM.exidx.text.App_Girouette_Init) refers to app_girouette.o(.text.App_Girouette_Init) for [Anonymous Symbol]
+    app_girouette.o(.text.App_Girouette_GetDirection) refers to driver_timer.o(.text.TIM_GetCounter) for TIM_GetCounter
+    app_girouette.o(.ARM.exidx.text.App_Girouette_GetDirection) refers to app_girouette.o(.text.App_Girouette_GetDirection) for [Anonymous Symbol]
     driver_gpio.o(.ARM.exidx.text.MyGPIO_Init) refers to driver_gpio.o(.text.MyGPIO_Init) for [Anonymous Symbol]
     driver_gpio.o(.ARM.exidx.text.MyGPIO_Read) refers to driver_gpio.o(.text.MyGPIO_Read) for [Anonymous Symbol]
     driver_gpio.o(.ARM.exidx.text.MyGPIO_Set) refers to driver_gpio.o(.text.MyGPIO_Set) for [Anonymous Symbol]
@@ -17,17 +38,21 @@ 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_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
     driver_timer.o(.text.MyTimer_ActiveIT) refers to driver_timer.o(.data.TIM3_fx) for TIM3_fx
     driver_timer.o(.ARM.exidx.text.MyTimer_ActiveIT) refers to driver_timer.o(.text.MyTimer_ActiveIT) for [Anonymous Symbol]
+    driver_timer.o(.ARM.exidx.text.TIM_GetCounter) refers to driver_timer.o(.text.TIM_GetCounter) for [Anonymous Symbol]
     driver_timer.o(.text.TIM2_IRQHandler) refers to driver_timer.o(.data.TIM2_fx) for TIM2_fx
     driver_timer.o(.ARM.exidx.text.TIM2_IRQHandler) refers to driver_timer.o(.text.TIM2_IRQHandler) for [Anonymous Symbol]
     driver_timer.o(.text.TIM3_IRQHandler) refers to driver_timer.o(.data.TIM3_fx) for TIM3_fx
     driver_timer.o(.ARM.exidx.text.TIM3_IRQHandler) refers to driver_timer.o(.text.TIM3_IRQHandler) for [Anonymous Symbol]
     driver_timer.o(.text.TIM4_IRQHandler) refers to driver_timer.o(.data.TIM4_fx) for TIM4_fx
     driver_timer.o(.ARM.exidx.text.TIM4_IRQHandler) refers to driver_timer.o(.text.TIM4_IRQHandler) for [Anonymous Symbol]
+    driver_timer.o(.ARM.exidx.text.seed) refers to driver_timer.o(.text.seed) for [Anonymous Symbol]
+    driver_timer.o(.ARM.exidx.text.EXTI3_IRQHandler) refers to driver_timer.o(.text.EXTI3_IRQHandler) for [Anonymous Symbol]
     driver_timer.o(.data.TIM2_fx) refers to driver_timer.o(.text.Bug) for Bug
     driver_timer.o(.data.TIM3_fx) refers to driver_timer.o(.text.Bug) for Bug
     driver_timer.o(.data.TIM4_fx) refers to driver_timer.o(.text.Bug) for Bug
@@ -43,6 +68,7 @@ Section Cross References
     driver_adc.o(.text.ADC1_2_IRQHandler) refers to driver_adc.o(.data.ADC1_2_fx) for ADC1_2_fx
     driver_adc.o(.ARM.exidx.text.ADC1_2_IRQHandler) refers to driver_adc.o(.text.ADC1_2_IRQHandler) for [Anonymous Symbol]
     driver_adc.o(.data.ADC1_2_fx) refers to driver_adc.o(.text.erreur) for erreur
+<<<<<<< HEAD
     driver_imu.o(.text.driver_IMU_write_register) refers to myspi.o(i.MySPI_Clear_NSS) for MySPI_Clear_NSS
     driver_imu.o(.text.driver_IMU_write_register) refers to myspi.o(i.MySPI_Send) for MySPI_Send
     driver_imu.o(.text.driver_IMU_write_register) refers to myspi.o(i.MySPI_Set_NSS) for MySPI_Set_NSS
@@ -57,11 +83,17 @@ Section Cross References
     driver_imu.o(.text.driver_IMU_read) refers to myspi.o(i.MySPI_Read) for MySPI_Read
     driver_imu.o(.text.driver_IMU_read) refers to myspi.o(i.MySPI_Set_NSS) for MySPI_Set_NSS
     driver_imu.o(.ARM.exidx.text.driver_IMU_read) refers to driver_imu.o(.text.driver_IMU_read) for [Anonymous Symbol]
+=======
+>>>>>>> encoder
     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
     startup_stm32f10x_md.o(RESET) refers to startup_stm32f10x_md.o(STACK) for __initial_sp
     startup_stm32f10x_md.o(RESET) refers to startup_stm32f10x_md.o(.text) for Reset_Handler
+<<<<<<< HEAD
+=======
+    startup_stm32f10x_md.o(RESET) refers to driver_timer.o(.text.EXTI3_IRQHandler) for EXTI3_IRQHandler
+>>>>>>> encoder
     startup_stm32f10x_md.o(RESET) refers to driver_adc.o(.text.ADC1_2_IRQHandler) for ADC1_2_IRQHandler
     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
@@ -196,6 +228,9 @@ Removing Unused input sections from the image.
     Removing main.o(.text), (0 bytes).
     Removing main.o(.ARM.exidx.text.main), (8 bytes).
     Removing main.o(.ARM.use_no_argv), (4 bytes).
+    Removing app_girouette.o(.text), (0 bytes).
+    Removing app_girouette.o(.ARM.exidx.text.App_Girouette_Init), (8 bytes).
+    Removing app_girouette.o(.ARM.exidx.text.App_Girouette_GetDirection), (8 bytes).
     Removing driver_gpio.o(.text), (0 bytes).
     Removing driver_gpio.o(.text.MyGPIO_Init), (156 bytes).
     Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Init), (8 bytes).
@@ -216,16 +251,20 @@ Removing Unused input sections from the image.
     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_ConfigureEncoder), (70 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).
+    Removing driver_timer.o(.ARM.exidx.text.TIM_GetCounter), (8 bytes).
     Removing driver_timer.o(.ARM.exidx.text.TIM2_IRQHandler), (8 bytes).
     Removing driver_timer.o(.ARM.exidx.text.TIM3_IRQHandler), (8 bytes).
     Removing driver_timer.o(.ARM.exidx.text.TIM4_IRQHandler), (8 bytes).
+    Removing driver_timer.o(.text.seed), (4 bytes).
+    Removing driver_timer.o(.ARM.exidx.text.seed), (8 bytes).
+    Removing driver_timer.o(.ARM.exidx.text.EXTI3_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).
@@ -234,10 +273,15 @@ Removing Unused input sections from the image.
     Removing driver_adc.o(.ARM.exidx.text.erreur), (8 bytes).
     Removing driver_adc.o(.text.driver_adc_1_init), (160 bytes).
     Removing driver_adc.o(.ARM.exidx.text.driver_adc_1_init), (8 bytes).
+<<<<<<< HEAD
+=======
+    Removing driver_adc.o(.text.driver_adc_1_launch_read), (18 bytes).
+>>>>>>> encoder
     Removing driver_adc.o(.ARM.exidx.text.driver_adc_1_launch_read), (8 bytes).
     Removing driver_adc.o(.text.driver_adc_1_read), (16 bytes).
     Removing driver_adc.o(.ARM.exidx.text.driver_adc_1_read), (8 bytes).
     Removing driver_adc.o(.ARM.exidx.text.ADC1_2_IRQHandler), (8 bytes).
+<<<<<<< HEAD
     Removing driver_imu.o(.text), (0 bytes).
     Removing driver_imu.o(.text.driver_IMU_write_register), (30 bytes).
     Removing driver_imu.o(.ARM.exidx.text.driver_IMU_write_register), (8 bytes).
@@ -246,6 +290,8 @@ Removing Unused input sections from the image.
     Removing driver_imu.o(.rodata.POWER_CTL), (1 bytes).
     Removing driver_imu.o(.rodata.BW_RATE), (1 bytes).
     Removing driver_imu.o(.rodata.DATA_FORMAT), (1 bytes).
+=======
+>>>>>>> encoder
     Removing system_stm32f10x.o(.text), (0 bytes).
     Removing system_stm32f10x.o(.ARM.exidx.text.SystemInit), (8 bytes).
     Removing system_stm32f10x.o(.text.SystemCoreClockUpdate), (110 bytes).
@@ -256,7 +302,15 @@ Removing Unused input sections from the image.
     Removing myspi.o(.revsh_text), (4 bytes).
     Removing myspi.o(.rrx_text), (6 bytes).
 
-62 unused section(s) (total 1403 bytes) removed from the image.
+<<<<<<< HEAD
+<<<<<<< HEAD
+64 unused section(s) (total 1481 bytes) removed from the image.
+=======
+54 unused section(s) (total 1084 bytes) removed from the image.
+>>>>>>> encoder
+=======
+57 unused section(s) (total 1086 bytes) removed from the image.
+>>>>>>> encoder
 
 ==============================================================================
 
@@ -318,6 +372,7 @@ Image Symbol Table
     ../clib/stdlib.c                         0x00000000   Number         0  exit.o ABSOLUTE
     ../fplib/fpinit.s                        0x00000000   Number         0  fpinit.o ABSOLUTE
     ../fplib/fpinit_empty.s                  0x00000000   Number         0  fpinit_empty.o ABSOLUTE
+    App_girouette.c                          0x00000000   Number         0  app_girouette.o ABSOLUTE
     Driver_ADC.c                             0x00000000   Number         0  driver_adc.o ABSOLUTE
     Driver_GPIO.c                            0x00000000   Number         0  driver_gpio.o ABSOLUTE
     Driver_IMU.c                             0x00000000   Number         0  driver_imu.o ABSOLUTE
@@ -385,7 +440,9 @@ Image Symbol Table
     .text                                    0x08000240   Section        2  use_no_semi.o(.text)
     .text                                    0x08000242   Section        0  indicate_semi.o(.text)
     [Anonymous Symbol]                       0x08000244   Section        0  driver_adc.o(.text.ADC1_2_IRQHandler)
+<<<<<<< HEAD
     [Anonymous Symbol]                       0x08000260   Section        0  driver_timer.o(.text.Bug)
+<<<<<<< HEAD
     [Anonymous Symbol]                       0x08000264   Section        0  system_stm32f10x.o(.text.SystemInit)
     [Anonymous Symbol]                       0x08000374   Section        0  driver_timer.o(.text.TIM2_IRQHandler)
     [Anonymous Symbol]                       0x08000390   Section        0  driver_timer.o(.text.TIM3_IRQHandler)
@@ -408,6 +465,47 @@ Image Symbol Table
     Stack_Mem                                0x20000278   Data        1024  startup_stm32f10x_md.o(STACK)
     STACK                                    0x20000278   Section     1024  startup_stm32f10x_md.o(STACK)
     __initial_sp                             0x20000678   Data           0  startup_stm32f10x_md.o(STACK)
+=======
+    [Anonymous Symbol]                       0x08000264   Section        0  driver_timer.o(.text.EXTI3_IRQHandler)
+    [Anonymous Symbol]                       0x08000268   Section        0  driver_gpio.o(.text.MyGPIO_Init)
+    [Anonymous Symbol]                       0x08000304   Section        0  driver_timer.o(.text.MyTimer_Base_Init)
+    [Anonymous Symbol]                       0x08000390   Section        0  driver_timer.o(.text.MyTimer_ConfigureEncoder)
+    [Anonymous Symbol]                       0x08000438   Section        0  driver_timer.o(.text.MyTimer_Start)
+    [Anonymous Symbol]                       0x08000444   Section        0  driver_uart.o(.text.MyUART_Init)
+    [Anonymous Symbol]                       0x08000490   Section        0  system_stm32f10x.o(.text.SystemInit)
+    [Anonymous Symbol]                       0x080005a0   Section        0  driver_timer.o(.text.TIM2_IRQHandler)
+    [Anonymous Symbol]                       0x080005bc   Section        0  driver_timer.o(.text.TIM3_IRQHandler)
+    [Anonymous Symbol]                       0x080005d8   Section        0  driver_timer.o(.text.TIM4_IRQHandler)
+    [Anonymous Symbol]                       0x080005f4   Section        0  driver_uart.o(.text.USART3_IRQHandler)
+    [Anonymous Symbol]                       0x08000604   Section        0  driver_adc.o(.text.erreur)
+    [Anonymous Symbol]                       0x08000608   Section        0  main.o(.text.main)
+=======
+    [Anonymous Symbol]                       0x08000260   Section        0  app_girouette.o(.text.App_Girouette_GetDirection)
+    [Anonymous Symbol]                       0x0800027c   Section        0  app_girouette.o(.text.App_Girouette_Init)
+    [Anonymous Symbol]                       0x080002cc   Section        0  driver_timer.o(.text.Bug)
+    [Anonymous Symbol]                       0x080002d0   Section        0  driver_timer.o(.text.EXTI3_IRQHandler)
+    [Anonymous Symbol]                       0x080002d4   Section        0  driver_gpio.o(.text.MyGPIO_Init)
+    [Anonymous Symbol]                       0x08000370   Section        0  driver_timer.o(.text.MyTimer_Base_Init)
+    [Anonymous Symbol]                       0x080003fc   Section        0  driver_timer.o(.text.MyTimer_ConfigureEncoder)
+    [Anonymous Symbol]                       0x080004a4   Section        0  driver_timer.o(.text.MyTimer_Start)
+    [Anonymous Symbol]                       0x080004b0   Section        0  driver_uart.o(.text.MyUART_Init)
+    [Anonymous Symbol]                       0x080004fc   Section        0  driver_uart.o(.text.MyUART_SendByte)
+    [Anonymous Symbol]                       0x08000514   Section        0  system_stm32f10x.o(.text.SystemInit)
+    [Anonymous Symbol]                       0x08000624   Section        0  driver_timer.o(.text.TIM2_IRQHandler)
+    [Anonymous Symbol]                       0x08000640   Section        0  driver_timer.o(.text.TIM3_IRQHandler)
+    [Anonymous Symbol]                       0x0800065c   Section        0  driver_timer.o(.text.TIM4_IRQHandler)
+    [Anonymous Symbol]                       0x08000678   Section        0  driver_timer.o(.text.TIM_GetCounter)
+    [Anonymous Symbol]                       0x0800067c   Section        0  driver_uart.o(.text.USART3_IRQHandler)
+    [Anonymous Symbol]                       0x0800068c   Section        0  driver_adc.o(.text.erreur)
+    [Anonymous Symbol]                       0x08000690   Section        0  main.o(.text.main)
+>>>>>>> encoder
+    .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)
+    Stack_Mem                                0x20000270   Data        1024  startup_stm32f10x_md.o(STACK)
+    STACK                                    0x20000270   Section     1024  startup_stm32f10x_md.o(STACK)
+    __initial_sp                             0x20000670   Data           0  startup_stm32f10x_md.o(STACK)
+>>>>>>> encoder
 
     Global Symbols
 
@@ -519,7 +617,6 @@ Image Symbol Table
     EXTI15_10_IRQHandler                     0x080001a3   Thumb Code     0  startup_stm32f10x_md.o(.text)
     EXTI1_IRQHandler                         0x080001a3   Thumb Code     0  startup_stm32f10x_md.o(.text)
     EXTI2_IRQHandler                         0x080001a3   Thumb Code     0  startup_stm32f10x_md.o(.text)
-    EXTI3_IRQHandler                         0x080001a3   Thumb Code     0  startup_stm32f10x_md.o(.text)
     EXTI4_IRQHandler                         0x080001a3   Thumb Code     0  startup_stm32f10x_md.o(.text)
     EXTI9_5_IRQHandler                       0x080001a3   Thumb Code     0  startup_stm32f10x_md.o(.text)
     FLASH_IRQHandler                         0x080001a3   Thumb Code     0  startup_stm32f10x_md.o(.text)
@@ -558,7 +655,9 @@ Image Symbol Table
     __use_no_semihosting_swi                 0x08000241   Thumb Code     2  use_no_semi.o(.text)
     __semihosting_library_function           0x08000243   Thumb Code     0  indicate_semi.o(.text)
     ADC1_2_IRQHandler                        0x08000245   Thumb Code    28  driver_adc.o(.text.ADC1_2_IRQHandler)
+<<<<<<< HEAD
     Bug                                      0x08000261   Thumb Code     2  driver_timer.o(.text.Bug)
+<<<<<<< HEAD
     SystemInit                               0x08000265   Thumb Code   272  system_stm32f10x.o(.text.SystemInit)
     TIM2_IRQHandler                          0x08000375   Thumb Code    26  driver_timer.o(.text.TIM2_IRQHandler)
     TIM3_IRQHandler                          0x08000391   Thumb Code    28  driver_timer.o(.text.TIM3_IRQHandler)
@@ -583,6 +682,51 @@ Image Symbol Table
     TIM4_fx                                  0x20000010   Data           4  driver_timer.o(.data.TIM4_fx)
     __libspace_start                         0x20000018   Data          96  libspace.o(.bss)
     __temporary_stack_top$libspace           0x20000078   Data           0  libspace.o(.bss)
+=======
+    EXTI3_IRQHandler                         0x08000265   Thumb Code     2  driver_timer.o(.text.EXTI3_IRQHandler)
+    MyGPIO_Init                              0x08000269   Thumb Code   140  driver_gpio.o(.text.MyGPIO_Init)
+    MyTimer_Base_Init                        0x08000305   Thumb Code   140  driver_timer.o(.text.MyTimer_Base_Init)
+    MyTimer_ConfigureEncoder                 0x08000391   Thumb Code   168  driver_timer.o(.text.MyTimer_ConfigureEncoder)
+    MyTimer_Start                            0x08000439   Thumb Code    12  driver_timer.o(.text.MyTimer_Start)
+    MyUART_Init                              0x08000445   Thumb Code    76  driver_uart.o(.text.MyUART_Init)
+    SystemInit                               0x08000491   Thumb Code   272  system_stm32f10x.o(.text.SystemInit)
+    TIM2_IRQHandler                          0x080005a1   Thumb Code    26  driver_timer.o(.text.TIM2_IRQHandler)
+    TIM3_IRQHandler                          0x080005bd   Thumb Code    28  driver_timer.o(.text.TIM3_IRQHandler)
+    TIM4_IRQHandler                          0x080005d9   Thumb Code    28  driver_timer.o(.text.TIM4_IRQHandler)
+    USART3_IRQHandler                        0x080005f5   Thumb Code    14  driver_uart.o(.text.USART3_IRQHandler)
+    erreur                                   0x08000605   Thumb Code     2  driver_adc.o(.text.erreur)
+    main                                     0x08000609   Thumb Code   126  main.o(.text.main)
+    Region$$Table$$Base                      0x08000688   Number         0  anon$$obj.o(Region$$Table)
+    Region$$Table$$Limit                     0x080006a8   Number         0  anon$$obj.o(Region$$Table)
+=======
+    App_Girouette_GetDirection               0x08000261   Thumb Code    26  app_girouette.o(.text.App_Girouette_GetDirection)
+    App_Girouette_Init                       0x0800027d   Thumb Code    80  app_girouette.o(.text.App_Girouette_Init)
+    Bug                                      0x080002cd   Thumb Code     2  driver_timer.o(.text.Bug)
+    EXTI3_IRQHandler                         0x080002d1   Thumb Code     2  driver_timer.o(.text.EXTI3_IRQHandler)
+    MyGPIO_Init                              0x080002d5   Thumb Code   140  driver_gpio.o(.text.MyGPIO_Init)
+    MyTimer_Base_Init                        0x08000371   Thumb Code   140  driver_timer.o(.text.MyTimer_Base_Init)
+    MyTimer_ConfigureEncoder                 0x080003fd   Thumb Code   168  driver_timer.o(.text.MyTimer_ConfigureEncoder)
+    MyTimer_Start                            0x080004a5   Thumb Code    12  driver_timer.o(.text.MyTimer_Start)
+    MyUART_Init                              0x080004b1   Thumb Code    76  driver_uart.o(.text.MyUART_Init)
+    MyUART_SendByte                          0x080004fd   Thumb Code    22  driver_uart.o(.text.MyUART_SendByte)
+    SystemInit                               0x08000515   Thumb Code   272  system_stm32f10x.o(.text.SystemInit)
+    TIM2_IRQHandler                          0x08000625   Thumb Code    26  driver_timer.o(.text.TIM2_IRQHandler)
+    TIM3_IRQHandler                          0x08000641   Thumb Code    28  driver_timer.o(.text.TIM3_IRQHandler)
+    TIM4_IRQHandler                          0x0800065d   Thumb Code    28  driver_timer.o(.text.TIM4_IRQHandler)
+    TIM_GetCounter                           0x08000679   Thumb Code     4  driver_timer.o(.text.TIM_GetCounter)
+    USART3_IRQHandler                        0x0800067d   Thumb Code    14  driver_uart.o(.text.USART3_IRQHandler)
+    erreur                                   0x0800068d   Thumb Code     2  driver_adc.o(.text.erreur)
+    main                                     0x08000691   Thumb Code    82  main.o(.text.main)
+    Region$$Table$$Base                      0x080006e4   Number         0  anon$$obj.o(Region$$Table)
+    Region$$Table$$Limit                     0x08000704   Number         0  anon$$obj.o(Region$$Table)
+>>>>>>> encoder
+    ADC1_2_fx                                0x20000000   Data           4  driver_adc.o(.data.ADC1_2_fx)
+    TIM2_fx                                  0x20000004   Data           4  driver_timer.o(.data.TIM2_fx)
+    TIM3_fx                                  0x20000008   Data           4  driver_timer.o(.data.TIM3_fx)
+    TIM4_fx                                  0x2000000c   Data           4  driver_timer.o(.data.TIM4_fx)
+    __libspace_start                         0x20000010   Data          96  libspace.o(.bss)
+    __temporary_stack_top$libspace           0x20000070   Data           0  libspace.o(.bss)
+>>>>>>> encoder
 
 
 
@@ -592,115 +736,240 @@ Memory Map of the image
 
   Image Entry point : 0x08000189
 
+<<<<<<< HEAD
+<<<<<<< HEAD
   Load Region LR_1 (Base: 0x08000000, Size: 0x000007b4, Max: 0xffffffff, ABSOLUTE)
 
     Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000007a0, Max: 0xffffffff, ABSOLUTE)
 
     Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
 
-    0x08000000   0x08000000   0x000000ec   Data   RO          111    RESET               startup_stm32f10x_md.o
-    0x080000ec   0x080000ec   0x00000008   Code   RO          153  * !!!main             c_w.l(__main.o)
-    0x080000f4   0x080000f4   0x00000034   Code   RO          318    !!!scatter          c_w.l(__scatter.o)
-    0x08000128   0x08000128   0x0000001a   Code   RO          320    !!handler_copy      c_w.l(__scatter_copy.o)
+    0x08000000   0x08000000   0x000000ec   Data   RO          113    RESET               startup_stm32f10x_md.o
+    0x080000ec   0x080000ec   0x00000008   Code   RO          155  * !!!main             c_w.l(__main.o)
+    0x080000f4   0x080000f4   0x00000034   Code   RO          320    !!!scatter          c_w.l(__scatter.o)
+    0x08000128   0x08000128   0x0000001a   Code   RO          322    !!handler_copy      c_w.l(__scatter_copy.o)
     0x08000142   0x08000142   0x00000002   PAD
-    0x08000144   0x08000144   0x0000001c   Code   RO          322    !!handler_zi        c_w.l(__scatter_zi.o)
-    0x08000160   0x08000160   0x00000002   Code   RO          180    .ARM.Collect$$libinit$$00000000  c_w.l(libinit.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          187    .ARM.Collect$$libinit$$00000002  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          189    .ARM.Collect$$libinit$$00000004  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          191    .ARM.Collect$$libinit$$00000006  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          194    .ARM.Collect$$libinit$$0000000C  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          196    .ARM.Collect$$libinit$$0000000E  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          198    .ARM.Collect$$libinit$$00000010  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          201    .ARM.Collect$$libinit$$00000013  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          203    .ARM.Collect$$libinit$$00000015  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          205    .ARM.Collect$$libinit$$00000017  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          207    .ARM.Collect$$libinit$$00000019  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          209    .ARM.Collect$$libinit$$0000001B  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          211    .ARM.Collect$$libinit$$0000001D  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          213    .ARM.Collect$$libinit$$0000001F  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          215    .ARM.Collect$$libinit$$00000021  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          217    .ARM.Collect$$libinit$$00000023  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          219    .ARM.Collect$$libinit$$00000025  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          221    .ARM.Collect$$libinit$$00000027  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          225    .ARM.Collect$$libinit$$0000002E  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          227    .ARM.Collect$$libinit$$00000030  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          229    .ARM.Collect$$libinit$$00000032  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000000   Code   RO          231    .ARM.Collect$$libinit$$00000034  c_w.l(libinit2.o)
-    0x08000162   0x08000162   0x00000002   Code   RO          232    .ARM.Collect$$libinit$$00000035  c_w.l(libinit2.o)
-    0x08000164   0x08000164   0x00000002   Code   RO          254    .ARM.Collect$$libshutdown$$00000000  c_w.l(libshutdown.o)
-    0x08000166   0x08000166   0x00000000   Code   RO          269    .ARM.Collect$$libshutdown$$00000002  c_w.l(libshutdown2.o)
-    0x08000166   0x08000166   0x00000000   Code   RO          271    .ARM.Collect$$libshutdown$$00000004  c_w.l(libshutdown2.o)
-    0x08000166   0x08000166   0x00000000   Code   RO          274    .ARM.Collect$$libshutdown$$00000007  c_w.l(libshutdown2.o)
-    0x08000166   0x08000166   0x00000000   Code   RO          277    .ARM.Collect$$libshutdown$$0000000A  c_w.l(libshutdown2.o)
-    0x08000166   0x08000166   0x00000000   Code   RO          279    .ARM.Collect$$libshutdown$$0000000C  c_w.l(libshutdown2.o)
-    0x08000166   0x08000166   0x00000000   Code   RO          282    .ARM.Collect$$libshutdown$$0000000F  c_w.l(libshutdown2.o)
-    0x08000166   0x08000166   0x00000002   Code   RO          283    .ARM.Collect$$libshutdown$$00000010  c_w.l(libshutdown2.o)
-    0x08000168   0x08000168   0x00000000   Code   RO          155    .ARM.Collect$$rtentry$$00000000  c_w.l(__rtentry.o)
-    0x08000168   0x08000168   0x00000000   Code   RO          157    .ARM.Collect$$rtentry$$00000002  c_w.l(__rtentry2.o)
-    0x08000168   0x08000168   0x00000006   Code   RO          169    .ARM.Collect$$rtentry$$00000004  c_w.l(__rtentry4.o)
-    0x0800016e   0x0800016e   0x00000000   Code   RO          159    .ARM.Collect$$rtentry$$00000009  c_w.l(__rtentry2.o)
-    0x0800016e   0x0800016e   0x00000004   Code   RO          160    .ARM.Collect$$rtentry$$0000000A  c_w.l(__rtentry2.o)
-    0x08000172   0x08000172   0x00000000   Code   RO          162    .ARM.Collect$$rtentry$$0000000C  c_w.l(__rtentry2.o)
-    0x08000172   0x08000172   0x00000008   Code   RO          163    .ARM.Collect$$rtentry$$0000000D  c_w.l(__rtentry2.o)
-    0x0800017a   0x0800017a   0x00000002   Code   RO          184    .ARM.Collect$$rtexit$$00000000  c_w.l(rtexit.o)
-    0x0800017c   0x0800017c   0x00000000   Code   RO          234    .ARM.Collect$$rtexit$$00000002  c_w.l(rtexit2.o)
-    0x0800017c   0x0800017c   0x00000004   Code   RO          235    .ARM.Collect$$rtexit$$00000003  c_w.l(rtexit2.o)
-    0x08000180   0x08000180   0x00000006   Code   RO          236    .ARM.Collect$$rtexit$$00000004  c_w.l(rtexit2.o)
+    0x08000144   0x08000144   0x0000001c   Code   RO          324    !!handler_zi        c_w.l(__scatter_zi.o)
+    0x08000160   0x08000160   0x00000002   Code   RO          182    .ARM.Collect$$libinit$$00000000  c_w.l(libinit.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          189    .ARM.Collect$$libinit$$00000002  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          191    .ARM.Collect$$libinit$$00000004  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          193    .ARM.Collect$$libinit$$00000006  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          196    .ARM.Collect$$libinit$$0000000C  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          198    .ARM.Collect$$libinit$$0000000E  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          200    .ARM.Collect$$libinit$$00000010  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          203    .ARM.Collect$$libinit$$00000013  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          205    .ARM.Collect$$libinit$$00000015  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          207    .ARM.Collect$$libinit$$00000017  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          209    .ARM.Collect$$libinit$$00000019  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          211    .ARM.Collect$$libinit$$0000001B  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          213    .ARM.Collect$$libinit$$0000001D  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          215    .ARM.Collect$$libinit$$0000001F  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          217    .ARM.Collect$$libinit$$00000021  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          219    .ARM.Collect$$libinit$$00000023  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          221    .ARM.Collect$$libinit$$00000025  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          223    .ARM.Collect$$libinit$$00000027  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          227    .ARM.Collect$$libinit$$0000002E  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          229    .ARM.Collect$$libinit$$00000030  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          231    .ARM.Collect$$libinit$$00000032  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          233    .ARM.Collect$$libinit$$00000034  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000002   Code   RO          234    .ARM.Collect$$libinit$$00000035  c_w.l(libinit2.o)
+    0x08000164   0x08000164   0x00000002   Code   RO          256    .ARM.Collect$$libshutdown$$00000000  c_w.l(libshutdown.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          271    .ARM.Collect$$libshutdown$$00000002  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          273    .ARM.Collect$$libshutdown$$00000004  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          276    .ARM.Collect$$libshutdown$$00000007  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          279    .ARM.Collect$$libshutdown$$0000000A  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          281    .ARM.Collect$$libshutdown$$0000000C  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          284    .ARM.Collect$$libshutdown$$0000000F  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000002   Code   RO          285    .ARM.Collect$$libshutdown$$00000010  c_w.l(libshutdown2.o)
+    0x08000168   0x08000168   0x00000000   Code   RO          157    .ARM.Collect$$rtentry$$00000000  c_w.l(__rtentry.o)
+    0x08000168   0x08000168   0x00000000   Code   RO          159    .ARM.Collect$$rtentry$$00000002  c_w.l(__rtentry2.o)
+    0x08000168   0x08000168   0x00000006   Code   RO          171    .ARM.Collect$$rtentry$$00000004  c_w.l(__rtentry4.o)
+    0x0800016e   0x0800016e   0x00000000   Code   RO          161    .ARM.Collect$$rtentry$$00000009  c_w.l(__rtentry2.o)
+    0x0800016e   0x0800016e   0x00000004   Code   RO          162    .ARM.Collect$$rtentry$$0000000A  c_w.l(__rtentry2.o)
+    0x08000172   0x08000172   0x00000000   Code   RO          164    .ARM.Collect$$rtentry$$0000000C  c_w.l(__rtentry2.o)
+    0x08000172   0x08000172   0x00000008   Code   RO          165    .ARM.Collect$$rtentry$$0000000D  c_w.l(__rtentry2.o)
+    0x0800017a   0x0800017a   0x00000002   Code   RO          186    .ARM.Collect$$rtexit$$00000000  c_w.l(rtexit.o)
+    0x0800017c   0x0800017c   0x00000000   Code   RO          236    .ARM.Collect$$rtexit$$00000002  c_w.l(rtexit2.o)
+    0x0800017c   0x0800017c   0x00000004   Code   RO          237    .ARM.Collect$$rtexit$$00000003  c_w.l(rtexit2.o)
+    0x08000180   0x08000180   0x00000006   Code   RO          238    .ARM.Collect$$rtexit$$00000004  c_w.l(rtexit2.o)
     0x08000186   0x08000186   0x00000002   PAD
-    0x08000188   0x08000188   0x00000040   Code   RO          112  * .text               startup_stm32f10x_md.o
-    0x080001c8   0x080001c8   0x00000006   Code   RO          151    .text               c_w.l(heapauxi.o)
-    0x080001ce   0x080001ce   0x0000004a   Code   RO          171    .text               c_w.l(sys_stackheap_outer.o)
-    0x08000218   0x08000218   0x00000012   Code   RO          173    .text               c_w.l(exit.o)
+    0x08000188   0x08000188   0x00000040   Code   RO          114  * .text               startup_stm32f10x_md.o
+    0x080001c8   0x080001c8   0x00000006   Code   RO          153    .text               c_w.l(heapauxi.o)
+    0x080001ce   0x080001ce   0x0000004a   Code   RO          173    .text               c_w.l(sys_stackheap_outer.o)
+    0x08000218   0x08000218   0x00000012   Code   RO          175    .text               c_w.l(exit.o)
     0x0800022a   0x0800022a   0x00000002   PAD
-    0x0800022c   0x0800022c   0x00000008   Code   RO          181    .text               c_w.l(libspace.o)
-    0x08000234   0x08000234   0x0000000c   Code   RO          244    .text               c_w.l(sys_exit.o)
-    0x08000240   0x08000240   0x00000002   Code   RO          259    .text               c_w.l(use_no_semi.o)
-    0x08000242   0x08000242   0x00000000   Code   RO          261    .text               c_w.l(indicate_semi.o)
+    0x0800022c   0x0800022c   0x00000008   Code   RO          183    .text               c_w.l(libspace.o)
+    0x08000234   0x08000234   0x0000000c   Code   RO          246    .text               c_w.l(sys_exit.o)
+    0x08000240   0x08000240   0x00000002   Code   RO          261    .text               c_w.l(use_no_semi.o)
+    0x08000242   0x08000242   0x00000000   Code   RO          263    .text               c_w.l(indicate_semi.o)
     0x08000242   0x08000242   0x00000002   PAD
-    0x08000244   0x08000244   0x0000001c   Code   RO           82    .text.ADC1_2_IRQHandler  driver_adc.o
-    0x08000260   0x08000260   0x00000002   Code   RO           37    .text.Bug           driver_timer.o
+    0x08000244   0x08000244   0x0000001c   Code   RO           84    .text.ADC1_2_IRQHandler  driver_adc.o
+    0x08000260   0x08000260   0x00000002   Code   RO           39    .text.Bug           driver_timer.o
     0x08000262   0x08000262   0x00000002   PAD
-    0x08000264   0x08000264   0x00000110   Code   RO          119    .text.SystemInit    system_stm32f10x.o
-    0x08000374   0x08000374   0x0000001a   Code   RO           41    .text.TIM2_IRQHandler  driver_timer.o
+    0x08000264   0x08000264   0x00000110   Code   RO          121    .text.SystemInit    system_stm32f10x.o
+    0x08000374   0x08000374   0x0000001a   Code   RO           43    .text.TIM2_IRQHandler  driver_timer.o
     0x0800038e   0x0800038e   0x00000002   PAD
-    0x08000390   0x08000390   0x0000001c   Code   RO           43    .text.TIM3_IRQHandler  driver_timer.o
-    0x080003ac   0x080003ac   0x0000001c   Code   RO           45    .text.TIM4_IRQHandler  driver_timer.o
-    0x080003c8   0x080003c8   0x0000000e   Code   RO           64    .text.USART3_IRQHandler  driver_uart.o
+    0x08000390   0x08000390   0x0000001c   Code   RO           45    .text.TIM3_IRQHandler  driver_timer.o
+    0x080003ac   0x080003ac   0x0000001c   Code   RO           47    .text.TIM4_IRQHandler  driver_timer.o
+    0x080003c8   0x080003c8   0x0000000e   Code   RO           66    .text.USART3_IRQHandler  driver_uart.o
     0x080003d6   0x080003d6   0x00000002   PAD
-    0x080003d8   0x080003d8   0x0000004e   Code   RO           95    .text.driver_IMU_init  driver_imu.o
+    0x080003d8   0x080003d8   0x0000004e   Code   RO           97    .text.driver_IMU_init  driver_imu.o
     0x08000426   0x08000426   0x00000002   PAD
-    0x08000428   0x08000428   0x00000030   Code   RO           97    .text.driver_IMU_read  driver_imu.o
-    0x08000458   0x08000458   0x00000012   Code   RO           78    .text.driver_adc_1_launch_read  driver_adc.o
+    0x08000428   0x08000428   0x00000030   Code   RO           99    .text.driver_IMU_read  driver_imu.o
+    0x08000458   0x08000458   0x00000012   Code   RO           80    .text.driver_adc_1_launch_read  driver_adc.o
     0x0800046a   0x0800046a   0x00000002   PAD
-    0x0800046c   0x0800046c   0x00000002   Code   RO           74    .text.erreur        driver_adc.o
+    0x0800046c   0x0800046c   0x00000002   Code   RO           76    .text.erreur        driver_adc.o
     0x0800046e   0x0800046e   0x00000002   PAD
     0x08000470   0x08000470   0x0000001c   Code   RO            2    .text.main          main.o
-    0x0800048c   0x0800048c   0x00000030   Code   RO          135    i.MySPI_Clear_NSS   Lib_Com_Periph_2022.lib(myspi.o)
-    0x080004bc   0x080004bc   0x000001f4   Code   RO          136    i.MySPI_Init        Lib_Com_Periph_2022.lib(myspi.o)
-    0x080006b0   0x080006b0   0x00000054   Code   RO          137    i.MySPI_Read        Lib_Com_Periph_2022.lib(myspi.o)
-    0x08000704   0x08000704   0x00000050   Code   RO          138    i.MySPI_Send        Lib_Com_Periph_2022.lib(myspi.o)
-    0x08000754   0x08000754   0x0000002c   Code   RO          139    i.MySPI_Set_NSS     Lib_Com_Periph_2022.lib(myspi.o)
-    0x08000780   0x08000780   0x00000020   Data   RO          317    Region$$Table       anon$$obj.o
+    0x0800048c   0x0800048c   0x00000030   Code   RO          137    i.MySPI_Clear_NSS   Lib_Com_Periph_2022.lib(myspi.o)
+    0x080004bc   0x080004bc   0x000001f4   Code   RO          138    i.MySPI_Init        Lib_Com_Periph_2022.lib(myspi.o)
+    0x080006b0   0x080006b0   0x00000054   Code   RO          139    i.MySPI_Read        Lib_Com_Periph_2022.lib(myspi.o)
+    0x08000704   0x08000704   0x00000050   Code   RO          140    i.MySPI_Send        Lib_Com_Periph_2022.lib(myspi.o)
+    0x08000754   0x08000754   0x0000002c   Code   RO          141    i.MySPI_Set_NSS     Lib_Com_Periph_2022.lib(myspi.o)
+    0x08000780   0x08000780   0x00000020   Data   RO          319    Region$$Table       anon$$obj.o
 
 
     Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x080007a0, Size: 0x00000014, Max: 0xffffffff, ABSOLUTE)
 
     Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
 
-    0x20000000   0x080007a0   0x00000004   Data   RW          140    .data               Lib_Com_Periph_2022.lib(myspi.o)
-    0x20000004   0x080007a4   0x00000004   Data   RW           84    .data.ADC1_2_fx     driver_adc.o
-    0x20000008   0x080007a8   0x00000004   Data   RW           47    .data.TIM2_fx       driver_timer.o
-    0x2000000c   0x080007ac   0x00000004   Data   RW           48    .data.TIM3_fx       driver_timer.o
-    0x20000010   0x080007b0   0x00000004   Data   RW           49    .data.TIM4_fx       driver_timer.o
+    0x20000000   0x080007a0   0x00000004   Data   RW          142    .data               Lib_Com_Periph_2022.lib(myspi.o)
+    0x20000004   0x080007a4   0x00000004   Data   RW           86    .data.ADC1_2_fx     driver_adc.o
+    0x20000008   0x080007a8   0x00000004   Data   RW           49    .data.TIM2_fx       driver_timer.o
+    0x2000000c   0x080007ac   0x00000004   Data   RW           50    .data.TIM3_fx       driver_timer.o
+    0x20000010   0x080007b0   0x00000004   Data   RW           51    .data.TIM4_fx       driver_timer.o
 
 
     Execution Region ER_ZI (Exec base: 0x20000018, Load base: 0x080007b4, Size: 0x00000660, Max: 0xffffffff, ABSOLUTE)
 
     Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
 
-    0x20000018        -       0x00000060   Zero   RW          182    .bss                c_w.l(libspace.o)
-    0x20000078        -       0x00000200   Zero   RW          110    HEAP                startup_stm32f10x_md.o
-    0x20000278        -       0x00000400   Zero   RW          109    STACK               startup_stm32f10x_md.o
+    0x20000018        -       0x00000060   Zero   RW          184    .bss                c_w.l(libspace.o)
+    0x20000078        -       0x00000200   Zero   RW          112    HEAP                startup_stm32f10x_md.o
+    0x20000278        -       0x00000400   Zero   RW          111    STACK               startup_stm32f10x_md.o
+=======
+  Load Region LR_1 (Base: 0x08000000, Size: 0x000006b8, Max: 0xffffffff, ABSOLUTE)
+=======
+  Load Region LR_1 (Base: 0x08000000, Size: 0x00000714, Max: 0xffffffff, ABSOLUTE)
+>>>>>>> encoder
+
+    Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000704, Max: 0xffffffff, ABSOLUTE)
+
+    Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
+
+    0x08000000   0x08000000   0x000000ec   Data   RO          116    RESET               startup_stm32f10x_md.o
+    0x080000ec   0x080000ec   0x00000008   Code   RO          141  * !!!main             c_w.l(__main.o)
+    0x080000f4   0x080000f4   0x00000034   Code   RO          306    !!!scatter          c_w.l(__scatter.o)
+    0x08000128   0x08000128   0x0000001a   Code   RO          308    !!handler_copy      c_w.l(__scatter_copy.o)
+    0x08000142   0x08000142   0x00000002   PAD
+    0x08000144   0x08000144   0x0000001c   Code   RO          310    !!handler_zi        c_w.l(__scatter_zi.o)
+    0x08000160   0x08000160   0x00000002   Code   RO          168    .ARM.Collect$$libinit$$00000000  c_w.l(libinit.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          175    .ARM.Collect$$libinit$$00000002  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          177    .ARM.Collect$$libinit$$00000004  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          179    .ARM.Collect$$libinit$$00000006  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          182    .ARM.Collect$$libinit$$0000000C  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          184    .ARM.Collect$$libinit$$0000000E  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          186    .ARM.Collect$$libinit$$00000010  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          189    .ARM.Collect$$libinit$$00000013  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          191    .ARM.Collect$$libinit$$00000015  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          193    .ARM.Collect$$libinit$$00000017  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          195    .ARM.Collect$$libinit$$00000019  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          197    .ARM.Collect$$libinit$$0000001B  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          199    .ARM.Collect$$libinit$$0000001D  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          201    .ARM.Collect$$libinit$$0000001F  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          203    .ARM.Collect$$libinit$$00000021  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          205    .ARM.Collect$$libinit$$00000023  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          207    .ARM.Collect$$libinit$$00000025  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          209    .ARM.Collect$$libinit$$00000027  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          213    .ARM.Collect$$libinit$$0000002E  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          215    .ARM.Collect$$libinit$$00000030  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          217    .ARM.Collect$$libinit$$00000032  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          219    .ARM.Collect$$libinit$$00000034  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000002   Code   RO          220    .ARM.Collect$$libinit$$00000035  c_w.l(libinit2.o)
+    0x08000164   0x08000164   0x00000002   Code   RO          242    .ARM.Collect$$libshutdown$$00000000  c_w.l(libshutdown.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          257    .ARM.Collect$$libshutdown$$00000002  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          259    .ARM.Collect$$libshutdown$$00000004  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          262    .ARM.Collect$$libshutdown$$00000007  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          265    .ARM.Collect$$libshutdown$$0000000A  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          267    .ARM.Collect$$libshutdown$$0000000C  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          270    .ARM.Collect$$libshutdown$$0000000F  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000002   Code   RO          271    .ARM.Collect$$libshutdown$$00000010  c_w.l(libshutdown2.o)
+    0x08000168   0x08000168   0x00000000   Code   RO          143    .ARM.Collect$$rtentry$$00000000  c_w.l(__rtentry.o)
+    0x08000168   0x08000168   0x00000000   Code   RO          145    .ARM.Collect$$rtentry$$00000002  c_w.l(__rtentry2.o)
+    0x08000168   0x08000168   0x00000006   Code   RO          157    .ARM.Collect$$rtentry$$00000004  c_w.l(__rtentry4.o)
+    0x0800016e   0x0800016e   0x00000000   Code   RO          147    .ARM.Collect$$rtentry$$00000009  c_w.l(__rtentry2.o)
+    0x0800016e   0x0800016e   0x00000004   Code   RO          148    .ARM.Collect$$rtentry$$0000000A  c_w.l(__rtentry2.o)
+    0x08000172   0x08000172   0x00000000   Code   RO          150    .ARM.Collect$$rtentry$$0000000C  c_w.l(__rtentry2.o)
+    0x08000172   0x08000172   0x00000008   Code   RO          151    .ARM.Collect$$rtentry$$0000000D  c_w.l(__rtentry2.o)
+    0x0800017a   0x0800017a   0x00000002   Code   RO          172    .ARM.Collect$$rtexit$$00000000  c_w.l(rtexit.o)
+    0x0800017c   0x0800017c   0x00000000   Code   RO          222    .ARM.Collect$$rtexit$$00000002  c_w.l(rtexit2.o)
+    0x0800017c   0x0800017c   0x00000004   Code   RO          223    .ARM.Collect$$rtexit$$00000003  c_w.l(rtexit2.o)
+    0x08000180   0x08000180   0x00000006   Code   RO          224    .ARM.Collect$$rtexit$$00000004  c_w.l(rtexit2.o)
+    0x08000186   0x08000186   0x00000002   PAD
+    0x08000188   0x08000188   0x00000040   Code   RO          117  * .text               startup_stm32f10x_md.o
+    0x080001c8   0x080001c8   0x00000006   Code   RO          139    .text               c_w.l(heapauxi.o)
+    0x080001ce   0x080001ce   0x0000004a   Code   RO          159    .text               c_w.l(sys_stackheap_outer.o)
+    0x08000218   0x08000218   0x00000012   Code   RO          161    .text               c_w.l(exit.o)
+    0x0800022a   0x0800022a   0x00000002   PAD
+    0x0800022c   0x0800022c   0x00000008   Code   RO          169    .text               c_w.l(libspace.o)
+    0x08000234   0x08000234   0x0000000c   Code   RO          232    .text               c_w.l(sys_exit.o)
+    0x08000240   0x08000240   0x00000002   Code   RO          247    .text               c_w.l(use_no_semi.o)
+    0x08000242   0x08000242   0x00000000   Code   RO          249    .text               c_w.l(indicate_semi.o)
+    0x08000242   0x08000242   0x00000002   PAD
+    0x08000244   0x08000244   0x0000001c   Code   RO          104    .text.ADC1_2_IRQHandler  driver_adc.o
+    0x08000260   0x08000260   0x0000001a   Code   RO           13    .text.App_Girouette_GetDirection  app_girouette.o
+    0x0800027a   0x0800027a   0x00000002   PAD
+    0x0800027c   0x0800027c   0x00000050   Code   RO           11    .text.App_Girouette_Init  app_girouette.o
+    0x080002cc   0x080002cc   0x00000002   Code   RO           53    .text.Bug           driver_timer.o
+    0x080002ce   0x080002ce   0x00000002   PAD
+    0x080002d0   0x080002d0   0x00000002   Code   RO           67    .text.EXTI3_IRQHandler  driver_timer.o
+    0x080002d2   0x080002d2   0x00000002   PAD
+    0x080002d4   0x080002d4   0x0000009c   Code   RO           23    .text.MyGPIO_Init   driver_gpio.o
+    0x08000370   0x08000370   0x0000008c   Code   RO           41    .text.MyTimer_Base_Init  driver_timer.o
+    0x080003fc   0x080003fc   0x000000a8   Code   RO           51    .text.MyTimer_ConfigureEncoder  driver_timer.o
+    0x080004a4   0x080004a4   0x0000000c   Code   RO           43    .text.MyTimer_Start  driver_timer.o
+    0x080004b0   0x080004b0   0x0000004c   Code   RO           80    .text.MyUART_Init   driver_uart.o
+    0x080004fc   0x080004fc   0x00000016   Code   RO           82    .text.MyUART_SendByte  driver_uart.o
+    0x08000512   0x08000512   0x00000002   PAD
+    0x08000514   0x08000514   0x00000110   Code   RO          124    .text.SystemInit    system_stm32f10x.o
+    0x08000624   0x08000624   0x0000001a   Code   RO           59    .text.TIM2_IRQHandler  driver_timer.o
+    0x0800063e   0x0800063e   0x00000002   PAD
+    0x08000640   0x08000640   0x0000001c   Code   RO           61    .text.TIM3_IRQHandler  driver_timer.o
+    0x0800065c   0x0800065c   0x0000001c   Code   RO           63    .text.TIM4_IRQHandler  driver_timer.o
+    0x08000678   0x08000678   0x00000004   Code   RO           57    .text.TIM_GetCounter  driver_timer.o
+    0x0800067c   0x0800067c   0x0000000e   Code   RO           86    .text.USART3_IRQHandler  driver_uart.o
+    0x0800068a   0x0800068a   0x00000002   PAD
+    0x0800068c   0x0800068c   0x00000002   Code   RO           96    .text.erreur        driver_adc.o
+    0x0800068e   0x0800068e   0x00000002   PAD
+    0x08000690   0x08000690   0x00000052   Code   RO            2    .text.main          main.o
+    0x080006e2   0x080006e2   0x00000002   PAD
+    0x080006e4   0x080006e4   0x00000020   Data   RO          305    Region$$Table       anon$$obj.o
+
+
+    Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000704, Size: 0x00000010, Max: 0xffffffff, ABSOLUTE)
+
+    Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
+
+    0x20000000   0x08000704   0x00000004   Data   RW          106    .data.ADC1_2_fx     driver_adc.o
+    0x20000004   0x08000708   0x00000004   Data   RW           69    .data.TIM2_fx       driver_timer.o
+    0x20000008   0x0800070c   0x00000004   Data   RW           70    .data.TIM3_fx       driver_timer.o
+    0x2000000c   0x08000710   0x00000004   Data   RW           71    .data.TIM4_fx       driver_timer.o
+
+
+    Execution Region ER_ZI (Exec base: 0x20000010, Load base: 0x08000714, Size: 0x00000660, Max: 0xffffffff, ABSOLUTE)
+
+    Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
+
+<<<<<<< HEAD
+    0x20000010        -       0x00000060   Zero   RW          156    .bss                c_w.l(libspace.o)
+    0x20000070        -       0x00000200   Zero   RW          101    HEAP                startup_stm32f10x_md.o
+    0x20000270        -       0x00000400   Zero   RW          100    STACK               startup_stm32f10x_md.o
+>>>>>>> encoder
+=======
+    0x20000010        -       0x00000060   Zero   RW          170    .bss                c_w.l(libspace.o)
+    0x20000070        -       0x00000200   Zero   RW          115    HEAP                startup_stm32f10x_md.o
+    0x20000270        -       0x00000400   Zero   RW          114    STACK               startup_stm32f10x_md.o
+>>>>>>> encoder
 
 
 ==============================================================================
@@ -710,18 +979,43 @@ Image component sizes
 
       Code (inc. data)   RO Data    RW Data    ZI Data      Debug   Object Name
 
+<<<<<<< HEAD
+<<<<<<< HEAD
         48          0          0          4          0       4525   driver_adc.o
        126          0          0          0          0       2309   driver_imu.o
-        84          0          0         12          0       6810   driver_timer.o
+        84          0          0         12          0       6988   driver_timer.o
         14          0          0          0          0       2250   driver_uart.o
         28          0          0          0          0       1165   main.o
+=======
+        30          0          0          4          0       4524   driver_adc.o
+       156         16          0          0          0       2108   driver_gpio.o
+       406          0          0         12          0       8028   driver_timer.o
+        90          0          0          0          0       2250   driver_uart.o
+       126          0          0          0          0       2548   main.o
+>>>>>>> encoder
+=======
+       106          0          0          0          0       2427   app_girouette.o
+        30          0          0          4          0       4524   driver_adc.o
+       156         16          0          0          0       2108   driver_gpio.o
+       410          0          0         12          0       8169   driver_timer.o
+       112          0          0          0          0       2250   driver_uart.o
+        82          0          0          0          0       1572   main.o
+>>>>>>> encoder
         64         26        236          0       1536        864   startup_stm32f10x_md.o
        272          0          0          0          0       2813   system_stm32f10x.o
 
     ----------------------------------------------------------------------
-       648         26        268         16       1536      20736   Object Totals
+<<<<<<< HEAD
+<<<<<<< HEAD
+       648         26        268         16       1536      20914   Object Totals
+=======
+      1156         42        268         16       1536      23135   Object Totals
+>>>>>>> encoder
+=======
+      1248         42        268         16       1536      24727   Object Totals
+>>>>>>> encoder
          0          0         32          0          0          0   (incl. Generated)
-        12          0          0          0          0          0   (incl. Padding)
+        16          0          0          0          0          0   (incl. Padding)
 
     ----------------------------------------------------------------------
 
@@ -770,8 +1064,10 @@ Image component sizes
 
       Code (inc. data)   RO Data    RW Data    ZI Data      Debug   
 
-      1684        122        268         20       1632      21304   Grand Totals
-      1684        122        268         20       1632      21304   ELF Image Totals
+<<<<<<< HEAD
+<<<<<<< HEAD
+      1684        122        268         20       1632      21482   Grand Totals
+      1684        122        268         20       1632      21482   ELF Image Totals
       1684        122        268         20          0          0   ROM Totals
 
 ==============================================================================
@@ -779,6 +1075,26 @@ Image component sizes
     Total RO  Size (Code + RO Data)                 1952 (   1.91kB)
     Total RW  Size (RW Data + ZI Data)              1652 (   1.61kB)
     Total ROM Size (Code + RO Data + RW Data)       1972 (   1.93kB)
+=======
+      1436         58        268         16       1632      23511   Grand Totals
+      1436         58        268         16       1632      23511   ELF Image Totals
+      1436         58        268         16          0          0   ROM Totals
+=======
+      1528         58        268         16       1632      25083   Grand Totals
+      1528         58        268         16       1632      25083   ELF Image Totals
+      1528         58        268         16          0          0   ROM Totals
+>>>>>>> encoder
+
+==============================================================================
+
+    Total RO  Size (Code + RO Data)                 1796 (   1.75kB)
+    Total RW  Size (RW Data + ZI Data)              1648 (   1.61kB)
+<<<<<<< HEAD
+    Total ROM Size (Code + RO Data + RW Data)       1720 (   1.68kB)
+>>>>>>> encoder
+=======
+    Total ROM Size (Code + RO Data + RW Data)       1812 (   1.77kB)
+>>>>>>> encoder
 
 ==============================================================================
 

projet-voilier/Objects/driver_gpio.d

@@ -1,6 +1,6 @@
 ./objects/driver_gpio.o: ..\driver\Driver_GPIO.c ..\driver\Driver_GPIO.h \
   C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h \
-  RTE\_sim\RTE_Components.h \
+  RTE\_reel\RTE_Components.h \
   C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h \
   C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\stdint.h \
   C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h \

projet-voilier/Objects/driver_timer.d

@@ -1,7 +1,7 @@
 ./objects/driver_timer.o: ..\driver\Driver_Timer.c \
   ..\driver\Driver_Timer.h \
   C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h \
-  RTE\_sim\RTE_Components.h \
+  RTE\_reel\RTE_Components.h \
   C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h \
   C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\stdint.h \
   C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h \

projet-voilier/Objects/driver_uart.d

@@ -1,6 +1,6 @@
 ./objects/driver_uart.o: ..\driver\Driver_UART.c ..\driver\Driver_UART.h \
   C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h \
-  RTE\_sim\RTE_Components.h \
+  RTE\_reel\RTE_Components.h \
   C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h \
   C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\stdint.h \
   C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h \

projet-voilier/Objects/main.d

@@ -1,6 +1,6 @@
 ./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 \
+  RTE\_reel\RTE_Components.h \
   C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h \
   C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\stdint.h \
   C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h \
@@ -9,4 +9,4 @@
   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 ..\driver\Driver_ADC.h ..\driver\MySPI.h \
-  ..\driver\Driver_IMU.h
+  ..\driver\Driver_IMU.h src\App_girouette.h

projet-voilier/Objects/projet-voilier.build_log.htm

@@ -22,22 +22,103 @@ Dialog DLL:      TARMSTM.DLL V1.67.1.0
  
 <h2>Project:</h2>
 C:\Users\robin\OneDrive\Documents\Dev\Projet-Voilier-3\projet-voilier\projet-voilier.uvprojx
-Project File Date:  04/07/2023
+Project File Date:  04/11/2023
 
 <h2>Output:</h2>
 *** Using Compiler 'V6.19', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
 Rebuild target 'sim'
 assembling startup_stm32f10x_md.s...
+<<<<<<< HEAD
+src/main.c(16): error: unknown type name 'Encoder'
+Encoder->Timer = TIM4;
+^
+src/main.c(16): error: expected identifier or '('
+Encoder->Timer = TIM4;
+       ^
+src/main.c(17): error: expected parameter declarator
+MyTimer_Base_Init(&Encoder);
+                  ^
+src/main.c(17): error: expected ')'
+src/main.c(17): note: to match this '('
+MyTimer_Base_Init(&Encoder);
+                 ^
+src/main.c(17): warning: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a previous declaration [-Wdeprecated-non-prototype]
+MyTimer_Base_Init(&Encoder);
+^
+../driver\Driver_Timer.h(20): note: conflicting prototype is here
+void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer);
+     ^
+src/main.c(17): error: conflicting types for 'MyTimer_Base_Init'
+MyTimer_Base_Init(&Encoder);
+^
+../driver\Driver_Timer.h(20): note: previous declaration is here
+void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer);
+     ^
+src/main.c(18): error: expected parameter declarator
+MyTimer_ConfigureEncoder(&Encoder);
+                         ^
+src/main.c(18): error: expected ')'
+src/main.c(18): note: to match this '('
+MyTimer_ConfigureEncoder(&Encoder);
+                        ^
+src/main.c(18): warning: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a previous declaration [-Wdeprecated-non-prototype]
+MyTimer_ConfigureEncoder(&Encoder);
+^
+../driver\Driver_Timer.h(68): note: conflicting prototype is here
+void MyTimer_ConfigureEncoder(MyTimer_Struct_TypeDef *Timer);
+     ^
+src/main.c(18): error: conflicting types for 'MyTimer_ConfigureEncoder'
+MyTimer_ConfigureEncoder(&Encoder);
+^
+../driver\Driver_Timer.h(68): note: previous declaration is here
+void MyTimer_ConfigureEncoder(MyTimer_Struct_TypeDef *Timer);
+     ^
+src/main.c(19): error: expected parameter declarator
+MyTimer_Start(&Encoder);
+              ^
+src/main.c(19): error: expected ')'
+src/main.c(19): note: to match this '('
+MyTimer_Start(&Encoder);
+             ^
+src/main.c(19): warning: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a previous declaration [-Wdeprecated-non-prototype]
+MyTimer_Start(&Encoder);
+^
+../driver\Driver_Timer.h(29): note: conflicting prototype is here
+void MyTimer_Start(MyTimer_Struct_TypeDef * Timer);
+     ^
+src/main.c(19): error: conflicting types for 'MyTimer_Start'
+MyTimer_Start(&Encoder);
+^
+../driver\Driver_Timer.h(29): note: previous declaration is here
+void MyTimer_Start(MyTimer_Struct_TypeDef * Timer);
+     ^
+3 warnings and 11 errors generated.
+=======
+compiling App_girouette.c...
+compiling Driver_UART.c...
+compiling Driver_ADC.c...
+>>>>>>> encoder
+compiling main.c...
+<<<<<<< HEAD
+compiling Driver_ADC.c...
 compiling Driver_UART.c...
 compiling Driver_IMU.c...
+=======
+>>>>>>> encoder
 compiling Driver_GPIO.c...
-compiling main.c...
-compiling Driver_ADC.c...
 compiling Driver_Timer.c...
+<<<<<<< HEAD
+<<<<<<< HEAD
 compiling system_stm32f10x.c...
+".\Objects\projet-voilier.axf" - 11 Error(s), 3 Warning(s).
+=======
+=======
+compiling system_stm32f10x.c...
+>>>>>>> encoder
 linking...
-Program Size: Code=1684 RO-data=268 RW-data=20 ZI-data=1632  
+Program Size: Code=1528 RO-data=268 RW-data=16 ZI-data=1632  
 ".\Objects\projet-voilier.axf" - 0 Error(s), 0 Warning(s).
+>>>>>>> encoder
 
 <h2>Software Packages used:</h2>
 
@@ -64,11 +145,15 @@ Package Vendor: Keil
    * Component: ARM::CMSIS:CORE:5.6.0
 
    * Component: Keil::Device:Startup:1.0.0
-      Include file:  RTE_Driver/Config/RTE_Device.h
-      Source file:   Device/Source/system_stm32f10x.c
-      Source file:   Device/Source/ARM/STM32F1xx_OPT.s
       Source file:   Device/Source/ARM/startup_stm32f10x_md.s
-Build Time Elapsed:  00:00:00
+<<<<<<< HEAD
+Target not created.
+=======
+      Source file:   Device/Source/system_stm32f10x.c
+      Include file:  RTE_Driver/Config/RTE_Device.h
+      Source file:   Device/Source/ARM/STM32F1xx_OPT.s
+>>>>>>> encoder
+Build Time Elapsed:  00:00:01
 </pre>
 </body>
 </html>

projet-voilier/Objects/projet-voilier.htm

@@ -3,11 +3,25 @@
 <title>Static Call Graph - [.\Objects\projet-voilier.axf]</title></head>
 <body><HR>
 <H1>Static Call Graph for image .\Objects\projet-voilier.axf</H1><HR>
-<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 6190004: Last Updated: Fri Apr  7 14:26:52 2023
+<<<<<<< HEAD
+<<<<<<< HEAD
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 6190004: Last Updated: Fri Apr  7 14:37:03 2023
 <BR><P>
 <H3>Maximum Stack Usage =         24 bytes + Unknown(Functions without stacksize, Cycles, Untraceable Function Pointers)</H3><H3>
+=======
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 6190004: Last Updated: Tue Apr 11 09:10:04 2023
+<BR><P>
+<H3>Maximum Stack Usage =         56 bytes + Unknown(Functions without stacksize, Cycles, Untraceable Function Pointers)</H3><H3>
+>>>>>>> encoder
 Call chain for Maximum Stack Depth:</H3>
 __rt_entry_main &rArr; main &rArr; driver_IMU_read
+=======
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 6190004: Last Updated: Tue Apr 11 10:57:51 2023
+<BR><P>
+<H3>Maximum Stack Usage =         72 bytes + Unknown(Functions without stacksize, Cycles, Untraceable Function Pointers)</H3><H3>
+Call chain for Maximum Stack Depth:</H3>
+__rt_entry_main &rArr; main &rArr; App_Girouette_Init &rArr; MyGPIO_Init
+>>>>>>> encoder
 <P>
 <H3>
 Functions with no stack information
@@ -54,7 +68,7 @@ Function Pointers
  <LI><a href="#[32]">EXTI15_10_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[11]">EXTI1_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[12]">EXTI2_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
- <LI><a href="#[13]">EXTI3_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[13]">EXTI3_IRQHandler</a> from driver_timer.o(.text.EXTI3_IRQHandler) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[14]">EXTI4_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[21]">EXTI9_5_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[e]">FLASH_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
@@ -113,9 +127,21 @@ Global Symbols
 <BR><BR>[Calls]<UL><LI><a href="#[3b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__rt_entry
 </UL>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 <P><STRONG><a name="[53]"></a>__scatterload_rt2_thumb_only</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __scatter.o(!!!scatter), UNUSED)
 
 <P><STRONG><a name="[54]"></a>__scatterload_null</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __scatter.o(!!!scatter), UNUSED)
+=======
+<P><STRONG><a name="[50]"></a>__scatterload_rt2_thumb_only</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __scatter.o(!!!scatter), UNUSED)
+
+<P><STRONG><a name="[51]"></a>__scatterload_null</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __scatter.o(!!!scatter), UNUSED)
+>>>>>>> encoder
+=======
+<P><STRONG><a name="[54]"></a>__scatterload_rt2_thumb_only</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __scatter.o(!!!scatter), UNUSED)
+
+<P><STRONG><a name="[55]"></a>__scatterload_null</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __scatter.o(!!!scatter), UNUSED)
+>>>>>>> encoder
 
 <P><STRONG><a name="[3d]"></a>__scatterload_copy</STRONG> (Thumb, 26 bytes, Stack size unknown bytes, __scatter_copy.o(!!handler_copy), UNUSED)
 <BR><BR>[Calls]<UL><LI><a href="#[3d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__scatterload_copy
@@ -123,12 +149,22 @@ Global Symbols
 <BR>[Called By]<UL><LI><a href="#[3d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__scatterload_copy
 </UL>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 <P><STRONG><a name="[55]"></a>__scatterload_zeroinit</STRONG> (Thumb, 28 bytes, Stack size unknown bytes, __scatter_zi.o(!!handler_zi), UNUSED)
+=======
+<P><STRONG><a name="[52]"></a>__scatterload_zeroinit</STRONG> (Thumb, 28 bytes, Stack size unknown bytes, __scatter_zi.o(!!handler_zi), UNUSED)
+>>>>>>> encoder
+=======
+<P><STRONG><a name="[56]"></a>__scatterload_zeroinit</STRONG> (Thumb, 28 bytes, Stack size unknown bytes, __scatter_zi.o(!!handler_zi), UNUSED)
+>>>>>>> encoder
 
 <P><STRONG><a name="[41]"></a>__rt_lib_init</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit.o(.ARM.Collect$$libinit$$00000000))
 <BR><BR>[Called By]<UL><LI><a href="#[40]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__rt_entry_li
 </UL>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 <P><STRONG><a name="[56]"></a>__rt_lib_init_alloca_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000030))
 
 <P><STRONG><a name="[57]"></a>__rt_lib_init_argv_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000002E))
@@ -172,11 +208,65 @@ Global Symbols
 <P><STRONG><a name="[6a]"></a>__rt_lib_init_stdio_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000027))
 
 <P><STRONG><a name="[6b]"></a>__rt_lib_init_user_alloc_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000000E))
+=======
+<P><STRONG><a name="[53]"></a>__rt_lib_init_alloca_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000030))
+=======
+<P><STRONG><a name="[57]"></a>__rt_lib_init_alloca_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000030))
+>>>>>>> encoder
+
+<P><STRONG><a name="[58]"></a>__rt_lib_init_argv_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000002E))
+
+<P><STRONG><a name="[59]"></a>__rt_lib_init_atexit_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000001D))
+
+<P><STRONG><a name="[5a]"></a>__rt_lib_init_clock_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000023))
+
+<P><STRONG><a name="[5b]"></a>__rt_lib_init_cpp_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000034))
+
+<P><STRONG><a name="[5c]"></a>__rt_lib_init_exceptions_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000032))
+
+<P><STRONG><a name="[5d]"></a>__rt_lib_init_fp_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000002))
+
+<P><STRONG><a name="[5e]"></a>__rt_lib_init_fp_trap_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000021))
+
+<P><STRONG><a name="[5f]"></a>__rt_lib_init_getenv_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000025))
+
+<P><STRONG><a name="[60]"></a>__rt_lib_init_heap_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000000C))
+
+<P><STRONG><a name="[61]"></a>__rt_lib_init_lc_collate_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000013))
+
+<P><STRONG><a name="[62]"></a>__rt_lib_init_lc_ctype_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000015))
+
+<P><STRONG><a name="[63]"></a>__rt_lib_init_lc_monetary_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000017))
+
+<P><STRONG><a name="[64]"></a>__rt_lib_init_lc_numeric_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000019))
+
+<P><STRONG><a name="[65]"></a>__rt_lib_init_lc_time_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000001B))
+
+<P><STRONG><a name="[66]"></a>__rt_lib_init_preinit_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000006))
+
+<P><STRONG><a name="[67]"></a>__rt_lib_init_rand_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000010))
+
+<P><STRONG><a name="[68]"></a>__rt_lib_init_relocate_pie_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000004))
+
+<P><STRONG><a name="[69]"></a>__rt_lib_init_return</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000035))
+
+<P><STRONG><a name="[6a]"></a>__rt_lib_init_signal_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000001F))
+
+<P><STRONG><a name="[6b]"></a>__rt_lib_init_stdio_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000027))
+
+<<<<<<< HEAD
+<P><STRONG><a name="[68]"></a>__rt_lib_init_user_alloc_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000000E))
+>>>>>>> encoder
+=======
+<P><STRONG><a name="[6c]"></a>__rt_lib_init_user_alloc_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000000E))
+>>>>>>> encoder
 
 <P><STRONG><a name="[46]"></a>__rt_lib_shutdown</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown.o(.ARM.Collect$$libshutdown$$00000000))
 <BR><BR>[Called By]<UL><LI><a href="#[45]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__rt_exit_ls
 </UL>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 <P><STRONG><a name="[6c]"></a>__rt_lib_shutdown_cpp_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000002))
 
 <P><STRONG><a name="[6d]"></a>__rt_lib_shutdown_fp_trap_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000007))
@@ -190,13 +280,43 @@ Global Symbols
 <P><STRONG><a name="[71]"></a>__rt_lib_shutdown_stdio_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000004))
 
 <P><STRONG><a name="[72]"></a>__rt_lib_shutdown_user_alloc_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$0000000C))
+=======
+<P><STRONG><a name="[69]"></a>__rt_lib_shutdown_cpp_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000002))
+=======
+<P><STRONG><a name="[6d]"></a>__rt_lib_shutdown_cpp_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000002))
+>>>>>>> encoder
+
+<P><STRONG><a name="[6e]"></a>__rt_lib_shutdown_fp_trap_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000007))
+
+<P><STRONG><a name="[6f]"></a>__rt_lib_shutdown_heap_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$0000000F))
+
+<P><STRONG><a name="[70]"></a>__rt_lib_shutdown_return</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000010))
+
+<P><STRONG><a name="[71]"></a>__rt_lib_shutdown_signal_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$0000000A))
+
+<P><STRONG><a name="[72]"></a>__rt_lib_shutdown_stdio_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000004))
+
+<<<<<<< HEAD
+<P><STRONG><a name="[6f]"></a>__rt_lib_shutdown_user_alloc_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$0000000C))
+>>>>>>> encoder
+=======
+<P><STRONG><a name="[73]"></a>__rt_lib_shutdown_user_alloc_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$0000000C))
+>>>>>>> encoder
 
 <P><STRONG><a name="[3b]"></a>__rt_entry</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry.o(.ARM.Collect$$rtentry$$00000000))
 <BR><BR>[Called By]<UL><LI><a href="#[3c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__scatterload_rt2
 <LI><a href="#[36]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__main
 </UL>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 <P><STRONG><a name="[73]"></a>__rt_entry_presh_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$00000002))
+=======
+<P><STRONG><a name="[70]"></a>__rt_entry_presh_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$00000002))
+>>>>>>> encoder
+=======
+<P><STRONG><a name="[74]"></a>__rt_entry_presh_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$00000002))
+>>>>>>> encoder
 
 <P><STRONG><a name="[3e]"></a>__rt_entry_sh</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry4.o(.ARM.Collect$$rtentry$$00000004))
 <BR><BR>[Stack]<UL><LI>Max Depth = 8 + Unknown Stack Size
@@ -209,17 +329,41 @@ Global Symbols
 <BR><BR>[Calls]<UL><LI><a href="#[41]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__rt_lib_init
 </UL>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 <P><STRONG><a name="[74]"></a>__rt_entry_postsh_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$00000009))
 
 <P><STRONG><a name="[42]"></a>__rt_entry_main</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$0000000D))
 <BR><BR>[Stack]<UL><LI>Max Depth = 24 + Unknown Stack Size
 <LI>Call Chain = __rt_entry_main &rArr; main &rArr; driver_IMU_read
+=======
+<P><STRONG><a name="[71]"></a>__rt_entry_postsh_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$00000009))
+
+<P><STRONG><a name="[42]"></a>__rt_entry_main</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$0000000D))
+<BR><BR>[Stack]<UL><LI>Max Depth = 56 + Unknown Stack Size
+<LI>Call Chain = __rt_entry_main &rArr; main &rArr; MyGPIO_Init
+>>>>>>> encoder
+=======
+<P><STRONG><a name="[75]"></a>__rt_entry_postsh_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$00000009))
+
+<P><STRONG><a name="[42]"></a>__rt_entry_main</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$0000000D))
+<BR><BR>[Stack]<UL><LI>Max Depth = 72 + Unknown Stack Size
+<LI>Call Chain = __rt_entry_main &rArr; main &rArr; App_Girouette_Init &rArr; MyGPIO_Init
+>>>>>>> encoder
 </UL>
 <BR>[Calls]<UL><LI><a href="#[44]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;exit
 <LI><a href="#[43]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
 </UL>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 <P><STRONG><a name="[75]"></a>__rt_entry_postli_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$0000000C))
+=======
+<P><STRONG><a name="[72]"></a>__rt_entry_postli_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$0000000C))
+>>>>>>> encoder
+=======
+<P><STRONG><a name="[76]"></a>__rt_entry_postli_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$0000000C))
+>>>>>>> encoder
 
 <P><STRONG><a name="[4a]"></a>__rt_exit</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, rtexit.o(.ARM.Collect$$rtexit$$00000000))
 <BR><BR>[Called By]<UL><LI><a href="#[44]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;exit
@@ -229,7 +373,15 @@ Global Symbols
 <BR><BR>[Calls]<UL><LI><a href="#[46]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__rt_lib_shutdown
 </UL>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 <P><STRONG><a name="[76]"></a>__rt_exit_prels_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, rtexit2.o(.ARM.Collect$$rtexit$$00000002))
+=======
+<P><STRONG><a name="[73]"></a>__rt_exit_prels_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, rtexit2.o(.ARM.Collect$$rtexit$$00000002))
+>>>>>>> encoder
+=======
+<P><STRONG><a name="[77]"></a>__rt_exit_prels_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, rtexit2.o(.ARM.Collect$$rtexit$$00000002))
+>>>>>>> encoder
 
 <P><STRONG><a name="[47]"></a>__rt_exit_exit</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, rtexit2.o(.ARM.Collect$$rtexit$$00000004))
 <BR><BR>[Calls]<UL><LI><a href="#[48]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_sys_exit
@@ -344,9 +496,6 @@ Global Symbols
 <P><STRONG><a name="[12]"></a>EXTI2_IRQHandler</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
 </UL>
-<P><STRONG><a name="[13]"></a>EXTI3_IRQHandler</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
-<BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
-</UL>
 <P><STRONG><a name="[14]"></a>EXTI4_IRQHandler</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
 </UL>
@@ -423,11 +572,27 @@ Global Symbols
 <BR><BR>[Called By]<UL><LI><a href="#[3f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__user_setup_stackheap
 </UL>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 <P><STRONG><a name="[77]"></a>__use_two_region_memory</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED)
 
 <P><STRONG><a name="[78]"></a>__rt_heap_escrow$2region</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED)
 
 <P><STRONG><a name="[79]"></a>__rt_heap_expand$2region</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED)
+=======
+<P><STRONG><a name="[74]"></a>__use_two_region_memory</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED)
+=======
+<P><STRONG><a name="[78]"></a>__use_two_region_memory</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED)
+>>>>>>> encoder
+
+<P><STRONG><a name="[79]"></a>__rt_heap_escrow$2region</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED)
+
+<<<<<<< HEAD
+<P><STRONG><a name="[76]"></a>__rt_heap_expand$2region</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED)
+>>>>>>> encoder
+=======
+<P><STRONG><a name="[7a]"></a>__rt_heap_expand$2region</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED)
+>>>>>>> encoder
 
 <P><STRONG><a name="[3f]"></a>__user_setup_stackheap</STRONG> (Thumb, 74 bytes, Stack size 8 bytes, sys_stackheap_outer.o(.text))
 <BR><BR>[Stack]<UL><LI>Max Depth = 8 + Unknown Stack Size
@@ -448,27 +613,78 @@ Global Symbols
 <BR>[Called By]<UL><LI><a href="#[42]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__rt_entry_main
 </UL>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 <P><STRONG><a name="[7a]"></a>__user_libspace</STRONG> (Thumb, 8 bytes, Stack size 0 bytes, libspace.o(.text), UNUSED)
+=======
+<P><STRONG><a name="[77]"></a>__user_libspace</STRONG> (Thumb, 8 bytes, Stack size 0 bytes, libspace.o(.text), UNUSED)
+>>>>>>> encoder
+=======
+<P><STRONG><a name="[7b]"></a>__user_libspace</STRONG> (Thumb, 8 bytes, Stack size 0 bytes, libspace.o(.text), UNUSED)
+>>>>>>> encoder
 
 <P><STRONG><a name="[49]"></a>__user_perproc_libspace</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, libspace.o(.text))
 <BR><BR>[Called By]<UL><LI><a href="#[3f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__user_setup_stackheap
 </UL>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 <P><STRONG><a name="[7b]"></a>__user_perthread_libspace</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, libspace.o(.text), UNUSED)
+=======
+<P><STRONG><a name="[78]"></a>__user_perthread_libspace</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, libspace.o(.text), UNUSED)
+>>>>>>> encoder
+=======
+<P><STRONG><a name="[7c]"></a>__user_perthread_libspace</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, libspace.o(.text), UNUSED)
+>>>>>>> encoder
 
 <P><STRONG><a name="[48]"></a>_sys_exit</STRONG> (Thumb, 8 bytes, Stack size 0 bytes, sys_exit.o(.text))
 <BR><BR>[Called By]<UL><LI><a href="#[47]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__rt_exit_exit
 </UL>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 <P><STRONG><a name="[7c]"></a>__I$use$semihosting</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, use_no_semi.o(.text), UNUSED)
 
 <P><STRONG><a name="[7d]"></a>__use_no_semihosting_swi</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, use_no_semi.o(.text), UNUSED)
 
 <P><STRONG><a name="[7e]"></a>__semihosting_library_function</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, indicate_semi.o(.text), UNUSED)
+=======
+<P><STRONG><a name="[79]"></a>__I$use$semihosting</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, use_no_semi.o(.text), UNUSED)
+=======
+<P><STRONG><a name="[7d]"></a>__I$use$semihosting</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, use_no_semi.o(.text), UNUSED)
+>>>>>>> encoder
+
+<P><STRONG><a name="[7e]"></a>__use_no_semihosting_swi</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, use_no_semi.o(.text), UNUSED)
+
+<<<<<<< HEAD
+<P><STRONG><a name="[7b]"></a>__semihosting_library_function</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, indicate_semi.o(.text), UNUSED)
+>>>>>>> encoder
+=======
+<P><STRONG><a name="[7f]"></a>__semihosting_library_function</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, indicate_semi.o(.text), UNUSED)
+>>>>>>> encoder
 
 <P><STRONG><a name="[1c]"></a>ADC1_2_IRQHandler</STRONG> (Thumb, 28 bytes, Stack size 0 bytes, driver_adc.o(.text.ADC1_2_IRQHandler))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
 </UL>
+<P><STRONG><a name="[4b]"></a>App_Girouette_GetDirection</STRONG> (Thumb, 26 bytes, Stack size 8 bytes, app_girouette.o(.text.App_Girouette_GetDirection))
+<BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = App_Girouette_GetDirection
+</UL>
+<BR>[Calls]<UL><LI><a href="#[4c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;TIM_GetCounter
+</UL>
+<BR>[Called By]<UL><LI><a href="#[43]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[4d]"></a>App_Girouette_Init</STRONG> (Thumb, 80 bytes, Stack size 48 bytes, app_girouette.o(.text.App_Girouette_Init))
+<BR><BR>[Stack]<UL><LI>Max Depth = 56<LI>Call Chain = App_Girouette_Init &rArr; MyGPIO_Init
+</UL>
+<BR>[Calls]<UL><LI><a href="#[50]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_Start
+<LI><a href="#[4f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_ConfigureEncoder
+<LI><a href="#[4e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_Base_Init
+<LI><a href="#[51]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyGPIO_Init
+</UL>
+<BR>[Called By]<UL><LI><a href="#[43]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
 <P><STRONG><a name="[38]"></a>Bug</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, driver_timer.o(.text.Bug))
 <BR><BR>[Calls]<UL><LI><a href="#[38]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Bug
 </UL>
@@ -478,6 +694,39 @@ Global Symbols
 <LI> driver_timer.o(.data.TIM3_fx)
 <LI> driver_timer.o(.data.TIM4_fx)
 </UL>
+<<<<<<< HEAD
+=======
+<P><STRONG><a name="[13]"></a>EXTI3_IRQHandler</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, driver_timer.o(.text.EXTI3_IRQHandler))
+<BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
+</UL>
+<P><STRONG><a name="[51]"></a>MyGPIO_Init</STRONG> (Thumb, 140 bytes, Stack size 8 bytes, driver_gpio.o(.text.MyGPIO_Init))
+<BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = MyGPIO_Init
+</UL>
+<BR>[Called By]<UL><LI><a href="#[4d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_Init
+<LI><a href="#[43]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[4e]"></a>MyTimer_Base_Init</STRONG> (Thumb, 140 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Base_Init))
+<BR><BR>[Called By]<UL><LI><a href="#[4d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_Init
+</UL>
+
+<P><STRONG><a name="[4f]"></a>MyTimer_ConfigureEncoder</STRONG> (Thumb, 168 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_ConfigureEncoder))
+<BR><BR>[Called By]<UL><LI><a href="#[4d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_Init
+</UL>
+
+<P><STRONG><a name="[50]"></a>MyTimer_Start</STRONG> (Thumb, 12 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Start))
+<BR><BR>[Called By]<UL><LI><a href="#[4d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_Init
+</UL>
+
+<P><STRONG><a name="[52]"></a>MyUART_Init</STRONG> (Thumb, 76 bytes, Stack size 0 bytes, driver_uart.o(.text.MyUART_Init))
+<BR><BR>[Called By]<UL><LI><a href="#[43]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[53]"></a>MyUART_SendByte</STRONG> (Thumb, 22 bytes, Stack size 0 bytes, driver_uart.o(.text.MyUART_SendByte))
+<BR><BR>[Called By]<UL><LI><a href="#[43]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+>>>>>>> encoder
 <P><STRONG><a name="[35]"></a>SystemInit</STRONG> (Thumb, 272 bytes, Stack size 8 bytes, system_stm32f10x.o(.text.SystemInit))
 <BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = SystemInit
 </UL>
@@ -492,9 +741,14 @@ Global Symbols
 <P><STRONG><a name="[28]"></a>TIM4_IRQHandler</STRONG> (Thumb, 28 bytes, Stack size 0 bytes, driver_timer.o(.text.TIM4_IRQHandler))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
 </UL>
+<P><STRONG><a name="[4c]"></a>TIM_GetCounter</STRONG> (Thumb, 4 bytes, Stack size 0 bytes, driver_timer.o(.text.TIM_GetCounter))
+<BR><BR>[Called By]<UL><LI><a href="#[4b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_GetDirection
+</UL>
+
 <P><STRONG><a name="[31]"></a>USART3_IRQHandler</STRONG> (Thumb, 14 bytes, Stack size 0 bytes, driver_uart.o(.text.USART3_IRQHandler))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
 </UL>
+<<<<<<< HEAD
 <P><STRONG><a name="[4b]"></a>driver_IMU_init</STRONG> (Thumb, 78 bytes, Stack size 8 bytes, driver_imu.o(.text.driver_IMU_init))
 <BR><BR>[Stack]<UL><LI>Max Depth = 12<LI>Call Chain = driver_IMU_init &rArr; MySPI_Init
 </UL>
@@ -564,6 +818,25 @@ Global Symbols
 <BR><BR>[Called By]<UL><LI><a href="#[4c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MySPI_Init
 <LI><a href="#[50]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;driver_IMU_read
 <LI><a href="#[4b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;driver_IMU_init
+=======
+<P><STRONG><a name="[37]"></a>erreur</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, driver_adc.o(.text.erreur))
+<BR><BR>[Calls]<UL><LI><a href="#[37]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;erreur
+</UL>
+<BR>[Called By]<UL><LI><a href="#[37]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;erreur
+</UL>
+<BR>[Address Reference Count : 1]<UL><LI> driver_adc.o(.data.ADC1_2_fx)
+</UL>
+<P><STRONG><a name="[43]"></a>main</STRONG> (Thumb, 82 bytes, Stack size 16 bytes, main.o(.text.main))
+<BR><BR>[Stack]<UL><LI>Max Depth = 72<LI>Call Chain = main &rArr; App_Girouette_Init &rArr; MyGPIO_Init
+</UL>
+<BR>[Calls]<UL><LI><a href="#[53]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyUART_SendByte
+<LI><a href="#[4b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_GetDirection
+<LI><a href="#[4d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_Init
+<LI><a href="#[52]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyUART_Init
+<LI><a href="#[51]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyGPIO_Init
+</UL>
+<BR>[Called By]<UL><LI><a href="#[42]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__rt_entry_main
+>>>>>>> encoder
 </UL>
 <P>
 <H3>

projet-voilier/Objects/projet-voilier.lnp

@@ -1,11 +1,15 @@
 --cpu Cortex-M3
 ".\objects\main.o"
+".\objects\app_girouette.o"
 ".\objects\driver_gpio.o"
 ".\objects\driver_timer.o"
 ".\objects\driver_uart.o"
 ".\objects\driver_adc.o"
+<<<<<<< HEAD
 ".\objects\driver_imu.o"
 "..\driver\Lib_Com_Periph_2022.lib"
+=======
+>>>>>>> encoder
 ".\objects\startup_stm32f10x_md.o"
 ".\objects\system_stm32f10x.o"
 --ro-base 0x08000000 --entry 0x08000000 --rw-base 0x20000000 --entry Reset_Handler --first __Vectors --strict --summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols

projet-voilier/Objects/projet-voilier_reel.build_log.htm

@@ -3,74 +3,145 @@
 <pre>
 <h1>µVision Build Log</h1>
 <h2>Tool Versions:</h2>
-IDE-Version: µVision V5.34.0.0
-Copyright (C) 2021 ARM Ltd and ARM Germany GmbH. All rights reserved.
-License Information: CSN CSN, INSA de Toulouse, LIC=----
+IDE-Version: µVision V5.38.0.0
+Copyright (C) 2022 ARM Ltd and ARM Germany GmbH. All rights reserved.
+License Information: Robin M, INSA, LIC=----
  
 Tool Versions:
-Toolchain:       MDK-Lite  Version: 5.34.0.0
-Toolchain Path:  C:\Keil_v5\ARM\ARMCC\Bin
-C Compiler:      Armcc.exe V5.06 update 7 (build 960)
-Assembler:       Armasm.exe V5.06 update 7 (build 960)
-Linker/Locator:  ArmLink.exe V5.06 update 7 (build 960)
-Library Manager: ArmAr.exe V5.06 update 7 (build 960)
-Hex Converter:   FromElf.exe V5.06 update 7 (build 960)
-CPU DLL:         SARMCM3.DLL V5.34.0.0
-Dialog DLL:      DARMSTM.DLL V1.68.0.0
-Target DLL:      STLink\ST-LINKIII-KEIL_SWO.dll V3.0.8.0
-Dialog DLL:      TARMSTM.DLL V1.66.0.0
+Toolchain:       MDK-Lite  Version: 5.38.0.0
+Toolchain Path:  C:\Keil_v5\ARM\ARMCLANG\Bin
+C Compiler:      ArmClang.exe V6.19
+Assembler:       Armasm.exe V6.19
+Linker/Locator:  ArmLink.exe V6.19
+Library Manager: ArmAr.exe V6.19
+Hex Converter:   FromElf.exe V6.19
+CPU DLL:         SARMCM3.DLL V5.38.0.0
+Dialog DLL:      DARMSTM.DLL V1.69.1.0
+Target DLL:      STLink\ST-LINKIII-KEIL_SWO.dll V3.1.0.0
+Dialog DLL:      TARMSTM.DLL V1.67.1.0
  
 <h2>Project:</h2>
-U:\Documents\Projet-Voilier-3\Projet-Voilier-3\projet-voilier\projet-voilier.uvprojx
-Project File Date:  04/07/2023
+C:\Users\robin\OneDrive\Documents\Dev\Projet-Voilier-3\projet-voilier\projet-voilier.uvprojx
+Project File Date:  04/11/2023
 
 <h2>Output:</h2>
-*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
+*** Using Compiler 'V6.19', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
 Rebuild target 'reel'
-assembling startup_stm32f10x_md.s...
-compiling Driver_IMU.c...
-compiling Driver_Timer.c...
-compiling Driver_ADC.c...
-compiling system_stm32f10x.c...
-compiling Driver_GPIO.c...
+src/main.c(19): error: unknown type name 'Encoder'
+Encoder->Timer = TIM4;
+^
+src/main.c(19): error: expected identifier or '('
+Encoder->Timer = TIM4;
+       ^
+src/main.c(20): error: expected parameter declarator
+MyTimer_Base_Init(&Encoder);
+                  ^
+src/main.c(20): error: expected ')'
+src/main.c(20): note: to match this '('
+MyTimer_Base_Init(&Encoder);
+                 ^
+src/main.c(20): warning: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a previous declaration [-Wdeprecated-non-prototype]
+MyTimer_Base_Init(&Encoder);
+^
+../driver\Driver_Timer.h(20): note: conflicting prototype is here
+void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer);
+     ^
+src/main.c(20): error: conflicting types for 'MyTimer_Base_Init'
+MyTimer_Base_Init(&Encoder);
+^
+../driver\Driver_Timer.h(20): note: previous declaration is here
+void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer);
+     ^
+src/main.c(21): error: expected parameter declarator
+MyTimer_ConfigureEncoder(&Encoder);
+                         ^
+src/main.c(21): error: expected ')'
+src/main.c(21): note: to match this '('
+MyTimer_ConfigureEncoder(&Encoder);
+                        ^
+src/main.c(21): warning: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a previous declaration [-Wdeprecated-non-prototype]
+MyTimer_ConfigureEncoder(&Encoder);
+^
+../driver\Driver_Timer.h(68): note: conflicting prototype is here
+void MyTimer_ConfigureEncoder(MyTimer_Struct_TypeDef *Timer);
+     ^
+src/main.c(21): error: conflicting types for 'MyTimer_ConfigureEncoder'
+MyTimer_ConfigureEncoder(&Encoder);
+^
+../driver\Driver_Timer.h(68): note: previous declaration is here
+void MyTimer_ConfigureEncoder(MyTimer_Struct_TypeDef *Timer);
+     ^
+src/main.c(22): error: expected parameter declarator
+MyTimer_Start(&Encoder);
+              ^
+src/main.c(22): error: expected ')'
+src/main.c(22): note: to match this '('
+MyTimer_Start(&Encoder);
+             ^
+src/main.c(22): warning: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a previous declaration [-Wdeprecated-non-prototype]
+MyTimer_Start(&Encoder);
+^
+../driver\Driver_Timer.h(29): note: conflicting prototype is here
+void MyTimer_Start(MyTimer_Struct_TypeDef * Timer);
+     ^
+src/main.c(22): error: conflicting types for 'MyTimer_Start'
+MyTimer_Start(&Encoder);
+^
+../driver\Driver_Timer.h(29): note: previous declaration is here
+void MyTimer_Start(MyTimer_Struct_TypeDef * Timer);
+     ^
+src/main.c(47): error: too few arguments to function call, expected 3, have 2
+        MyTimer_ConfigurePWM(&PWM_VOILE, 10);
+        ~~~~~~~~~~~~~~~~~~~~               ^
+../driver\Driver_Timer.h(66): note: 'MyTimer_ConfigurePWM' declared here
+void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint8_t pwm_channel, uint16_t duty_cycle);
+     ^
+src/main.c(128): warning: implicitly declaring library function 'sprintf' with type 'int (char *, const char *, ...)' [-Wimplicit-function-declaration]
+                sprintf(str, "Dir: %f deg", (float)dir);
+                ^
+src/main.c(128): note: include the header <stdio.h> or explicitly provide a declaration for 'sprintf'
+4 warnings and 12 errors generated.
 compiling main.c...
-src\main.c(14): warning:  #177-D: variable "GPIO_ADC1"  was declared but never referenced
-  	MyGPIO_Struct_TypeDef GPIO_ADC1;
-src\main.c: 1 warning, 0 errors
-linking...
-Program Size: Code=1516 RO-data=268 RW-data=20 ZI-data=1028  
-".\Objects\projet-voilier_reel.axf" - 0 Error(s), 1 Warning(s).
+assembling startup_stm32f10x_md.s...
+compiling Driver_ADC.c...
+compiling Driver_GPIO.c...
+compiling App_girouette.c...
+compiling Driver_UART.c...
+compiling Driver_Timer.c...
+compiling system_stm32f10x.c...
+".\Objects\projet-voilier_reel.axf" - 12 Error(s), 4 Warning(s).
 
 <h2>Software Packages used:</h2>
 
 Package Vendor: ARM
-                http://www.keil.com/pack/ARM.CMSIS.5.7.0.pack
-                ARM.CMSIS.5.7.0
-                CMSIS (Cortex Microcontroller Software Interface Standard)
-   * Component: CORE Version: 5.4.0
+                http://www.keil.com/pack/ARM.CMSIS.5.9.0.pack
+                ARM.CMSIS.5.9.0
+                CMSIS (Common Microcontroller Software Interface Standard)
+   * Component: CORE Version: 5.6.0
 
 Package Vendor: Keil
-                http://www.keil.com/pack/Keil.STM32F1xx_DFP.2.3.0.pack
-                Keil.STM32F1xx_DFP.2.3.0
+                http://www.keil.com/pack/Keil.STM32F1xx_DFP.2.4.0.pack
+                Keil.STM32F1xx_DFP.2.4.0
                 STMicroelectronics STM32F1 Series Device Support, Drivers and Examples
    * Component: Startup Version: 1.0.0
 
 <h2>Collection of Component include folders:</h2>
-  .\RTE\Device\STM32F103RB
-  .\RTE\_reel
-  C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include
-  C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include
+  ./RTE/Device/STM32F103RB
+  ./RTE/_reel
+  C:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include
+  C:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
 
 <h2>Collection of Component Files used:</h2>
 
-   * Component: ARM::CMSIS:CORE:5.4.0
+   * Component: ARM::CMSIS:CORE:5.6.0
 
    * Component: Keil::Device:Startup:1.0.0
-      Include file:  RTE_Driver\Config\RTE_Device.h
-      Source file:   Device\Source\ARM\STM32F1xx_OPT.s
-      Source file:   Device\Source\ARM\startup_stm32f10x_md.s
-      Source file:   Device\Source\system_stm32f10x.c
-Build Time Elapsed:  00:00:02
+      Source file:   Device/Source/ARM/startup_stm32f10x_md.s
+      Source file:   Device/Source/system_stm32f10x.c
+      Include file:  RTE_Driver/Config/RTE_Device.h
+      Source file:   Device/Source/ARM/STM32F1xx_OPT.s
+Target not created.
+Build Time Elapsed:  00:00:01
 </pre>
 </body>
 </html>

projet-voilier/Objects/projet-voilier_reel.dep

@@ -1,77 +1,89 @@
 Dependencies for Project 'projet-voilier', Target 'reel': (DO NOT MODIFY !)
-CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC
-F (.\src\main.c)(0x64300327)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\src -I ..\driver

-I.\RTE\Device\STM32F103RB

-I.\RTE\_reel

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\main.o --omf_browse .\objects\main.crf --depend .\objects\main.d)
-I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
-I (.\RTE\_reel\RTE_Components.h)(0x642FFD34)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582)
-I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582)
-I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
-I (..\driver\Driver_GPIO.h)(0x642FFEC1)
-I (..\driver\Driver_Timer.h)(0x643004B7)
-I (..\driver\Driver_UART.h)(0x642FFDF7)
-I (..\driver\Driver_ADC.h)(0x642FFEC1)
-I (..\driver\MySPI.h)(0x642FFEC1)
-I (..\driver\Driver_IMU.h)(0x642FFEC1)
-F (..\driver\Driver_GPIO.c)(0x642FFEC1)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\src -I ..\driver

-I.\RTE\Device\STM32F103RB

-I.\RTE\_reel

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\driver_gpio.o --omf_browse .\objects\driver_gpio.crf --depend .\objects\driver_gpio.d)
-I (..\driver\Driver_GPIO.h)(0x642FFEC1)
-I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
-I (.\RTE\_reel\RTE_Components.h)(0x642FFD34)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582)
-I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582)
-I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
-I (C:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5E8E9122)
-F (..\driver\Driver_GPIO.h)(0x642FFEC1)()
-F (..\driver\Driver_Timer.c)(0x6430051C)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\src -I ..\driver

-I.\RTE\Device\STM32F103RB

-I.\RTE\_reel

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\driver_timer.o --omf_browse .\objects\driver_timer.crf --depend .\objects\driver_timer.d)
-I (..\driver\Driver_Timer.h)(0x643004B7)
-I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
-I (.\RTE\_reel\RTE_Components.h)(0x642FFD34)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582)
-I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582)
-I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
-I (C:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5E8E9122)
-F (..\driver\Driver_Timer.h)(0x643004B7)()
-F (..\driver\Driver_ADC.c)(0x642FFEC1)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\src -I ..\driver

-I.\RTE\Device\STM32F103RB

-I.\RTE\_reel

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\driver_adc.o --omf_browse .\objects\driver_adc.crf --depend .\objects\driver_adc.d)
-I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
-I (.\RTE\_reel\RTE_Components.h)(0x642FFD34)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582)
-I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582)
-I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
-I (C:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5E8E9122)
-I (..\driver\Driver_ADC.h)(0x642FFEC1)
-F (..\driver\Driver_ADC.h)(0x642FFEC1)()
-F (..\driver\Lib_Com_Periph_2022.lib)(0x642FFEC1)()
-F (..\driver\MySPI.h)(0x642FFEC1)()
-F (..\driver\Driver_IMU.c)(0x642FFEC1)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\src -I ..\driver

-I.\RTE\Device\STM32F103RB

-I.\RTE\_reel

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\driver_imu.o --omf_browse .\objects\driver_imu.crf --depend .\objects\driver_imu.d)
-I (..\driver\MySpi.h)(0x642FFEC1)
-I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
-I (.\RTE\_reel\RTE_Components.h)(0x642FFD34)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582)
-I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582)
-I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
-F (..\driver\Driver_IMU.h)(0x642FFEC1)()
-F (RTE\Device\STM32F103RB\RTE_Device.h)(0x642FFD34)()
-F (RTE\Device\STM32F103RB\startup_stm32f10x_md.s)(0x642FFD34)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1"

-I.\RTE\Device\STM32F103RB

-I.\RTE\_reel

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

--pd "__UVISION_VERSION SETA 534" --pd "_RTE_ SETA 1" --pd "STM32F10X_MD SETA 1" --pd "_RTE_ SETA 1"

--list .\listings\startup_stm32f10x_md.lst --xref -o .\objects\startup_stm32f10x_md.o --depend .\objects\startup_stm32f10x_md.d)
-F (RTE\Device\STM32F103RB\system_stm32f10x.c)(0x642FFD34)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\src -I ..\driver

-I.\RTE\Device\STM32F103RB

-I.\RTE\_reel

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\system_stm32f10x.o --omf_browse .\objects\system_stm32f10x.crf --depend .\objects\system_stm32f10x.d)
-I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
-I (.\RTE\_reel\RTE_Components.h)(0x642FFD34)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582)
-I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22)
-I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582)
-I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
+CompilerVersion: 6190000::V6.19::ARMCLANG
+F (.\src\main.c)(0x6435459E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c

-fno-rtti -funsigned-char -fshort-enums -fshort-wchar

-D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver

-I./RTE/Device/STM32F103RB

-I./RTE/_reel

-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include

-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include

-D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o ./objects/main.o -MD)
+I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
+I (RTE\_reel\RTE_Components.h)(0x64218849)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E)
+I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x6388AB78)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h)(0x626FAD4E)
+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)(0x64354588)
+I (..\driver\Driver_Timer.h)(0x64354588)
+I (..\driver\Driver_UART.h)(0x6435459E)
+I (..\driver\Driver_ADC.h)(0x64354588)
+I (..\driver\MySPI.h)(0x64354588)
+I (..\driver\Driver_IMU.h)(0x64354588)
+I (src\App_girouette.h)(0x6435459E)
+F (.\src\App_girouette.c)(0x6435459E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c

-fno-rtti -funsigned-char -fshort-enums -fshort-wchar

-D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver

-I./RTE/Device/STM32F103RB

-I./RTE/_reel

-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include

-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include

-D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o ./objects/app_girouette.o -MD)
+I (src\App_girouette.h)(0x6435459E)
+I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
+I (RTE\_reel\RTE_Components.h)(0x64218849)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E)
+I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x6388AB78)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h)(0x626FAD4E)
+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)(0x64354588)
+I (..\driver\Driver_Timer.h)(0x64354588)
+F (.\src\App_girouette.h)(0x6435459E)()
+F (..\driver\Driver_GPIO.c)(0x6435459E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c

-fno-rtti -funsigned-char -fshort-enums -fshort-wchar

-D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver

-I./RTE/Device/STM32F103RB

-I./RTE/_reel

-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include

-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include

-D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o ./objects/driver_gpio.o -MD)
+I (..\driver\Driver_GPIO.h)(0x64354588)
+I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
+I (RTE\_reel\RTE_Components.h)(0x64218849)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E)
+I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x6388AB78)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h)(0x626FAD4E)
+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 (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78)
+F (..\driver\Driver_GPIO.h)(0x64354588)()
+F (..\driver\Driver_Timer.c)(0x6435459E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c

-fno-rtti -funsigned-char -fshort-enums -fshort-wchar

-D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver

-I./RTE/Device/STM32F103RB

-I./RTE/_reel

-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include

-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include

-D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o ./objects/driver_timer.o -MD)
+I (..\driver\Driver_Timer.h)(0x64354588)
+I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
+I (RTE\_reel\RTE_Components.h)(0x64218849)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E)
+I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x6388AB78)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h)(0x626FAD4E)
+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 (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78)
+F (..\driver\Driver_Timer.h)(0x64354588)()
+F (..\driver\Driver_UART.c)(0x6435459E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c

-fno-rtti -funsigned-char -fshort-enums -fshort-wchar

-D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver

-I./RTE/Device/STM32F103RB

-I./RTE/_reel

-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include

-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include

-D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o ./objects/driver_uart.o -MD)
+I (..\driver\Driver_UART.h)(0x6435459E)
+I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
+I (RTE\_reel\RTE_Components.h)(0x64218849)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E)
+I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x6388AB78)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h)(0x626FAD4E)
+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)(0x6435459E)()
+F (..\driver\Driver_ADC.c)(0x64354588)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c

-fno-rtti -funsigned-char -fshort-enums -fshort-wchar

-D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver

-I./RTE/Device/STM32F103RB

-I./RTE/_reel

-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include

-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include

-D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o ./objects/driver_adc.o -MD)
+I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
+I (RTE\_reel\RTE_Components.h)(0x64218849)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E)
+I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x6388AB78)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h)(0x626FAD4E)
+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 (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78)
+I (..\driver\Driver_ADC.h)(0x64354588)
+F (..\driver\Driver_ADC.h)(0x64354588)()
+F (RTE/Device/STM32F103RB/RTE_Device.h)(0x641B050C)()
+F (RTE/Device/STM32F103RB/startup_stm32f10x_md.s)(0x641B050C)(--target=arm-arm-none-eabi -mcpu=cortex-m3 -masm=auto  -Wa,armasm,--diag_suppress=A1950W -c

-gdwarf-4 -Wa,armasm,--pd,"__MICROLIB SETA 1" -Wa,armasm,--pd,"__EVAL SETA 1"

-I./RTE/Device/STM32F103RB

-I./RTE/_reel

-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include

-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include

-Wa,armasm,--pd,"__UVISION_VERSION SETA 538" -Wa,armasm,--pd,"_RTE_ SETA 1" -Wa,armasm,--pd,"STM32F10X_MD SETA 1" -Wa,armasm,--pd,"_RTE_ SETA 1"

-o ./objects/startup_stm32f10x_md.o)
+F (RTE/Device/STM32F103RB/system_stm32f10x.c)(0x641B050C)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c

-fno-rtti -funsigned-char -fshort-enums -fshort-wchar

-D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver

-I./RTE/Device/STM32F103RB

-I./RTE/_reel

-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include

-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include

-D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o ./objects/system_stm32f10x.o -MD)
+I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
+I (RTE\_reel\RTE_Components.h)(0x64218849)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E)
+I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x6388AB78)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h)(0x626FAD4E)
+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)

projet-voilier/Objects/projet-voilier_reel.htm

@@ -3,11 +3,29 @@
 <title>Static Call Graph - [.\Objects\projet-voilier_reel.axf]</title></head>
 <body><HR>
 <H1>Static Call Graph for image .\Objects\projet-voilier_reel.axf</H1><HR>
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 <BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060960: Last Updated: Fri Apr 07 13:57:22 2023
 <BR><P>
 <H3>Maximum Stack Usage =         40 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
+=======
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 6190004: Last Updated: Tue Apr 11 09:37:28 2023
+=======
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 6190004: Last Updated: Tue Apr 11 09:52:31 2023
+>>>>>>> 73cabe3969d793656407180a8db5feffe014593b
+<BR><P>
+<H3>Maximum Stack Usage =         56 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
+>>>>>>> encoder
 Call chain for Maximum Stack Depth:</H3>
 main &rArr; driver_IMU_read
+=======
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 6190004: Last Updated: Tue Apr 11 13:30:39 2023
+<BR><P>
+<H3>Maximum Stack Usage =        168 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
+Call chain for Maximum Stack Depth:</H3>
+main &rArr; App_Girouette_GetDirection &rArr; __aeabi_dmul &rArr; _double_epilogue &rArr; _double_round
+>>>>>>> encoder
 <P>
 <H3>
 Mutually Recursive functions
@@ -21,13 +39,36 @@ Mutually Recursive functions
  <LI><a href="#[8]">PendSV_Handler</a>&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;&nbsp;<a href="#[8]">PendSV_Handler</a><BR>
  <LI><a href="#[9]">SysTick_Handler</a>&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;&nbsp;<a href="#[9]">SysTick_Handler</a><BR>
  <LI><a href="#[1f]">CAN1_RX1_IRQHandler</a>&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;&nbsp;<a href="#[1f]">CAN1_RX1_IRQHandler</a><BR>
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+ <LI><a href="#[39]">Bug</a>&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;&nbsp;<a href="#[39]">Bug</a><BR>
+ <LI><a href="#[38]">erreur</a>&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;&nbsp;<a href="#[38]">erreur</a><BR>
+>>>>>>> encoder
+=======
+ <LI><a href="#[3a]">Bug</a>&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;&nbsp;<a href="#[3a]">Bug</a><BR>
+ <LI><a href="#[39]">erreur</a>&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;&nbsp;<a href="#[39]">erreur</a><BR>
+>>>>>>> encoder
 </UL>
 <P>
 <H3>
 Function Pointers
 </H3><UL>
+<<<<<<< HEAD
  <LI><a href="#[1c]">ADC1_2_IRQHandler</a> from driver_adc.o(i.ADC1_2_IRQHandler) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[38]">Bug</a> from driver_timer.o(i.Bug) referenced 3 times from driver_timer.o(.data)
+=======
+ <LI><a href="#[1c]">ADC1_2_IRQHandler</a> from driver_adc.o(.text.ADC1_2_IRQHandler) referenced from startup_stm32f10x_md.o(RESET)
+<<<<<<< HEAD
+ <LI><a href="#[39]">Bug</a> from driver_timer.o(.text.Bug) referenced from driver_timer.o(.data.TIM2_fx)
+ <LI><a href="#[39]">Bug</a> from driver_timer.o(.text.Bug) referenced from driver_timer.o(.data.TIM3_fx)
+ <LI><a href="#[39]">Bug</a> from driver_timer.o(.text.Bug) referenced from driver_timer.o(.data.TIM4_fx)
+>>>>>>> encoder
+=======
+ <LI><a href="#[3a]">Bug</a> from driver_timer.o(.text.Bug) referenced from driver_timer.o(.data.TIM2_fx)
+ <LI><a href="#[3a]">Bug</a> from driver_timer.o(.text.Bug) referenced from driver_timer.o(.data.TIM3_fx)
+ <LI><a href="#[3a]">Bug</a> from driver_timer.o(.text.Bug) referenced from driver_timer.o(.data.TIM4_fx)
+>>>>>>> encoder
  <LI><a href="#[4]">BusFault_Handler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[1f]">CAN1_RX1_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[20]">CAN1_SCE_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
@@ -43,7 +84,7 @@ Function Pointers
  <LI><a href="#[32]">EXTI15_10_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[11]">EXTI1_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[12]">EXTI2_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
- <LI><a href="#[13]">EXTI3_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[13]">EXTI3_IRQHandler</a> from driver_timer.o(.text.EXTI3_IRQHandler) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[14]">EXTI4_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[21]">EXTI9_5_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[e]">FLASH_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
@@ -75,15 +116,25 @@ Function Pointers
  <LI><a href="#[28]">TIM4_IRQHandler</a> from driver_timer.o(i.TIM4_IRQHandler) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[2f]">USART1_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[30]">USART2_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
- <LI><a href="#[31]">USART3_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[31]">USART3_IRQHandler</a> from driver_uart.o(.text.USART3_IRQHandler) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[34]">USBWakeUp_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[1d]">USB_HP_CAN1_TX_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[1e]">USB_LP_CAN1_RX0_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[5]">UsageFault_Handler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[a]">WWDG_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[37]">__main</a> from entry.o(.ARM.Collect$$$$00000000) referenced from startup_stm32f10x_md.o(.text)
+<<<<<<< HEAD
+<<<<<<< HEAD
  <LI><a href="#[39]">erreur</a> from driver_adc.o(i.erreur) referenced from driver_adc.o(.data)
  <LI><a href="#[35]">main</a> from main.o(i.main) referenced from entry9a.o(.ARM.Collect$$$$0000000B)
+=======
+ <LI><a href="#[38]">erreur</a> from driver_adc.o(.text.erreur) referenced from driver_adc.o(.data.ADC1_2_fx)
+=======
+ <LI><a href="#[38]">_sputc</a> from printfa.o(i._sputc) referenced from printfa.o(i.__0sprintf)
+ <LI><a href="#[39]">erreur</a> from driver_adc.o(.text.erreur) referenced from driver_adc.o(.data.ADC1_2_fx)
+>>>>>>> encoder
+ <LI><a href="#[35]">main</a> from main.o(.text.main) referenced from entry9a.o(.ARM.Collect$$$$0000000B)
+>>>>>>> encoder
 </UL>
 <P>
 <H3>
@@ -92,6 +143,8 @@ Global Symbols
 <P><STRONG><a name="[37]"></a>__main</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry.o(.ARM.Collect$$$$00000000))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(.text)
 </UL>
+<<<<<<< HEAD
+<<<<<<< HEAD
 <P><STRONG><a name="[49]"></a>_main_stk</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry2.o(.ARM.Collect$$$$00000001))
 
 <P><STRONG><a name="[3b]"></a>_main_scatterload</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004))
@@ -115,6 +168,34 @@ Global Symbols
 <P><STRONG><a name="[4f]"></a>__rt_final_exit</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry11a.o(.ARM.Collect$$$$00000011))
 
 <P><STRONG><a name="[3a]"></a>Reset_Handler</STRONG> (Thumb, 8 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
+=======
+<P><STRONG><a name="[42]"></a>_main_stk</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry2.o(.ARM.Collect$$$$00000001))
+=======
+<P><STRONG><a name="[61]"></a>_main_stk</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry2.o(.ARM.Collect$$$$00000001))
+>>>>>>> encoder
+
+<P><STRONG><a name="[3b]"></a>_main_scatterload</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004))
+<BR><BR>[Calls]<UL><LI><a href="#[3c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__scatterload
+</UL>
+
+<P><STRONG><a name="[4c]"></a>__main_after_scatterload</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004))
+<BR><BR>[Called By]<UL><LI><a href="#[3c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__scatterload
+</UL>
+
+<P><STRONG><a name="[62]"></a>_main_clock</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry7b.o(.ARM.Collect$$$$00000008))
+
+<P><STRONG><a name="[63]"></a>_main_cpp_init</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry8b.o(.ARM.Collect$$$$0000000A))
+
+<P><STRONG><a name="[64]"></a>_main_init</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry9a.o(.ARM.Collect$$$$0000000B))
+
+<P><STRONG><a name="[65]"></a>__rt_final_cpp</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry10a.o(.ARM.Collect$$$$0000000D))
+
+<<<<<<< HEAD
+<P><STRONG><a name="[47]"></a>__rt_final_exit</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry11a.o(.ARM.Collect$$$$0000000F))
+>>>>>>> encoder
+=======
+<P><STRONG><a name="[66]"></a>__rt_final_exit</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry11a.o(.ARM.Collect$$$$0000000F))
+>>>>>>> encoder
 
 <P><STRONG><a name="[1]"></a>NMI_Handler</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
 <BR><BR>[Calls]<UL><LI><a href="#[1]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;NMI_Handler
@@ -222,9 +303,6 @@ Global Symbols
 <P><STRONG><a name="[12]"></a>EXTI2_IRQHandler</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
 </UL>
-<P><STRONG><a name="[13]"></a>EXTI3_IRQHandler</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
-<BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
-</UL>
 <P><STRONG><a name="[14]"></a>EXTI4_IRQHandler</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
 </UL>
@@ -285,9 +363,6 @@ Global Symbols
 <P><STRONG><a name="[30]"></a>USART2_IRQHandler</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
 </UL>
-<P><STRONG><a name="[31]"></a>USART3_IRQHandler</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
-<BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
-</UL>
 <P><STRONG><a name="[34]"></a>USBWakeUp_IRQHandler</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
 </UL>
@@ -300,6 +375,8 @@ Global Symbols
 <P><STRONG><a name="[a]"></a>WWDG_IRQHandler</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
 </UL>
+<<<<<<< HEAD
+<<<<<<< HEAD
 <P><STRONG><a name="[3c]"></a>__scatterload</STRONG> (Thumb, 28 bytes, Stack size 0 bytes, init.o(.text))
 <BR><BR>[Calls]<UL><LI><a href="#[3d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__main_after_scatterload
 </UL>
@@ -312,10 +389,188 @@ Global Symbols
 <BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = ADC1_2_IRQHandler
 </UL>
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
+=======
+<P><STRONG><a name="[3b]"></a>__scatterload</STRONG> (Thumb, 28 bytes, Stack size 0 bytes, init.o(.text))
+<BR><BR>[Calls]<UL><LI><a href="#[3c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__main_after_scatterload
+=======
+<P><STRONG><a name="[3d]"></a>__aeabi_dmul</STRONG> (Thumb, 228 bytes, Stack size 48 bytes, dmul.o(.text))
+<BR><BR>[Stack]<UL><LI>Max Depth = 88<LI>Call Chain = __aeabi_dmul &rArr; _double_epilogue &rArr; _double_round
+>>>>>>> encoder
+</UL>
+<BR>[Calls]<UL><LI><a href="#[3e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_epilogue
+</UL>
+<BR>[Called By]<UL><LI><a href="#[5c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_fp_digits
+<LI><a href="#[4d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_GetDirection
+</UL>
+
+<P><STRONG><a name="[3f]"></a>__aeabi_i2d</STRONG> (Thumb, 34 bytes, Stack size 16 bytes, dflti.o(.text))
+<BR><BR>[Stack]<UL><LI>Max Depth = 56<LI>Call Chain = __aeabi_i2d &rArr; _double_epilogue &rArr; _double_round
+</UL>
+<BR>[Calls]<UL><LI><a href="#[3e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_epilogue
+</UL>
+<BR>[Called By]<UL><LI><a href="#[4d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_GetDirection
+</UL>
+
+<P><STRONG><a name="[40]"></a>__aeabi_ui2d</STRONG> (Thumb, 26 bytes, Stack size 16 bytes, dfltui.o(.text))
+<BR><BR>[Stack]<UL><LI>Max Depth = 56<LI>Call Chain = __aeabi_ui2d &rArr; _double_epilogue &rArr; _double_round
+</UL>
+<BR>[Calls]<UL><LI><a href="#[3e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_epilogue
+</UL>
+<BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[41]"></a>__aeabi_d2iz</STRONG> (Thumb, 62 bytes, Stack size 16 bytes, dfixi.o(.text))
+<BR><BR>[Stack]<UL><LI>Max Depth = 16<LI>Call Chain = __aeabi_d2iz
+</UL>
+<BR>[Calls]<UL><LI><a href="#[42]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsr
+</UL>
+<BR>[Called By]<UL><LI><a href="#[4d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_GetDirection
+</UL>
+
+<P><STRONG><a name="[67]"></a>__aeabi_uidiv</STRONG> (Thumb, 0 bytes, Stack size 12 bytes, uidiv.o(.text), UNUSED)
+
+<P><STRONG><a name="[60]"></a>__aeabi_uidivmod</STRONG> (Thumb, 44 bytes, Stack size 12 bytes, uidiv.o(.text), UNUSED)
+<BR><BR>[Called By]<UL><LI><a href="#[5b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_printf_core
+</UL>
+
+<P><STRONG><a name="[43]"></a>__aeabi_uldivmod</STRONG> (Thumb, 98 bytes, Stack size 40 bytes, uldiv.o(.text), UNUSED)
+<BR><BR>[Calls]<UL><LI><a href="#[42]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsr
+<LI><a href="#[44]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsl
+</UL>
+<BR>[Called By]<UL><LI><a href="#[5b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_printf_core
+<LI><a href="#[5c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_fp_digits
+</UL>
+
+<P><STRONG><a name="[42]"></a>__aeabi_llsr</STRONG> (Thumb, 32 bytes, Stack size 0 bytes, llushr.o(.text))
+<BR><BR>[Called By]<UL><LI><a href="#[43]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_uldivmod
+<LI><a href="#[3e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_epilogue
+<LI><a href="#[4b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_d2ulz
+<LI><a href="#[41]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_d2iz
+</UL>
+
+<P><STRONG><a name="[68]"></a>_ll_ushift_r</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, llushr.o(.text), UNUSED)
+
+<P><STRONG><a name="[69]"></a>__I$use$fp</STRONG> (Thumb, 0 bytes, Stack size 8 bytes, iusefp.o(.text), UNUSED)
+
+<P><STRONG><a name="[45]"></a>_double_round</STRONG> (Thumb, 30 bytes, Stack size 8 bytes, depilogue.o(.text))
+<BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = _double_round
+</UL>
+<BR>[Called By]<UL><LI><a href="#[3e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_epilogue
+<LI><a href="#[4a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_ddiv
+<LI><a href="#[46]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_dadd
+</UL>
+
+<P><STRONG><a name="[3e]"></a>_double_epilogue</STRONG> (Thumb, 156 bytes, Stack size 32 bytes, depilogue.o(.text))
+<BR><BR>[Stack]<UL><LI>Max Depth = 40<LI>Call Chain = _double_epilogue &rArr; _double_round
+</UL>
+<BR>[Calls]<UL><LI><a href="#[45]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_round
+<LI><a href="#[42]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsr
+<LI><a href="#[44]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsl
+</UL>
+<BR>[Called By]<UL><LI><a href="#[46]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_dadd
+<LI><a href="#[3d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_dmul
+<LI><a href="#[3f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_i2d
+<LI><a href="#[40]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_ui2d
+</UL>
+
+<P><STRONG><a name="[46]"></a>__aeabi_dadd</STRONG> (Thumb, 322 bytes, Stack size 48 bytes, dadd.o(.text), UNUSED)
+<BR><BR>[Calls]<UL><LI><a href="#[45]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_round
+<LI><a href="#[3e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_epilogue
+<LI><a href="#[47]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_lasr
+<LI><a href="#[44]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsl
+</UL>
+<BR>[Called By]<UL><LI><a href="#[49]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_drsub
+<LI><a href="#[48]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_dsub
+<LI><a href="#[5c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_fp_digits
+</UL>
+
+<P><STRONG><a name="[48]"></a>__aeabi_dsub</STRONG> (Thumb, 6 bytes, Stack size 0 bytes, dadd.o(.text), UNUSED)
+<BR><BR>[Calls]<UL><LI><a href="#[46]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_dadd
+</UL>
+
+<P><STRONG><a name="[49]"></a>__aeabi_drsub</STRONG> (Thumb, 6 bytes, Stack size 0 bytes, dadd.o(.text), UNUSED)
+<BR><BR>[Calls]<UL><LI><a href="#[46]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_dadd
+</UL>
+
+<P><STRONG><a name="[4a]"></a>__aeabi_ddiv</STRONG> (Thumb, 222 bytes, Stack size 32 bytes, ddiv.o(.text), UNUSED)
+<BR><BR>[Calls]<UL><LI><a href="#[45]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_round
+</UL>
+<BR>[Called By]<UL><LI><a href="#[5c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_fp_digits
+</UL>
+
+<P><STRONG><a name="[4b]"></a>__aeabi_d2ulz</STRONG> (Thumb, 48 bytes, Stack size 0 bytes, dfixul.o(.text), UNUSED)
+<BR><BR>[Calls]<UL><LI><a href="#[42]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsr
+<LI><a href="#[44]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsl
+</UL>
+<BR>[Called By]<UL><LI><a href="#[5c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_fp_digits
+</UL>
+
+<P><STRONG><a name="[5d]"></a>__aeabi_cdrcmple</STRONG> (Thumb, 48 bytes, Stack size 0 bytes, cdrcmple.o(.text), UNUSED)
+<BR><BR>[Called By]<UL><LI><a href="#[5c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_fp_digits
+</UL>
+
+<P><STRONG><a name="[3c]"></a>__scatterload</STRONG> (Thumb, 28 bytes, Stack size 0 bytes, init.o(.text))
+<BR><BR>[Calls]<UL><LI><a href="#[4c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__main_after_scatterload
+</UL>
+<BR>[Called By]<UL><LI><a href="#[3b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_main_scatterload
+</UL>
+
+<P><STRONG><a name="[6a]"></a>__scatterload_rt2</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, init.o(.text), UNUSED)
+
+<P><STRONG><a name="[44]"></a>__aeabi_llsl</STRONG> (Thumb, 30 bytes, Stack size 0 bytes, llshl.o(.text))
+<BR><BR>[Called By]<UL><LI><a href="#[43]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_uldivmod
+<LI><a href="#[3e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_epilogue
+<LI><a href="#[46]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_dadd
+<LI><a href="#[4b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_d2ulz
+</UL>
+
+<P><STRONG><a name="[6b]"></a>_ll_shift_l</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, llshl.o(.text), UNUSED)
+
+<P><STRONG><a name="[47]"></a>__aeabi_lasr</STRONG> (Thumb, 36 bytes, Stack size 0 bytes, llsshr.o(.text), UNUSED)
+<BR><BR>[Called By]<UL><LI><a href="#[46]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_dadd
+</UL>
+
+<P><STRONG><a name="[6c]"></a>_ll_sshift_r</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, llsshr.o(.text), UNUSED)
+
+<P><STRONG><a name="[1c]"></a>ADC1_2_IRQHandler</STRONG> (Thumb, 28 bytes, Stack size 0 bytes, driver_adc.o(.text.ADC1_2_IRQHandler))
+<BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
+</UL>
+<P><STRONG><a name="[4d]"></a>App_Girouette_GetDirection</STRONG> (Thumb, 42 bytes, Stack size 8 bytes, app_girouette.o(.text.App_Girouette_GetDirection))
+<BR><BR>[Stack]<UL><LI>Max Depth = 96<LI>Call Chain = App_Girouette_GetDirection &rArr; __aeabi_dmul &rArr; _double_epilogue &rArr; _double_round
+</UL>
+<<<<<<< HEAD
+<BR>[Called By]<UL><LI><a href="#[39]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Bug
+>>>>>>> encoder
+=======
+<BR>[Calls]<UL><LI><a href="#[41]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_d2iz
+<LI><a href="#[3d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_dmul
+<LI><a href="#[3f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_i2d
+<LI><a href="#[4e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;TIM_GetCounter
+</UL>
+<BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[4f]"></a>App_Girouette_Init</STRONG> (Thumb, 80 bytes, Stack size 48 bytes, app_girouette.o(.text.App_Girouette_Init))
+<BR><BR>[Stack]<UL><LI>Max Depth = 56<LI>Call Chain = App_Girouette_Init &rArr; MyGPIO_Init
+</UL>
+<BR>[Calls]<UL><LI><a href="#[51]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_ConfigureEncoder
+<LI><a href="#[52]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_Start
+<LI><a href="#[50]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_Base_Init
+<LI><a href="#[53]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyGPIO_Init
+</UL>
+<BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[3a]"></a>Bug</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, driver_timer.o(.text.Bug))
+<BR><BR>[Calls]<UL><LI><a href="#[3a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Bug
+</UL>
+<BR>[Called By]<UL><LI><a href="#[3a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Bug
+>>>>>>> encoder
 </UL>
 <P><STRONG><a name="[38]"></a>Bug</STRONG> (Thumb, 4 bytes, Stack size 0 bytes, driver_timer.o(i.Bug))
 <BR>[Address Reference Count : 1]<UL><LI> driver_timer.o(.data)
 </UL>
+<<<<<<< HEAD
 <P><STRONG><a name="[45]"></a>MySPI_Clear_NSS</STRONG> (Thumb, 30 bytes, Stack size 0 bytes, myspi.o(i.MySPI_Clear_NSS))
 <BR><BR>[Called By]<UL><LI><a href="#[43]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;driver_IMU_write_register
 <LI><a href="#[44]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;driver_IMU_read
@@ -354,6 +609,7 @@ Global Symbols
 <P><STRONG><a name="[26]"></a>TIM2_IRQHandler</STRONG> (Thumb, 26 bytes, Stack size 8 bytes, driver_timer.o(i.TIM2_IRQHandler))
 <BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = TIM2_IRQHandler
 </UL>
+<<<<<<< HEAD
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
 </UL>
 <P><STRONG><a name="[27]"></a>TIM3_IRQHandler</STRONG> (Thumb, 22 bytes, Stack size 8 bytes, driver_timer.o(i.TIM3_IRQHandler))
@@ -377,10 +633,25 @@ Global Symbols
 </UL>
 <BR>[Calls]<UL><LI><a href="#[3e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MySPI_Init
 <LI><a href="#[43]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;driver_IMU_write_register
+=======
+<P><STRONG><a name="[32]"></a>EXTI15_10_IRQHandler</STRONG> (Thumb, 26 bytes, Stack size 0 bytes, main.o(.text.EXTI15_10_IRQHandler))
+<BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
 </UL>
-<BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+=======
+>>>>>>> 73cabe3969d793656407180a8db5feffe014593b
+<P><STRONG><a name="[13]"></a>EXTI3_IRQHandler</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, driver_timer.o(.text.EXTI3_IRQHandler))
+<BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
+</UL>
+<P><STRONG><a name="[53]"></a>MyGPIO_Init</STRONG> (Thumb, 144 bytes, Stack size 8 bytes, driver_gpio.o(.text.MyGPIO_Init))
+<BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = MyGPIO_Init
+>>>>>>> encoder
+</UL>
+<BR>[Called By]<UL><LI><a href="#[4f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_Init
+<LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
 </UL>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 <P><STRONG><a name="[44]"></a>driver_IMU_read</STRONG> (Thumb, 52 bytes, Stack size 24 bytes, driver_imu.o(i.driver_IMU_read))
 <BR><BR>[Stack]<UL><LI>Max Depth = 24<LI>Call Chain = driver_IMU_read
 </UL>
@@ -418,9 +689,118 @@ Global Symbols
 </UL>
 <BR>[Address Reference Count : 1]<UL><LI> entry9a.o(.ARM.Collect$$$$0000000B)
 </UL><P>
+=======
+<P><STRONG><a name="[3f]"></a>MyTimer_Base_Init</STRONG> (Thumb, 140 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Base_Init))
+=======
+<P><STRONG><a name="[50]"></a>MyTimer_Base_Init</STRONG> (Thumb, 140 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Base_Init))
+<BR><BR>[Called By]<UL><LI><a href="#[4f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_Init
+<LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[51]"></a>MyTimer_ConfigureEncoder</STRONG> (Thumb, 168 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_ConfigureEncoder))
+<BR><BR>[Called By]<UL><LI><a href="#[4f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_Init
+</UL>
+
+<P><STRONG><a name="[54]"></a>MyTimer_ConfigurePWM</STRONG> (Thumb, 166 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_ConfigurePWM))
+>>>>>>> encoder
+<BR><BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[56]"></a>MyTimer_SetPWMDutyCycle</STRONG> (Thumb, 82 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_SetPWMDutyCycle))
+<BR><BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[52]"></a>MyTimer_Start</STRONG> (Thumb, 12 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Start))
+<BR><BR>[Called By]<UL><LI><a href="#[4f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_Init
+<LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[55]"></a>MyUART_Init</STRONG> (Thumb, 152 bytes, Stack size 0 bytes, driver_uart.o(.text.MyUART_Init))
+<BR><BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[59]"></a>MyUART_SendByte</STRONG> (Thumb, 12 bytes, Stack size 0 bytes, driver_uart.o(.text.MyUART_SendByte))
+<BR><BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[58]"></a>MyUART_SendString</STRONG> (Thumb, 32 bytes, Stack size 0 bytes, driver_uart.o(.text.MyUART_SendString))
+<BR><BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[36]"></a>SystemInit</STRONG> (Thumb, 272 bytes, Stack size 8 bytes, system_stm32f10x.o(.text.SystemInit))
+<BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = SystemInit
+</UL>
+<BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(.text)
+</UL>
+<P><STRONG><a name="[26]"></a>TIM2_IRQHandler</STRONG> (Thumb, 26 bytes, Stack size 0 bytes, driver_timer.o(.text.TIM2_IRQHandler))
+<BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
+</UL>
+<P><STRONG><a name="[27]"></a>TIM3_IRQHandler</STRONG> (Thumb, 28 bytes, Stack size 0 bytes, driver_timer.o(.text.TIM3_IRQHandler))
+<BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
+</UL>
+<P><STRONG><a name="[28]"></a>TIM4_IRQHandler</STRONG> (Thumb, 28 bytes, Stack size 0 bytes, driver_timer.o(.text.TIM4_IRQHandler))
+<BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
+</UL>
+<P><STRONG><a name="[4e]"></a>TIM_GetCounter</STRONG> (Thumb, 4 bytes, Stack size 0 bytes, driver_timer.o(.text.TIM_GetCounter))
+<BR><BR>[Called By]<UL><LI><a href="#[4d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_GetDirection
+</UL>
+
+<P><STRONG><a name="[31]"></a>USART3_IRQHandler</STRONG> (Thumb, 14 bytes, Stack size 0 bytes, driver_uart.o(.text.USART3_IRQHandler))
+<BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
+</UL>
+<P><STRONG><a name="[39]"></a>erreur</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, driver_adc.o(.text.erreur))
+<BR><BR>[Calls]<UL><LI><a href="#[39]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;erreur
+</UL>
+<BR>[Called By]<UL><LI><a href="#[39]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;erreur
+</UL>
+<BR>[Address Reference Count : 1]<UL><LI> driver_adc.o(.data.ADC1_2_fx)
+</UL>
+<P><STRONG><a name="[35]"></a>main</STRONG> (Thumb, 272 bytes, Stack size 72 bytes, main.o(.text.main))
+<BR><BR>[Stack]<UL><LI>Max Depth = 168<LI>Call Chain = main &rArr; App_Girouette_GetDirection &rArr; __aeabi_dmul &rArr; _double_epilogue &rArr; _double_round
+</UL>
+<BR>[Calls]<UL><LI><a href="#[57]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__2sprintf
+<LI><a href="#[4d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_GetDirection
+<LI><a href="#[59]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyUART_SendByte
+<LI><a href="#[58]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyUART_SendString
+<LI><a href="#[40]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_ui2d
+<LI><a href="#[56]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_SetPWMDutyCycle
+<LI><a href="#[4f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;App_Girouette_Init
+<LI><a href="#[55]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyUART_Init
+<LI><a href="#[52]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_Start
+<LI><a href="#[54]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_ConfigurePWM
+<LI><a href="#[50]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_Base_Init
+<LI><a href="#[53]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyGPIO_Init
+</UL>
+<BR>[Address Reference Count : 1]<UL><LI> entry9a.o(.ARM.Collect$$$$0000000B)
+</UL>
+<P><STRONG><a name="[5a]"></a>__0sprintf</STRONG> (Thumb, 34 bytes, Stack size 24 bytes, printfa.o(i.__0sprintf), UNUSED)
+<BR><BR>[Calls]<UL><LI><a href="#[38]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_sputc
+<LI><a href="#[5b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_printf_core
+</UL>
+
+<P><STRONG><a name="[6d]"></a>__1sprintf</STRONG> (Thumb, 0 bytes, Stack size 24 bytes, printfa.o(i.__0sprintf), UNUSED)
+
+<P><STRONG><a name="[57]"></a>__2sprintf</STRONG> (Thumb, 0 bytes, Stack size 24 bytes, printfa.o(i.__0sprintf))
+<BR><BR>[Stack]<UL><LI>Max Depth = 24<LI>Call Chain = __2sprintf
+</UL>
+<BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[6e]"></a>__c89sprintf</STRONG> (Thumb, 0 bytes, Stack size 24 bytes, printfa.o(i.__0sprintf), UNUSED)
+
+<P><STRONG><a name="[6f]"></a>sprintf</STRONG> (Thumb, 0 bytes, Stack size 24 bytes, printfa.o(i.__0sprintf), UNUSED)
+
+<P><STRONG><a name="[70]"></a>__scatterload_copy</STRONG> (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_copy), UNUSED)
+
+<P><STRONG><a name="[71]"></a>__scatterload_null</STRONG> (Thumb, 2 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_null), UNUSED)
+
+<P><STRONG><a name="[72]"></a>__scatterload_zeroinit</STRONG> (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_zeroinit), UNUSED)
+<P>
+>>>>>>> encoder
 <H3>
 Local Symbols
 </H3>
+<<<<<<< HEAD
 <P><STRONG><a name="[40]"></a>SetSysClock</STRONG> (Thumb, 8 bytes, Stack size 8 bytes, system_stm32f10x.o(i.SetSysClock))
 <BR><BR>[Stack]<UL><LI>Max Depth = 20<LI>Call Chain = SetSysClock &rArr; SetSysClockTo72
 </UL>
@@ -435,6 +815,42 @@ Local Symbols
 <BR>[Called By]<UL><LI><a href="#[40]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SetSysClock
 </UL>
 <P>
+=======
+<P><STRONG><a name="[5c]"></a>_fp_digits</STRONG> (Thumb, 366 bytes, Stack size 64 bytes, printfa.o(i._fp_digits), UNUSED)
+<BR><BR>[Calls]<UL><LI><a href="#[43]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_uldivmod
+<LI><a href="#[4a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_ddiv
+<LI><a href="#[46]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_dadd
+<LI><a href="#[4b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_d2ulz
+<LI><a href="#[5d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_cdrcmple
+<LI><a href="#[3d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_dmul
+</UL>
+<BR>[Called By]<UL><LI><a href="#[5b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_printf_core
+</UL>
+
+<P><STRONG><a name="[5b]"></a>_printf_core</STRONG> (Thumb, 1744 bytes, Stack size 136 bytes, printfa.o(i._printf_core), UNUSED)
+<BR><BR>[Calls]<UL><LI><a href="#[43]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_uldivmod
+<LI><a href="#[60]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_uidivmod
+<LI><a href="#[5e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_printf_pre_padding
+<LI><a href="#[5f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_printf_post_padding
+<LI><a href="#[5c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_fp_digits
+</UL>
+<BR>[Called By]<UL><LI><a href="#[5a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__0sprintf
+</UL>
+
+<P><STRONG><a name="[5f]"></a>_printf_post_padding</STRONG> (Thumb, 36 bytes, Stack size 24 bytes, printfa.o(i._printf_post_padding), UNUSED)
+<BR><BR>[Called By]<UL><LI><a href="#[5b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_printf_core
+</UL>
+
+<P><STRONG><a name="[5e]"></a>_printf_pre_padding</STRONG> (Thumb, 46 bytes, Stack size 24 bytes, printfa.o(i._printf_pre_padding), UNUSED)
+<BR><BR>[Called By]<UL><LI><a href="#[5b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_printf_core
+</UL>
+
+<P><STRONG><a name="[38]"></a>_sputc</STRONG> (Thumb, 10 bytes, Stack size 0 bytes, printfa.o(i._sputc))
+<BR><BR>[Called By]<UL><LI><a href="#[5a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__0sprintf
+</UL>
+<BR>[Address Reference Count : 1]<UL><LI> printfa.o(i.__0sprintf)
+</UL><P>
+>>>>>>> encoder
 <H3>
 Undefined Global Symbols
 </H3><HR></body></html>

projet-voilier/Objects/projet-voilier_reel.lnp

@@ -1,10 +1,16 @@
 --cpu Cortex-M3
 ".\objects\main.o"
+".\objects\app_girouette.o"
 ".\objects\driver_gpio.o"
 ".\objects\driver_timer.o"
+<<<<<<< HEAD
 ".\objects\driver_adc.o"
 "..\driver\Lib_Com_Periph_2022.lib"
 ".\objects\driver_imu.o"
+=======
+".\objects\driver_uart.o"
+".\objects\driver_adc.o"
+>>>>>>> encoder
 ".\objects\startup_stm32f10x_md.o"
 ".\objects\system_stm32f10x.o"
 --library_type=microlib --ro-base 0x08000000 --entry 0x08000000 --rw-base 0x20000000 --entry Reset_Handler --first __Vectors --strict --summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols

projet-voilier/Objects/projet-voilier_sim.dep

@@ -1,6 +1,14 @@
 Dependencies for Project 'projet-voilier', Target 'sim': (DO NOT MODIFY !)
 CompilerVersion: 6190000::V6.19::ARMCLANG
-F (.\src\main.c)(0x64300B3D)(-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)
+<<<<<<< HEAD
+<<<<<<< HEAD
+F (.\src\main.c)(0x64300F40)(-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)(0x643507C6)(-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)
+>>>>>>> encoder
+=======
+F (.\src\main.c)(0x64352014)(-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)
+>>>>>>> encoder
 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,14 +17,44 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms
 I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E)
 I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E)
 I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE)
+<<<<<<< HEAD
+<<<<<<< HEAD
 I (..\driver\Driver_GPIO.h)(0x64300B3D)
-I (..\driver\Driver_Timer.h)(0x64300B3B)
+I (..\driver\Driver_Timer.h)(0x64300E6B)
 I (..\driver\Driver_UART.h)(0x642C85A4)
 I (..\driver\Driver_ADC.h)(0x64300B06)
 I (..\driver\MySPI.h)(0x64300B06)
 I (..\driver\Driver_IMU.h)(0x64300B06)
 F (..\driver\Driver_GPIO.c)(0x64300B3C)(-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)(0x64300B3D)
+=======
+I (..\driver\Driver_GPIO.h)(0x64301005)
+I (..\driver\Driver_Timer.h)(0x64301005)
+I (..\driver\Driver_UART.h)(0x642C85A4)
+F (..\driver\Driver_GPIO.c)(0x643507C3)(-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)(0x64301005)
+>>>>>>> encoder
+=======
+I (..\driver\Driver_GPIO.h)(0x64351540)
+I (..\driver\Driver_Timer.h)(0x64351540)
+I (..\driver\Driver_UART.h)(0x642C85A4)
+I (src\App_girouette.h)(0x643516BD)
+F (.\src\App_girouette.c)(0x643517F2)(-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/app_girouette.o -MD)
+I (src\App_girouette.h)(0x643516BD)
+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)
+I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x6388AB78)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h)(0x626FAD4E)
+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)(0x64351540)
+I (..\driver\Driver_Timer.h)(0x64351540)
+F (.\src\App_girouette.h)(0x643516BD)()
+F (..\driver\Driver_GPIO.c)(0x64351540)(-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)(0x64351540)
+>>>>>>> encoder
 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)
@@ -26,9 +64,21 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms
 I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E)
 I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78)
+<<<<<<< HEAD
+<<<<<<< HEAD
 F (..\driver\Driver_GPIO.h)(0x64300B3D)()
-F (..\driver\Driver_Timer.c)(0x64300B3B)(-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)(0x64300B3B)
+F (..\driver\Driver_Timer.c)(0x64300E52)(-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)(0x64300E6B)
+=======
+F (..\driver\Driver_GPIO.h)(0x64301005)()
+F (..\driver\Driver_Timer.c)(0x64301341)(-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)(0x64301005)
+>>>>>>> encoder
+=======
+F (..\driver\Driver_GPIO.h)(0x64351540)()
+F (..\driver\Driver_Timer.c)(0x643517CC)(-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)(0x64351540)
+>>>>>>> encoder
 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)
@@ -38,8 +88,17 @@ 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)(0x64300B3B)()
+<<<<<<< HEAD
+<<<<<<< HEAD
+F (..\driver\Driver_Timer.h)(0x64300E6B)()
+=======
+F (..\driver\Driver_Timer.h)(0x64301005)()
+>>>>>>> encoder
 F (..\driver\Driver_UART.c)(0x64300B0F)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c

-fno-rtti -funsigned-char -fshort-enums -fshort-wchar

-D__EVAL -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)
+=======
+F (..\driver\Driver_Timer.h)(0x64351540)()
+F (..\driver\Driver_UART.c)(0x6435210E)(-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)
+>>>>>>> encoder
 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)
@@ -50,7 +109,15 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms
 I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E)
 I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE)
 F (..\driver\Driver_UART.h)(0x642C85A4)()
+<<<<<<< HEAD
+<<<<<<< HEAD
 F (..\driver\Driver_ADC.c)(0x64300B06)(-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_adc.o -MD)
+=======
+F (..\driver\Driver_ADC.c)(0x64301005)(-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_adc.o -MD)
+>>>>>>> encoder
+=======
+F (..\driver\Driver_ADC.c)(0x64351540)(-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_adc.o -MD)
+>>>>>>> encoder
 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)
@@ -60,6 +127,8 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms
 I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E)
 I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78)
+<<<<<<< HEAD
+<<<<<<< HEAD
 I (..\driver\Driver_ADC.h)(0x64300B06)
 F (..\driver\Driver_ADC.h)(0x64300B06)()
 F (..\driver\Driver_IMU.c)(0x64300B06)(-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_imu.o -MD)
@@ -76,6 +145,14 @@ F (..\driver\Driver_IMU.h)(0x64300B06)()
 F (..\driver\MyI2C.h)(0x64300B06)()
 F (..\driver\MySPI.h)(0x64300B06)()
 F (..\driver\Lib_Com_Periph_2022.lib)(0x64300B06)()
+=======
+I (..\driver\Driver_ADC.h)(0x64301005)
+F (..\driver\Driver_ADC.h)(0x64301005)()
+>>>>>>> encoder
+=======
+I (..\driver\Driver_ADC.h)(0x64351540)
+F (..\driver\Driver_ADC.h)(0x64351540)()
+>>>>>>> encoder
 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)

projet-voilier/Objects/system_stm32f10x.d

@@ -1,6 +1,6 @@
 ./objects/system_stm32f10x.o: RTE\Device\STM32F103RB\system_stm32f10x.c \
   C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h \
-  RTE\_sim\RTE_Components.h \
+  RTE\_reel\RTE_Components.h \
   C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h \
   C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\stdint.h \
   C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h \

projet-voilier/projet-voilier.uvoptx

@@ -75,7 +75,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -125,7 +125,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGTARM</Key>
-          <Name>(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)</Name>
+          <Name>(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=536,178,957,583,0)(122=636,241,1057,646,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=857,223,1451,917,0)(160=165,202,613,616,0)(161=1241,338,1689,752,1)(162=896,470,1344,884,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)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -152,9 +152,9 @@
         <Bp>
           <Number>0</Number>
           <Type>0</Type>
-          <LineNumber>84</LineNumber>
+          <LineNumber>50</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134219102</Address>
+          <Address>134219480</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
@@ -163,14 +163,14 @@
           <BreakIfRCount>1</BreakIfRCount>
           <Filename>.\src\main.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\projet_voilier\src/main.c\84</Expression>
+          <Expression>\\projet_voilier\src/main.c\50</Expression>
         </Bp>
         <Bp>
           <Number>1</Number>
           <Type>0</Type>
-          <LineNumber>78</LineNumber>
+          <LineNumber>27</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134219086</Address>
+          <Address>134219466</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
@@ -179,7 +179,7 @@
           <BreakIfRCount>1</BreakIfRCount>
           <Filename>.\src\main.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\projet_voilier\src/main.c\78</Expression>
+          <Expression>\\projet_voilier\src/main.c\27</Expression>
         </Bp>
       </Breakpoint>
       <Tracepoint>
@@ -288,7 +288,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -338,7 +338,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGTARM</Key>
-          <Name>(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=16,47,662,720,0)(110=61,96,281,556,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=942,311,1363,716,1)(121=961,76,1382,481,0)(122=920,173,1341,578,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=105,137,504,482,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=418,192,1012,886,0)(132=207,214,801,908,0)(133=442,222,1036,916,0)(160=-1,-1,-1,-1,0)(161=978,399,1426,813,1)(162=455,416,903,830,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)</Name>
+          <Name>(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=16,47,662,720,0)(110=61,96,281,556,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=942,311,1363,716,0)(121=961,76,1382,481,0)(122=1030,235,1451,640,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=105,137,504,482,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=418,192,1012,886,0)(132=207,214,801,908,0)(133=955,258,1549,952,1)(160=-1,-1,-1,-1,0)(161=978,399,1426,813,0)(162=455,416,903,830,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)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -365,18 +365,18 @@
         <Bp>
           <Number>0</Number>
           <Type>0</Type>
-          <LineNumber>49</LineNumber>
+          <LineNumber>409</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134219140</Address>
+          <Address>84</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\src\main.c</Filename>
+          <Filename>RTE/Device/STM32F103RB/system_stm32f10x.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\projet_voilier_reel\src/main.c\49</Expression>
+          <Expression>\\projet_voilier_reel\RTE/Device/STM32F103RB/system_stm32f10x.c\409</Expression>
         </Bp>
       </Breakpoint>
       <Tracepoint>
@@ -397,7 +397,7 @@
         <AscS1>0</AscS1>
         <AscS2>0</AscS2>
         <AscS3>0</AscS3>
-        <aSer3>1</aSer3>
+        <aSer3>0</aSer3>
         <eProf>0</eProf>
         <aLa>0</aLa>
         <aPa1>0</aPa1>
@@ -449,6 +449,30 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\src\App_girouette.c</PathWithFileName>
+      <FilenameWithoutPath>App_girouette.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\src\App_girouette.h</PathWithFileName>
+      <FilenameWithoutPath>App_girouette.h</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
@@ -459,7 +483,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>2</FileNumber>
+      <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -471,7 +495,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>3</FileNumber>
+      <FileNumber>5</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -483,7 +507,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>4</FileNumber>
+      <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -495,7 +519,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>5</FileNumber>
+      <FileNumber>7</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -507,7 +531,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>6</FileNumber>
+      <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -519,7 +543,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>7</FileNumber>
+      <FileNumber>9</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -531,7 +555,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>8</FileNumber>
+      <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -543,7 +567,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>9</FileNumber>
+      <FileNumber>11</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -553,66 +577,6 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>10</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\driver\Driver_IMU.c</PathWithFileName>
-      <FilenameWithoutPath>Driver_IMU.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>11</FileNumber>
-      <FileType>5</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\driver\Driver_IMU.h</PathWithFileName>
-      <FilenameWithoutPath>Driver_IMU.h</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>12</FileNumber>
-      <FileType>5</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\driver\MyI2C.h</PathWithFileName>
-      <FilenameWithoutPath>MyI2C.h</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>13</FileNumber>
-      <FileType>5</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\driver\MySPI.h</PathWithFileName>
-      <FilenameWithoutPath>MySPI.h</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>14</FileNumber>
-      <FileType>4</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\driver\Lib_Com_Periph_2022.lib</PathWithFileName>
-      <FilenameWithoutPath>Lib_Com_Periph_2022.lib</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
   </Group>
 
   <Group>

projet-voilier/projet-voilier.uvprojx

@@ -389,6 +389,16 @@
               <FileType>1</FileType>
               <FilePath>.\src\main.c</FilePath>
             </File>
+            <File>
+              <FileName>App_girouette.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\src\App_girouette.c</FilePath>
+            </File>
+            <File>
+              <FileName>App_girouette.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>.\src\App_girouette.h</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -434,31 +444,6 @@
               <FileType>5</FileType>
               <FilePath>..\driver\Driver_ADC.h</FilePath>
             </File>
-            <File>
-              <FileName>Driver_IMU.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\driver\Driver_IMU.c</FilePath>
-            </File>
-            <File>
-              <FileName>Driver_IMU.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\driver\Driver_IMU.h</FilePath>
-            </File>
-            <File>
-              <FileName>MyI2C.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\driver\MyI2C.h</FilePath>
-            </File>
-            <File>
-              <FileName>MySPI.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\driver\MySPI.h</FilePath>
-            </File>
-            <File>
-              <FileName>Lib_Com_Periph_2022.lib</FileName>
-              <FileType>4</FileType>
-              <FilePath>..\driver\Lib_Com_Periph_2022.lib</FilePath>
-            </File>
           </Files>
         </Group>
         <Group>
@@ -852,6 +837,16 @@
               <FileType>1</FileType>
               <FilePath>.\src\main.c</FilePath>
             </File>
+            <File>
+              <FileName>App_girouette.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\src\App_girouette.c</FilePath>
+            </File>
+            <File>
+              <FileName>App_girouette.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>.\src\App_girouette.h</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -897,31 +892,6 @@
               <FileType>5</FileType>
               <FilePath>..\driver\Driver_ADC.h</FilePath>
             </File>
-            <File>
-              <FileName>Driver_IMU.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\driver\Driver_IMU.c</FilePath>
-            </File>
-            <File>
-              <FileName>Driver_IMU.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\driver\Driver_IMU.h</FilePath>
-            </File>
-            <File>
-              <FileName>MyI2C.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\driver\MyI2C.h</FilePath>
-            </File>
-            <File>
-              <FileName>MySPI.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\driver\MySPI.h</FilePath>
-            </File>
-            <File>
-              <FileName>Lib_Com_Periph_2022.lib</FileName>
-              <FileType>4</FileType>
-              <FilePath>..\driver\Lib_Com_Periph_2022.lib</FilePath>
-            </File>
           </Files>
         </Group>
         <Group>

projet-voilier/src/App_girouette.c

@@ -0,0 +1,35 @@
+#include "App_girouette.h"
+
+void App_Girouette_Init(void) {
+    MyTimer_Struct_TypeDef Encodeur;
+	Encodeur.Timer = TIM4;
+	Encodeur.channel = 2;
+	MyTimer_Base_Init(&Encodeur);
+	MyTimer_ConfigureEncoder(&Encodeur);
+	MyTimer_Start(&Encodeur);
+
+    // 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);	
+
+}
+
+uint16_t App_Girouette_GetDirection(void)
+{
+    uint16_t cnt = TIM_GetCounter(TIM4); // Lit la valeur actuelle du compteur CNT
+    uint16_t arr = TIM4->ARR + 1; // Lit la valeur de ARR configurée pour le timer TIM4
+
+    // Convertit la valeur CNT en direction de vent
+    uint16_t direction = (360.0 / 1440.0) * cnt;
+
+    return direction;
+}

projet-voilier/src/App_girouette.h

@@ -0,0 +1,13 @@
+#ifndef APP_GIROUETTE_H_
+#define APP_GIROUETTE_H_
+
+#include "stm32f10x.h"
+#include "Driver_GPIO.h"
+#include "Driver_Timer.h"
+
+#define GYRO_MAX_COUNT 4096 // Nombre de pas du codeur incrémental
+
+void App_Girouette_Init(void);
+uint16_t App_Girouette_GetDirection(void);
+
+#endif /* APP_GIROUETTE_H_ */

projet-voilier/src/main.c

@@ -6,18 +6,129 @@
 #include "Driver_ADC.h"
 #include "MySPI.h"
 #include "Driver_IMU.h"
+
+
+//Applications
+
+MyGPIO_Struct_TypeDef TI1;
+
+MyGPIO_Struct_TypeDef TI2;
+
+
+MyTimer_Struct_TypeDef Encoder;
+Encoder->Timer = TIM4;
+MyTimer_Base_Init(&Encoder);
+MyTimer_ConfigureEncoder(&Encoder);
+MyTimer_Start(&Encoder);
+
+// Application
+#include "App_girouette.h"
+
 int main() {
-//Pour le Driver_IMU
-	char DATAX0 = 0x32;
-	unsigned char values[6];
 
-	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);
 	
-  driver_adc_1_launch_read();
 
-	driver_IMU_init();
-	while(1)
-	{
-		driver_IMU_read(DATAX0, 6, values);
+	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_PLATEAU;
+	// PWM_PLATEAU.Timer = TIM2;
+	// PWM_PLATEAU.PSC = 7200;
+	// PWM_PLATEAU.ARR = 200;
+	// PWM_PLATEAU.channel = 1;
+	// MyTimer_Base_Init(&PWM_PLATEAU);
+	// MyTimer_ConfigurePWM(&PWM_PLATEAU, 60);
+	// MyTimer_Start(&PWM_PLATEAU);
+
+
+
+
+
+
+
+
+
+
+
+	MyGPIO_Struct_TypeDef UART_GPIO;
+	UART_GPIO.GPIO_Pin = 10; //TX
+	UART_GPIO.GPIO_Conf = AltOut_Ppull;
+	UART_GPIO.GPIO = GPIOB;
+	MyGPIO_Init(&UART_GPIO);
+
+	UART_GPIO.GPIO_Pin = 11; //RX
+	UART_GPIO.GPIO_Conf = In_Floating;
+	UART_GPIO.GPIO = GPIOB;
+	MyGPIO_Init(&UART_GPIO);
+
+	
+
+	MyUART_Struct_TypeDef UART;
+	UART.baudrate = 9600;
+	UART.UART = USART3;
+	MyUART_Init(&UART);
+
+	// TX: PB10
+	// RX: PB11
+
+
+	// Initialisation
+	App_Girouette_Init();
+
+
+
+
+	
+
+	
+
+	while(1) {
+	
+		int dir = App_Girouette_GetDirection();
+
+		
+		if ((dir >= 335) && (dir < 25)) {				//Vent debout
+			MyTimer_SetPWMDutyCycle(&PWM_VOILE, 10);
+		} else if ((dir >= 160) && (dir < 200)) {	//Vent arrière
+			MyTimer_SetPWMDutyCycle(&PWM_VOILE, 5);
+		} else if((dir >= 325) && (dir < 335)){	//Vent 	Près
+			MyTimer_SetPWMDutyCycle(&PWM_VOILE, 9);
+		} else if((dir >= 295) && (dir < 325)){	//Vent bon plein
+			MyTimer_SetPWMDutyCycle(&PWM_VOILE, 8);
+		} else if ((dir >= 245) && (dir < 295)) {	//Vent largue
+			MyTimer_SetPWMDutyCycle(&PWM_VOILE, 7);
+		} else if((dir >= 200) && (dir < 245)){	//Vent Grand largue
+			MyTimer_SetPWMDutyCycle(&PWM_VOILE, 8);
+		}
+		else {
+			MyTimer_SetPWMDutyCycle(&PWM_VOILE, 10);			//Reste
+		}
+
+		
+
+		
+		char str[32];
+		sprintf(str, "Dir: %f deg", (float)dir);
+
+		MyUART_SendString(&UART, str);
+		MyUART_SendByte(&UART, '\n');
+
 	}
 }