Merged encoder to master

driver/Driver_GPIO.c

@@ -28,7 +28,7 @@ void MyGPIO_Init ( MyGPIO_Struct_TypeDef * GPIOStructPtr )
 	/* Reset, and then configuration writing of the selected GPIO Pin */	
 	if(GPIOStructPtr->GPIO_Pin <= 8)
 	{
-		GPIOStructPtr->GPIO->CRL &= ~0xF<<(4*(GPIOStructPtr->GPIO_Pin));
+		GPIOStructPtr->GPIO->CRL &= ~(0xF<<(4*(GPIOStructPtr->GPIO_Pin)));
 		GPIOStructPtr->GPIO->CRL |= (GPIOStructPtr->GPIO_Conf)<<(4*(GPIOStructPtr->GPIO_Pin));
 	}
 	else

driver/Driver_GPIO.h

@@ -20,7 +20,7 @@ typedef struct
 /**
 *************************************************************************************************
 * @brief Fonction d'initialisation pour les GPIO
-* @param -> Paramètre sous forme d’une structure (son adresse) qui défini le pin, le port et la conf du GPIO
+* @param -> Param<EFBFBD>tre sous forme d<EFBFBD>une structure (son adresse) qui d<EFBFBD>fini le pin, le port et la conf du GPIO
 * @Note -> 
 *************************************************************************************************
 */
@@ -28,9 +28,9 @@ void MyGPIO_Init ( MyGPIO_Struct_TypeDef * GPIOStructPtr );
 
 /**
 *************************************************************************************************
-* @brief Fonction pour lire l'état de la GPIO
+* @brief Fonction pour lire l'<EFBFBD>tat de la GPIO
-* @param : Paramètre sous forme d’une structure (son adresse) qui défini le pin et le port
+* @param : Param<EFBFBD>tre sous forme d<EFBFBD>une structure (son adresse) qui d<EFBFBD>fini le pin et le port
-* @return : Renvoie 0 ou autre chose différent de 0
+* @return : Renvoie 0 ou autre chose diff<EFBFBD>rent de 0
 *************************************************************************************************
 */
 int MyGPIO_Read ( GPIO_TypeDef * GPIO , char GPIO_Pin );
@@ -38,7 +38,7 @@ int MyGPIO_Read ( GPIO_TypeDef * GPIO , char GPIO_Pin );
 /**
 *************************************************************************************************
 * @brief Fonction pour set le pin voulu
-* @param -> Paramètre sous forme d’une structure (son adresse) qui défini le pin et le port
+* @param -> Param<EFBFBD>tre sous forme d<EFBFBD>une structure (son adresse) qui d<EFBFBD>fini le pin et le port
 * @Note -> 
 *************************************************************************************************
 */
@@ -47,7 +47,7 @@ void MyGPIO_Set ( GPIO_TypeDef * GPIO , char GPIO_Pin );
 /**
 *************************************************************************************************
 * @brief Fonction pour reset le pin voulu
-* @param -> Paramètre sous forme d’une structure (son adresse) qui défini le pin et le port
+* @param -> Param<EFBFBD>tre sous forme d<EFBFBD>une structure (son adresse) qui d<EFBFBD>fini le pin et le port
 * @Note -> 
 *************************************************************************************************
 */
@@ -56,7 +56,7 @@ void MyGPIO_Reset ( GPIO_TypeDef * GPIO , char GPIO_Pin );
 /**
 *************************************************************************************************
 * @brief Fonction pour toogle le pin voulu
-* @param -> Paramètre sous forme d’une structure (son adresse) qui défini le pin et le port
+* @param -> Param<EFBFBD>tre sous forme d<EFBFBD>une structure (son adresse) qui d<EFBFBD>fini le pin et le port
 * @Note -> 
 *************************************************************************************************
 */

driver/Driver_Timer.c

@@ -45,29 +45,26 @@ void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint8_t channel, uint16
 
   uint16_t CCR_Value = (duty_cycle * TIM2->ARR) / 100;
 
-  // Configurer le Timer en mode PWM
-
-
   // Configurer le Channel
-  if (channel == 1) {
+  if (Timer->channel == 1) {
 	Timer->Timer->CCMR1 = TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC1M_1;
-	Timer->Timer->CCMR1 |= TIM_CCMR1_OC1PE; // activer la précharge du registre de comparaison
+	Timer->Timer->CCMR1 |= TIM_CCMR1_OC1PE; // activer la pr<EFBFBD>charge du registre de comparaison
 	Timer->Timer->CCER |= TIM_CCER_CC1E;
 	Timer->Timer->CCR1 = CCR_Value;
-  } else if (channel == 2) {
+  } else if (Timer->channel == 2) {
 	Timer->Timer->CCMR1 = TIM_CCMR1_OC2M_2 | TIM_CCMR1_OC2M_1;
-	Timer->Timer->CCMR1 |= TIM_CCMR1_OC2PE; // activer la précharge du registre de comparaison
+	Timer->Timer->CCMR1 |= TIM_CCMR1_OC2PE; // activer la pr<EFBFBD>charge du registre de comparaison
 	Timer->Timer->CCER |= TIM_CCER_CC2E;
 	Timer->Timer->CCR2 = CCR_Value;
-  } else if (channel == 3) {
+  } else if (Timer->channel == 3) {
 	Timer->Timer->CCMR2 = TIM_CCMR2_OC3M_2 | TIM_CCMR2_OC3M_1;
-	Timer->Timer->CCMR2 |= TIM_CCMR2_OC3PE; // activer la précharge du registre de comparaison
+	Timer->Timer->CCMR2 |= TIM_CCMR2_OC3PE; // activer la pr<EFBFBD>charge du registre de comparaison
 	Timer->Timer->CCER |= TIM_CCER_CC3E;
 	Timer->Timer->CCER &= ~TIM_CCER_CC3P;
 	Timer->Timer->CCR3 = CCR_Value;	
-  } else if (channel == 4) {
+  } else if (Timer->channel == 4) {
 	Timer->Timer->CCMR2 = TIM_CCMR2_OC4M_2 | TIM_CCMR2_OC4M_1;
-	Timer->Timer->CCMR2 |= TIM_CCMR2_OC4PE; // activer la précharge du registre de comparaison
+	Timer->Timer->CCMR2 |= TIM_CCMR2_OC4PE; // activer la pr<EFBFBD>charge du registre de comparaison
 	Timer->Timer->CCER |= TIM_CCER_CC4E;
 	Timer->Timer->CCR4 = CCR_Value;
   }

driver/Driver_Timer.h

@@ -8,20 +8,21 @@ typedef struct
     TIM_TypeDef * Timer;
     unsigned short ARR;
     unsigned short PSC;
+    uint8_t channel; // 1 2 3 or 4
 } MyTimer_Struct_TypeDef;
 
 /**
 *************************************************************************************************
 * @brief Initialisation du timer
-* @param -> Paramètre sous forme d’une structure (son adresse) contenant les informations du timer
+* @param -> Param<EFBFBD>tre sous forme d<EFBFBD>une structure (son adresse) contenant les informations du timer
-* @Note -> Fonction à lancer systématiquement avant d’aller plus en détail dans les conf plus fines (PWM, codeur inc...)*************************************************************************************************
+* @Note -> Fonction <EFBFBD> lancer syst<EFBFBD>matiquement avant d<EFBFBD>aller plus en d<EFBFBD>tail dans les conf plus fines (PWM, codeur inc...)*************************************************************************************************
 */
 void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer);
 
 /**
 *************************************************************************************************
 * @brief Fonction pour lancer le timer voulu
-* @param -> Paramètre sous forme d’une structure (son adresse) qui défini le numéro du timer
+* @param -> Param<EFBFBD>tre sous forme d<EFBFBD>une structure (son adresse) qui d<EFBFBD>fini le num<EFBFBD>ro du timer
 * @Note -> 
 *************************************************************************************************
 */
@@ -29,8 +30,8 @@ void MyTimer_Start(MyTimer_Struct_TypeDef * Timer);
 
 /**
 *************************************************************************************************
-* @brief Fonction pour arrêter le timer voulu
+* @brief Fonction pour arr<EFBFBD>ter le timer voulu
-* @param -> Paramètre sous forme d’une structure (son adresse) qui défini le numéro du timer
+* @param -> Param<EFBFBD>tre sous forme d<EFBFBD>une structure (son adresse) qui d<EFBFBD>fini le num<EFBFBD>ro du timer
 * @Note 
 *************************************************************************************************
 */
@@ -38,9 +39,9 @@ void MyTimer_Stop(MyTimer_Struct_TypeDef * Timer);
 /**
 **************************************************************************************************
 * @brief Active une interruption utilisant un timer
-* @param : -TIM_TypeDef * Timer : Timer concerné
+* @param : -TIM_TypeDef * Timer : Timer concern<EFBFBD>
 * 				- char Prio: de 0 a 15
-* @Note : La fonction MyTimer_Base_Init doit avoir été lancée au prealable
+* @Note : La fonction MyTimer_Base_Init doit avoir <EFBFBD>t<EFBFBD> lanc<EFBFBD>e au prealable
 **************************************************************************************************
 */
 void MyTimer_ActiveIT (TIM_TypeDef * Timer, char Prio, void (*IT_function)(void));
@@ -48,8 +49,8 @@ void MyTimer_ActiveIT (TIM_TypeDef * Timer, char Prio, void (*IT_function)(void)
 /**
 *************************************************************************************************
 * @brief Fonction pour le timer du PWM
-* @param : -TIM_TypeDef * Timer : Timer concerné
+* @param : -TIM_TypeDef * Timer : Timer concern<EFBFBD>
-* 				- char Channel : channel du PWM concerné
+* 				- char Channel : channel du PWM concern<EFBFBD>
 *************************************************************************************************
 */
 void MyTimer_PWM(TIM_TypeDef * Timer, char Channel);
@@ -57,9 +58,9 @@ void MyTimer_PWM(TIM_TypeDef * Timer, char Channel);
 /**
 *************************************************************************************************
 * @brief Fonction pour configurer le PWM
-* @param : -TIM_TypeDef * Timer : Timer concerné
+* @param : -TIM_TypeDef * Timer : Timer concern<EFBFBD>
-* 				- uint8_t pwm_channel : choix du channel du PWM utilisé
+* 				- uint8_t pwm_channel : choix du channel du PWM utilis<EFBFBD>
-*					- uint16_t duty_cycle : choix du temps à la l'état haut
+*					- uint16_t duty_cycle : choix du temps <EFBFBD> la l'<EFBFBD>tat haut
 *************************************************************************************************
 */
 void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint8_t pwm_channel, uint16_t duty_cycle);

driver/Driver_UART.c

@@ -17,19 +17,21 @@ void MyUART_Init(MyUART_Struct_TypeDef *UART) {
   UART->UART->CR1 |= USART_CR1_TE | USART_CR1_RE;
 
   UART->UART->CR2 &= ~(0x11 << 12);
+  
+  USART3->CR1 |= USART_CR1_RXNEIE | USART_CR1_TXEIE; // Active les interruptions de l'UART
 
+  __enable_irq();// Active les interruptions globales
 
 }
 
 void MyUART_SendByte(MyUART_Struct_TypeDef *UART, uint8_t data) {
   // Attendre que le registre de données soit prêt à être envoyé
-  while (!(UART->UART->SR & USART_SR_TXE));
+  //while (!(UART->UART->SR & USART_SR_TXE));
 
   // Envoyer la donnée
   UART->UART->DR = data;
 
-  // Attendre que la donnée soit envoyée
+  USART3->CR1 |= USART_CR1_TXEIE; // Active l'interruption d'envoi de données
-  while (!(UART->UART->SR & USART_SR_TC));
 }
 
 uint8_t MyUART_ReceiveByte(MyUART_Struct_TypeDef *UART) {
@@ -44,4 +46,14 @@ uint8_t MyUART_ReceiveByte(MyUART_Struct_TypeDef *UART) {
 	
   // Renvoyer la donnée lue
   return data;
-}
+}
+
+void USART3_IRQHandler(void) {
+  if (USART3->SR & USART_SR_RXNE) {
+    
+  }
+
+  if (USART3->SR & USART_SR_TXE) {
+   
+  }
+}

projet-voilier/Listings/projet-voilier.map

@@ -4,6 +4,7 @@ Component: ARM Compiler 5.06 update 7 (build 960) Tool: armlink [4d3601]
 
 Section Cross References
 
+<<<<<<< HEAD
     main.o(i.main) refers to imu.o(i.source_IMU_init) for source_IMU_init
     main.o(i.main) refers to imu.o(i.source_IMU_read) for source_IMU_read
     main.o(i.toto) refers to driver_adc.o(i.driver_adc_1_read) for driver_adc_1_read
@@ -27,15 +28,58 @@ Section Cross References
     imu.o(i.source_IMU_write_register) refers to myspi.o(i.MySPI_Clear_NSS) for MySPI_Clear_NSS
     imu.o(i.source_IMU_write_register) refers to myspi.o(i.MySPI_Send) for MySPI_Send
     imu.o(i.source_IMU_write_register) refers to myspi.o(i.MySPI_Set_NSS) for MySPI_Set_NSS
+=======
+    main.o(.text.main) refers to driver_gpio.o(.text.MyGPIO_Init) for MyGPIO_Init
+    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
+    main.o(.ARM.exidx.text.main) refers to main.o(.text.main) for [Anonymous Symbol]
+    driver_gpio.o(.ARM.exidx.text.MyGPIO_Init) refers to driver_gpio.o(.text.MyGPIO_Init) for [Anonymous Symbol]
+    driver_gpio.o(.ARM.exidx.text.MyGPIO_Read) refers to driver_gpio.o(.text.MyGPIO_Read) for [Anonymous Symbol]
+    driver_gpio.o(.ARM.exidx.text.MyGPIO_Set) refers to driver_gpio.o(.text.MyGPIO_Set) for [Anonymous Symbol]
+    driver_gpio.o(.ARM.exidx.text.MyGPIO_Reset) refers to driver_gpio.o(.text.MyGPIO_Reset) for [Anonymous Symbol]
+    driver_gpio.o(.ARM.exidx.text.MyGPIO_Toggle) refers to driver_gpio.o(.text.MyGPIO_Toggle) for [Anonymous Symbol]
+    driver_timer.o(.ARM.exidx.text.MyTimer_Base_Init) refers to driver_timer.o(.text.MyTimer_Base_Init) for [Anonymous Symbol]
+    driver_timer.o(.ARM.exidx.text.MyTimer_Start) refers to driver_timer.o(.text.MyTimer_Start) for [Anonymous Symbol]
+    driver_timer.o(.ARM.exidx.text.MyTimer_Stop) refers to driver_timer.o(.text.MyTimer_Stop) for [Anonymous Symbol]
+    driver_timer.o(.ARM.exidx.text.MyTimer_ConfigurePWM) refers to driver_timer.o(.text.MyTimer_ConfigurePWM) for [Anonymous Symbol]
+    driver_timer.o(.ARM.exidx.text.MyTimer_SetPWMDutyCycle) refers to driver_timer.o(.text.MyTimer_SetPWMDutyCycle) for [Anonymous Symbol]
+    driver_timer.o(.ARM.exidx.text.MyTimer_ConfigureEncoder) refers to driver_timer.o(.text.MyTimer_ConfigureEncoder) for [Anonymous Symbol]
+    driver_timer.o(.ARM.exidx.text.Bug) refers to driver_timer.o(.text.Bug) for [Anonymous Symbol]
+    driver_timer.o(.text.MyTimer_ActiveIT) refers to driver_timer.o(.data.TIM2_fx) for TIM2_fx
+    driver_timer.o(.text.MyTimer_ActiveIT) refers to driver_timer.o(.data.TIM4_fx) for TIM4_fx
+    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(.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(.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
+    driver_uart.o(.ARM.exidx.text.MyUART_Init) refers to driver_uart.o(.text.MyUART_Init) for [Anonymous Symbol]
+    driver_uart.o(.ARM.exidx.text.MyUART_SendByte) refers to driver_uart.o(.text.MyUART_SendByte) for [Anonymous Symbol]
+    driver_uart.o(.ARM.exidx.text.MyUART_ReceiveByte) refers to driver_uart.o(.text.MyUART_ReceiveByte) for [Anonymous Symbol]
+    driver_uart.o(.ARM.exidx.text.USART3_IRQHandler) refers to driver_uart.o(.text.USART3_IRQHandler) for [Anonymous Symbol]
+>>>>>>> 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_adc.o(i.ADC1_2_IRQHandler) for ADC1_2_IRQHandler
     startup_stm32f10x_md.o(RESET) refers to driver_timer.o(i.TIM2_IRQHandler) for TIM2_IRQHandler
     startup_stm32f10x_md.o(RESET) refers to driver_timer.o(i.TIM3_IRQHandler) for TIM3_IRQHandler
     startup_stm32f10x_md.o(RESET) refers to driver_timer.o(i.TIM4_IRQHandler) for TIM4_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
+    startup_stm32f10x_md.o(RESET) refers to driver_timer.o(.text.TIM4_IRQHandler) for TIM4_IRQHandler
+    startup_stm32f10x_md.o(RESET) refers to driver_uart.o(.text.USART3_IRQHandler) for USART3_IRQHandler
+>>>>>>> encoder
     startup_stm32f10x_md.o(.text) refers (Special) to heapauxi.o(.text) for __use_two_region_memory
     startup_stm32f10x_md.o(.text) refers to system_stm32f10x.o(i.SystemInit) for SystemInit
     startup_stm32f10x_md.o(.text) refers to __main.o(!!!main) for __main
@@ -155,6 +199,7 @@ Section Cross References
 
 Removing Unused input sections from the image.
 
+<<<<<<< HEAD
     Removing main.o(.rev16_text), (4 bytes).
     Removing main.o(.revsh_text), (4 bytes).
     Removing main.o(.rrx_text), (6 bytes).
@@ -197,6 +242,53 @@ Removing Unused input sections from the image.
     Removing myspi.o(.rrx_text), (6 bytes).
 
 40 unused section(s) (total 1219 bytes) removed 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 driver_gpio.o(.text), (0 bytes).
+    Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Init), (8 bytes).
+    Removing driver_gpio.o(.text.MyGPIO_Read), (12 bytes).
+    Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Read), (8 bytes).
+    Removing driver_gpio.o(.text.MyGPIO_Set), (14 bytes).
+    Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Set), (8 bytes).
+    Removing driver_gpio.o(.text.MyGPIO_Reset), (16 bytes).
+    Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Reset), (8 bytes).
+    Removing driver_gpio.o(.text.MyGPIO_Toggle), (14 bytes).
+    Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Toggle), (8 bytes).
+    Removing driver_timer.o(.text), (0 bytes).
+    Removing driver_timer.o(.ARM.exidx.text.MyTimer_Base_Init), (8 bytes).
+    Removing driver_timer.o(.ARM.exidx.text.MyTimer_Start), (8 bytes).
+    Removing driver_timer.o(.text.MyTimer_Stop), (12 bytes).
+    Removing driver_timer.o(.ARM.exidx.text.MyTimer_Stop), (8 bytes).
+    Removing driver_timer.o(.text.MyTimer_ConfigurePWM), (166 bytes).
+    Removing driver_timer.o(.ARM.exidx.text.MyTimer_ConfigurePWM), (8 bytes).
+    Removing driver_timer.o(.text.MyTimer_SetPWMDutyCycle), (82 bytes).
+    Removing driver_timer.o(.ARM.exidx.text.MyTimer_SetPWMDutyCycle), (8 bytes).
+    Removing driver_timer.o(.ARM.exidx.text.MyTimer_ConfigureEncoder), (8 bytes).
+    Removing driver_timer.o(.ARM.exidx.text.Bug), (8 bytes).
+    Removing driver_timer.o(.text.MyTimer_ActiveIT), (150 bytes).
+    Removing driver_timer.o(.ARM.exidx.text.MyTimer_ActiveIT), (8 bytes).
+    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_uart.o(.text), (0 bytes).
+    Removing driver_uart.o(.text.MyUART_Init), (76 bytes).
+    Removing driver_uart.o(.ARM.exidx.text.MyUART_Init), (8 bytes).
+    Removing driver_uart.o(.text.MyUART_SendByte), (22 bytes).
+    Removing driver_uart.o(.ARM.exidx.text.MyUART_SendByte), (8 bytes).
+    Removing driver_uart.o(.text.MyUART_ReceiveByte), (24 bytes).
+    Removing driver_uart.o(.ARM.exidx.text.MyUART_ReceiveByte), (8 bytes).
+    Removing driver_uart.o(.ARM.exidx.text.USART3_IRQHandler), (8 bytes).
+    Removing system_stm32f10x.o(.text), (0 bytes).
+    Removing system_stm32f10x.o(.ARM.exidx.text.SystemInit), (8 bytes).
+    Removing system_stm32f10x.o(.text.SystemCoreClockUpdate), (110 bytes).
+    Removing system_stm32f10x.o(.ARM.exidx.text.SystemCoreClockUpdate), (8 bytes).
+    Removing system_stm32f10x.o(.data.SystemCoreClock), (4 bytes).
+    Removing system_stm32f10x.o(.rodata.AHBPrescTable), (16 bytes).
+
+43 unused section(s) (total 906 bytes) removed from the image.
+>>>>>>> encoder
 
 ==============================================================================
 
@@ -325,6 +417,7 @@ Image Symbol Table
     .text                                    0x08000234   Section        0  sys_exit.o(.text)
     .text                                    0x08000240   Section        2  use_no_semi.o(.text)
     .text                                    0x08000242   Section        0  indicate_semi.o(.text)
+<<<<<<< HEAD
     i.ADC1_2_IRQHandler                      0x08000244   Section        0  driver_adc.o(i.ADC1_2_IRQHandler)
     i.Bug                                    0x08000264   Section        0  driver_timer.o(i.Bug)
     i.MySPI_Clear_NSS                        0x08000268   Section        0  myspi.o(i.MySPI_Clear_NSS)
@@ -354,6 +447,25 @@ Image Symbol Table
     STACK                                    0x20000278   Section     1024  startup_stm32f10x_md.o(STACK)
     Stack_Mem                                0x20000278   Data        1024  startup_stm32f10x_md.o(STACK)
     __initial_sp                             0x20000678   Data           0  startup_stm32f10x_md.o(STACK)
+=======
+    [Anonymous Symbol]                       0x08000244   Section        0  driver_timer.o(.text.Bug)
+    [Anonymous Symbol]                       0x08000248   Section        0  driver_gpio.o(.text.MyGPIO_Init)
+    [Anonymous Symbol]                       0x080002e4   Section        0  driver_timer.o(.text.MyTimer_Base_Init)
+    [Anonymous Symbol]                       0x08000370   Section        0  driver_timer.o(.text.MyTimer_ConfigureEncoder)
+    [Anonymous Symbol]                       0x080003b8   Section        0  driver_timer.o(.text.MyTimer_Start)
+    [Anonymous Symbol]                       0x080003c4   Section        0  system_stm32f10x.o(.text.SystemInit)
+    [Anonymous Symbol]                       0x080004d4   Section        0  driver_timer.o(.text.TIM2_IRQHandler)
+    [Anonymous Symbol]                       0x080004f0   Section        0  driver_timer.o(.text.TIM3_IRQHandler)
+    [Anonymous Symbol]                       0x0800050c   Section        0  driver_timer.o(.text.TIM4_IRQHandler)
+    [Anonymous Symbol]                       0x08000528   Section        0  driver_uart.o(.text.USART3_IRQHandler)
+    [Anonymous Symbol]                       0x08000538   Section        0  main.o(.text.main)
+    .bss                                     0x20000010   Section       96  libspace.o(.bss)
+    Heap_Mem                                 0x20000070   Data         512  startup_stm32f10x_md.o(HEAP)
+    HEAP                                     0x20000070   Section      512  startup_stm32f10x_md.o(HEAP)
+    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
 
@@ -486,7 +598,6 @@ Image Symbol Table
     TIM1_UP_IRQHandler                       0x080001a3   Thumb Code     0  startup_stm32f10x_md.o(.text)
     USART1_IRQHandler                        0x080001a3   Thumb Code     0  startup_stm32f10x_md.o(.text)
     USART2_IRQHandler                        0x080001a3   Thumb Code     0  startup_stm32f10x_md.o(.text)
-    USART3_IRQHandler                        0x080001a3   Thumb Code     0  startup_stm32f10x_md.o(.text)
     USBWakeUp_IRQHandler                     0x080001a3   Thumb Code     0  startup_stm32f10x_md.o(.text)
     USB_HP_CAN1_TX_IRQHandler                0x080001a3   Thumb Code     0  startup_stm32f10x_md.o(.text)
     USB_LP_CAN1_RX0_IRQHandler               0x080001a3   Thumb Code     0  startup_stm32f10x_md.o(.text)
@@ -504,6 +615,7 @@ Image Symbol Table
     __I$use$semihosting                      0x08000241   Thumb Code     0  use_no_semi.o(.text)
     __use_no_semihosting_swi                 0x08000241   Thumb Code     2  use_no_semi.o(.text)
     __semihosting_library_function           0x08000243   Thumb Code     0  indicate_semi.o(.text)
+<<<<<<< HEAD
     ADC1_2_IRQHandler                        0x08000245   Thumb Code    22  driver_adc.o(i.ADC1_2_IRQHandler)
     Bug                                      0x08000265   Thumb Code     4  driver_timer.o(i.Bug)
     MySPI_Clear_NSS                          0x08000269   Thumb Code    30  myspi.o(i.MySPI_Clear_NSS)
@@ -529,6 +641,26 @@ Image Symbol Table
     ActiveSPI                                0x20000010   Data           4  myspi.o(.data)
     __libspace_start                         0x20000014   Data          96  libspace.o(.bss)
     __temporary_stack_top$libspace           0x20000074   Data           0  libspace.o(.bss)
+=======
+    Bug                                      0x08000245   Thumb Code     2  driver_timer.o(.text.Bug)
+    MyGPIO_Init                              0x08000249   Thumb Code   140  driver_gpio.o(.text.MyGPIO_Init)
+    MyTimer_Base_Init                        0x080002e5   Thumb Code   140  driver_timer.o(.text.MyTimer_Base_Init)
+    MyTimer_ConfigureEncoder                 0x08000371   Thumb Code    70  driver_timer.o(.text.MyTimer_ConfigureEncoder)
+    MyTimer_Start                            0x080003b9   Thumb Code    12  driver_timer.o(.text.MyTimer_Start)
+    SystemInit                               0x080003c5   Thumb Code   272  system_stm32f10x.o(.text.SystemInit)
+    TIM2_IRQHandler                          0x080004d5   Thumb Code    26  driver_timer.o(.text.TIM2_IRQHandler)
+    TIM3_IRQHandler                          0x080004f1   Thumb Code    28  driver_timer.o(.text.TIM3_IRQHandler)
+    TIM4_IRQHandler                          0x0800050d   Thumb Code    28  driver_timer.o(.text.TIM4_IRQHandler)
+    USART3_IRQHandler                        0x08000529   Thumb Code    14  driver_uart.o(.text.USART3_IRQHandler)
+    main                                     0x08000539   Thumb Code    78  main.o(.text.main)
+    Region$$Table$$Base                      0x08000588   Number         0  anon$$obj.o(Region$$Table)
+    Region$$Table$$Limit                     0x080005a8   Number         0  anon$$obj.o(Region$$Table)
+    TIM2_fx                                  0x20000000   Data           4  driver_timer.o(.data.TIM2_fx)
+    TIM3_fx                                  0x20000004   Data           4  driver_timer.o(.data.TIM3_fx)
+    TIM4_fx                                  0x20000008   Data           4  driver_timer.o(.data.TIM4_fx)
+    __libspace_start                         0x20000010   Data          96  libspace.o(.bss)
+    __temporary_stack_top$libspace           0x20000070   Data           0  libspace.o(.bss)
+>>>>>>> encoder
 
 
 
@@ -538,6 +670,7 @@ Memory Map of the image
 
   Image Entry point : 0x08000189
 
+<<<<<<< HEAD
   Load Region LR_1 (Base: 0x08000000, Size: 0x000007c8, Max: 0xffffffff, ABSOLUTE)
 
     Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000007b4, Max: 0xffffffff, ABSOLUTE)
@@ -642,6 +775,108 @@ Memory Map of the image
     0x20000074   0x080007c8   0x00000004   PAD
     0x20000078        -       0x00000200   Zero   RW          309    HEAP                startup_stm32f10x_md.o
     0x20000278        -       0x00000400   Zero   RW          308    STACK               startup_stm32f10x_md.o
+=======
+  Load Region LR_1 (Base: 0x08000000, Size: 0x000005b4, Max: 0xffffffff, ABSOLUTE)
+
+    Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000005a8, Max: 0xffffffff, ABSOLUTE)
+
+    Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
+
+    0x08000000   0x08000000   0x000000ec   Data   RO           79    RESET               startup_stm32f10x_md.o
+    0x080000ec   0x080000ec   0x00000008   Code   RO          104  * !!!main             c_w.l(__main.o)
+    0x080000f4   0x080000f4   0x00000034   Code   RO          269    !!!scatter          c_w.l(__scatter.o)
+    0x08000128   0x08000128   0x0000001a   Code   RO          271    !!handler_copy      c_w.l(__scatter_copy.o)
+    0x08000142   0x08000142   0x00000002   PAD
+    0x08000144   0x08000144   0x0000001c   Code   RO          273    !!handler_zi        c_w.l(__scatter_zi.o)
+    0x08000160   0x08000160   0x00000002   Code   RO          131    .ARM.Collect$$libinit$$00000000  c_w.l(libinit.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          138    .ARM.Collect$$libinit$$00000002  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          140    .ARM.Collect$$libinit$$00000004  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          142    .ARM.Collect$$libinit$$00000006  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          145    .ARM.Collect$$libinit$$0000000C  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          147    .ARM.Collect$$libinit$$0000000E  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          149    .ARM.Collect$$libinit$$00000010  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          152    .ARM.Collect$$libinit$$00000013  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          154    .ARM.Collect$$libinit$$00000015  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          156    .ARM.Collect$$libinit$$00000017  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          158    .ARM.Collect$$libinit$$00000019  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          160    .ARM.Collect$$libinit$$0000001B  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          162    .ARM.Collect$$libinit$$0000001D  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          164    .ARM.Collect$$libinit$$0000001F  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          166    .ARM.Collect$$libinit$$00000021  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          168    .ARM.Collect$$libinit$$00000023  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          170    .ARM.Collect$$libinit$$00000025  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          172    .ARM.Collect$$libinit$$00000027  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          176    .ARM.Collect$$libinit$$0000002E  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          178    .ARM.Collect$$libinit$$00000030  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          180    .ARM.Collect$$libinit$$00000032  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000000   Code   RO          182    .ARM.Collect$$libinit$$00000034  c_w.l(libinit2.o)
+    0x08000162   0x08000162   0x00000002   Code   RO          183    .ARM.Collect$$libinit$$00000035  c_w.l(libinit2.o)
+    0x08000164   0x08000164   0x00000002   Code   RO          205    .ARM.Collect$$libshutdown$$00000000  c_w.l(libshutdown.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          220    .ARM.Collect$$libshutdown$$00000002  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          222    .ARM.Collect$$libshutdown$$00000004  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          225    .ARM.Collect$$libshutdown$$00000007  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          228    .ARM.Collect$$libshutdown$$0000000A  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          230    .ARM.Collect$$libshutdown$$0000000C  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000000   Code   RO          233    .ARM.Collect$$libshutdown$$0000000F  c_w.l(libshutdown2.o)
+    0x08000166   0x08000166   0x00000002   Code   RO          234    .ARM.Collect$$libshutdown$$00000010  c_w.l(libshutdown2.o)
+    0x08000168   0x08000168   0x00000000   Code   RO          106    .ARM.Collect$$rtentry$$00000000  c_w.l(__rtentry.o)
+    0x08000168   0x08000168   0x00000000   Code   RO          108    .ARM.Collect$$rtentry$$00000002  c_w.l(__rtentry2.o)
+    0x08000168   0x08000168   0x00000006   Code   RO          120    .ARM.Collect$$rtentry$$00000004  c_w.l(__rtentry4.o)
+    0x0800016e   0x0800016e   0x00000000   Code   RO          110    .ARM.Collect$$rtentry$$00000009  c_w.l(__rtentry2.o)
+    0x0800016e   0x0800016e   0x00000004   Code   RO          111    .ARM.Collect$$rtentry$$0000000A  c_w.l(__rtentry2.o)
+    0x08000172   0x08000172   0x00000000   Code   RO          113    .ARM.Collect$$rtentry$$0000000C  c_w.l(__rtentry2.o)
+    0x08000172   0x08000172   0x00000008   Code   RO          114    .ARM.Collect$$rtentry$$0000000D  c_w.l(__rtentry2.o)
+    0x0800017a   0x0800017a   0x00000002   Code   RO          135    .ARM.Collect$$rtexit$$00000000  c_w.l(rtexit.o)
+    0x0800017c   0x0800017c   0x00000000   Code   RO          185    .ARM.Collect$$rtexit$$00000002  c_w.l(rtexit2.o)
+    0x0800017c   0x0800017c   0x00000004   Code   RO          186    .ARM.Collect$$rtexit$$00000003  c_w.l(rtexit2.o)
+    0x08000180   0x08000180   0x00000006   Code   RO          187    .ARM.Collect$$rtexit$$00000004  c_w.l(rtexit2.o)
+    0x08000186   0x08000186   0x00000002   PAD
+    0x08000188   0x08000188   0x00000040   Code   RO           80  * .text               startup_stm32f10x_md.o
+    0x080001c8   0x080001c8   0x00000006   Code   RO          102    .text               c_w.l(heapauxi.o)
+    0x080001ce   0x080001ce   0x0000004a   Code   RO          122    .text               c_w.l(sys_stackheap_outer.o)
+    0x08000218   0x08000218   0x00000012   Code   RO          124    .text               c_w.l(exit.o)
+    0x0800022a   0x0800022a   0x00000002   PAD
+    0x0800022c   0x0800022c   0x00000008   Code   RO          132    .text               c_w.l(libspace.o)
+    0x08000234   0x08000234   0x0000000c   Code   RO          195    .text               c_w.l(sys_exit.o)
+    0x08000240   0x08000240   0x00000002   Code   RO          210    .text               c_w.l(use_no_semi.o)
+    0x08000242   0x08000242   0x00000000   Code   RO          212    .text               c_w.l(indicate_semi.o)
+    0x08000242   0x08000242   0x00000002   PAD
+    0x08000244   0x08000244   0x00000002   Code   RO           41    .text.Bug           driver_timer.o
+    0x08000246   0x08000246   0x00000002   PAD
+    0x08000248   0x08000248   0x0000009c   Code   RO           11    .text.MyGPIO_Init   driver_gpio.o
+    0x080002e4   0x080002e4   0x0000008c   Code   RO           29    .text.MyTimer_Base_Init  driver_timer.o
+    0x08000370   0x08000370   0x00000046   Code   RO           39    .text.MyTimer_ConfigureEncoder  driver_timer.o
+    0x080003b6   0x080003b6   0x00000002   PAD
+    0x080003b8   0x080003b8   0x0000000c   Code   RO           31    .text.MyTimer_Start  driver_timer.o
+    0x080003c4   0x080003c4   0x00000110   Code   RO           87    .text.SystemInit    system_stm32f10x.o
+    0x080004d4   0x080004d4   0x0000001a   Code   RO           45    .text.TIM2_IRQHandler  driver_timer.o
+    0x080004ee   0x080004ee   0x00000002   PAD
+    0x080004f0   0x080004f0   0x0000001c   Code   RO           47    .text.TIM3_IRQHandler  driver_timer.o
+    0x0800050c   0x0800050c   0x0000001c   Code   RO           49    .text.TIM4_IRQHandler  driver_timer.o
+    0x08000528   0x08000528   0x0000000e   Code   RO           68    .text.USART3_IRQHandler  driver_uart.o
+    0x08000536   0x08000536   0x00000002   PAD
+    0x08000538   0x08000538   0x0000004e   Code   RO            2    .text.main          main.o
+    0x08000586   0x08000586   0x00000002   PAD
+    0x08000588   0x08000588   0x00000020   Data   RO          268    Region$$Table       anon$$obj.o
+
+
+    Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x080005a8, Size: 0x0000000c, Max: 0xffffffff, ABSOLUTE)
+
+    Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
+
+    0x20000000   0x080005a8   0x00000004   Data   RW           51    .data.TIM2_fx       driver_timer.o
+    0x20000004   0x080005ac   0x00000004   Data   RW           52    .data.TIM3_fx       driver_timer.o
+    0x20000008   0x080005b0   0x00000004   Data   RW           53    .data.TIM4_fx       driver_timer.o
+
+
+    Execution Region ER_ZI (Exec base: 0x20000010, Load base: 0x080005b4, Size: 0x00000660, Max: 0xffffffff, ABSOLUTE)
+
+    Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
+
+    0x20000010        -       0x00000060   Zero   RW          133    .bss                c_w.l(libspace.o)
+    0x20000070        -       0x00000200   Zero   RW           78    HEAP                startup_stm32f10x_md.o
+    0x20000270        -       0x00000400   Zero   RW           77    STACK               startup_stm32f10x_md.o
+>>>>>>> encoder
 
 
 ==============================================================================
@@ -651,6 +886,7 @@ Image component sizes
 
       Code (inc. data)   RO Data    RW Data    ZI Data      Debug   Object Name
 
+<<<<<<< HEAD
         36         10          0          4          0       1529   driver_adc.o
        100         26          0         12          0       2554   driver_timer.o
        116          6          0          0          0       1744   imu.o
@@ -662,6 +898,19 @@ Image component sizes
        668         96        268         16       1536     215999   Object Totals
          0          0         32          0          0          0   (incl. Generated)
          2          0          0          0          0          0   (incl. Padding)
+=======
+       156         16          0          0          0       2108   driver_gpio.o
+       306          0          0         12          0       7375   driver_timer.o
+        14          0          0          0          0       2250   driver_uart.o
+        78          0          0          0          0       2136   main.o
+        64         26        236          0       1536        864   startup_stm32f10x_md.o
+       272          0          0          0          0       2813   system_stm32f10x.o
+
+    ----------------------------------------------------------------------
+       900         42        268         12       1536      17546   Object Totals
+         0          0         32          0          0          0   (incl. Generated)
+        10          0          0          0          0          0   (incl. Padding)
+>>>>>>> encoder
 
     ----------------------------------------------------------------------
 
@@ -710,6 +959,7 @@ Image component sizes
 
       Code (inc. data)   RO Data    RW Data    ZI Data      Debug   
 
+<<<<<<< HEAD
       1704        192        268         20       1636     216043   Grand Totals
       1704        192        268         20       1636     216043   ELF Image Totals
       1704        192        268         20          0          0   ROM Totals
@@ -719,6 +969,17 @@ Image component sizes
     Total RO  Size (Code + RO Data)                 1972 (   1.93kB)
     Total RW  Size (RW Data + ZI Data)              1656 (   1.62kB)
     Total ROM Size (Code + RO Data + RW Data)       1992 (   1.95kB)
+=======
+      1180         58        268         12       1632      17942   Grand Totals
+      1180         58        268         12       1632      17942   ELF Image Totals
+      1180         58        268         12          0          0   ROM Totals
+
+==============================================================================
+
+    Total RO  Size (Code + RO Data)                 1448 (   1.41kB)
+    Total RW  Size (RW Data + ZI Data)              1644 (   1.61kB)
+    Total ROM Size (Code + RO Data + RW Data)       1460 (   1.43kB)
+>>>>>>> encoder
 
 ==============================================================================
 

projet-voilier/Objects/main.d

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 .\objects\main.o: src\main.c
 .\objects\main.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h
 .\objects\main.o: .\RTE\_reel\RTE_Components.h
@@ -13,3 +14,16 @@
 .\objects\main.o: ..\driver\Driver_ADC.h
 .\objects\main.o: ..\driver\MySPI.h
 .\objects\main.o: ..\driver\Driver_IMU.h
+=======
+./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 \
+  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 \
+  C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h \
+  C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h \
+  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
+>>>>>>> encoder

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

@@ -21,13 +21,19 @@ Target DLL:      UL2CM3.DLL V1.163.9.0
 Dialog DLL:      TARMSTM.DLL V1.66.0.0
  
 <h2>Project:</h2>
+<<<<<<< HEAD
 U:\Documents\microcontroleur\Projet-Voilier-3\projet-voilier\projet-voilier.uvprojx
 Project File Date:  04/04/2023
+=======
+C:\Users\robin\OneDrive\Documents\Dev\Projet-Voilier-3\projet-voilier\projet-voilier.uvprojx
+Project File Date:  04/01/2023
+>>>>>>> encoder
 
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
 Rebuild target 'sim'
 assembling startup_stm32f10x_md.s...
+<<<<<<< HEAD
 compiling Driver_ADC.c...
 compiling system_stm32f10x.c...
 compiling main.c...
@@ -38,11 +44,22 @@ compiling IMU.c...
 ..\driver\IMU.c(21): warning:  #177-D: variable "i"  was declared but never referenced
   	int i;
 ..\driver\IMU.c: 1 warning, 0 errors
+=======
+compiling main.c...
+compiling Driver_UART.c...
+compiling system_stm32f10x.c...
+compiling Driver_GPIO.c...
+>>>>>>> encoder
 compiling Driver_Timer.c...
 compiling Driver_GPIO.c...
 linking...
+<<<<<<< HEAD
 Program Size: Code=1704 RO-data=268 RW-data=20 ZI-data=1636  
 ".\Objects\projet-voilier.axf" - 0 Error(s), 2 Warning(s).
+=======
+Program Size: Code=1180 RO-data=268 RW-data=12 ZI-data=1632  
+".\Objects\projet-voilier.axf" - 0 Error(s), 0 Warning(s).
+>>>>>>> encoder
 
 <h2>Software Packages used:</h2>
 
@@ -69,11 +86,19 @@ Package Vendor: Keil
    * Component: ARM::CMSIS:CORE:5.4.0
 
    * Component: Keil::Device:Startup:1.0.0
+<<<<<<< HEAD
       Source file:   Device\Source\ARM\startup_stm32f10x_md.s
       Include file:  RTE_Driver\Config\RTE_Device.h
       Source file:   Device\Source\ARM\STM32F1xx_OPT.s
       Source file:   Device\Source\system_stm32f10x.c
 Build Time Elapsed:  00:00:02
+=======
+      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
+>>>>>>> encoder
 </pre>
 </body>
 </html>

projet-voilier/Objects/projet-voilier.htm

@@ -3,7 +3,11 @@
 <title>Static Call Graph - [.\Objects\projet-voilier.axf]</title></head>
 <body><HR>
 <H1>Static Call Graph for image .\Objects\projet-voilier.axf</H1><HR>
+<<<<<<< HEAD
 <BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060960: Last Updated: Tue Apr 04 15:13:02 2023
+=======
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 6190004: Last Updated: Fri Apr  7 14:19:38 2023
+>>>>>>> encoder
 <BR><P>
 <H3>Maximum Stack Usage =         40 bytes + Unknown(Functions without stacksize, Cycles, Untraceable Function Pointers)</H3><H3>
 Call chain for Maximum Stack Depth:</H3>
@@ -33,6 +37,7 @@ Mutually Recursive functions
 <H3>
 Function Pointers
 </H3><UL>
+<<<<<<< HEAD
  <LI><a href="#[1f]">ADC1_2_IRQHandler</a> from driver_adc.o(i.ADC1_2_IRQHandler) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[3a]">Bug</a> from driver_timer.o(i.Bug) referenced 3 times from driver_timer.o(.data)
  <LI><a href="#[7]">BusFault_Handler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
@@ -90,6 +95,66 @@ Function Pointers
  <LI><a href="#[d]">WWDG_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  <LI><a href="#[3d]">__main</a> from __main.o(!!!main) referenced from startup_stm32f10x_md.o(.text)
  <LI><a href="#[3b]">erreur</a> from driver_adc.o(i.erreur) referenced from driver_adc.o(.data)
+=======
+ <LI><a href="#[1c]">ADC1_2_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[37]">Bug</a> from driver_timer.o(.text.Bug) referenced from driver_timer.o(.data.TIM2_fx)
+ <LI><a href="#[37]">Bug</a> from driver_timer.o(.text.Bug) referenced from driver_timer.o(.data.TIM3_fx)
+ <LI><a href="#[37]">Bug</a> from driver_timer.o(.text.Bug) referenced from driver_timer.o(.data.TIM4_fx)
+ <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)
+ <LI><a href="#[15]">DMA1_Channel1_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[16]">DMA1_Channel2_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[17]">DMA1_Channel3_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[18]">DMA1_Channel4_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[19]">DMA1_Channel5_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[1a]">DMA1_Channel6_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[1b]">DMA1_Channel7_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[7]">DebugMon_Handler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[10]">EXTI0_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <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="#[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)
+ <LI><a href="#[2]">HardFault_Handler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[2a]">I2C1_ER_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[29]">I2C1_EV_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[2c]">I2C2_ER_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[2b]">I2C2_EV_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[3]">MemManage_Handler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[1]">NMI_Handler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[b]">PVD_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[8]">PendSV_Handler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[f]">RCC_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[33]">RTCAlarm_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[d]">RTC_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[0]">Reset_Handler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[2d]">SPI1_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[2e]">SPI2_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[6]">SVC_Handler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[9]">SysTick_Handler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[35]">SystemInit</a> from system_stm32f10x.o(.text.SystemInit) referenced from startup_stm32f10x_md.o(.text)
+ <LI><a href="#[c]">TAMPER_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[22]">TIM1_BRK_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[25]">TIM1_CC_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[24]">TIM1_TRG_COM_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[23]">TIM1_UP_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[26]">TIM2_IRQHandler</a> from driver_timer.o(.text.TIM2_IRQHandler) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[27]">TIM3_IRQHandler</a> from driver_timer.o(.text.TIM3_IRQHandler) referenced from startup_stm32f10x_md.o(RESET)
+ <LI><a href="#[28]">TIM4_IRQHandler</a> from driver_timer.o(.text.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 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="#[36]">__main</a> from __main.o(!!!main) referenced from startup_stm32f10x_md.o(.text)
+>>>>>>> encoder
 </UL>
 <P>
 <H3>
@@ -104,11 +169,25 @@ Global Symbols
 <BR><BR>[Called By]<UL><LI><a href="#[3d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__main
 </UL>
 
+<<<<<<< HEAD
 <P><STRONG><a name="[41]"></a>__scatterload_rt2</STRONG> (Thumb, 44 bytes, Stack size unknown bytes, __scatter.o(!!!scatter), UNUSED)
 <BR><BR>[Calls]<UL><LI><a href="#[40]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__rt_entry
 </UL>
 
 <P><STRONG><a name="[5a]"></a>__scatterload_rt2_thumb_only</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __scatter.o(!!!scatter), UNUSED)
+=======
+<P><STRONG><a name="[4e]"></a>__scatterload_rt2_thumb_only</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __scatter.o(!!!scatter), UNUSED)
+
+<P><STRONG><a name="[4f]"></a>__scatterload_null</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __scatter.o(!!!scatter), UNUSED)
+
+<P><STRONG><a name="[3c]"></a>__scatterload_copy</STRONG> (Thumb, 26 bytes, Stack size unknown bytes, __scatter_copy.o(!!handler_copy), UNUSED)
+<BR><BR>[Calls]<UL><LI><a href="#[3c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__scatterload_copy
+</UL>
+<BR>[Called By]<UL><LI><a href="#[3c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__scatterload_copy
+</UL>
+
+<P><STRONG><a name="[50]"></a>__scatterload_zeroinit</STRONG> (Thumb, 28 bytes, Stack size unknown bytes, __scatter_zi.o(!!handler_zi), UNUSED)
+>>>>>>> encoder
 
 <P><STRONG><a name="[5b]"></a>__scatterload_null</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __scatter.o(!!!scatter), UNUSED)
 
@@ -118,6 +197,7 @@ Global Symbols
 <BR>[Called By]<UL><LI><a href="#[42]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__scatterload_copy
 </UL>
 
+<<<<<<< HEAD
 <P><STRONG><a name="[5c]"></a>__scatterload_zeroinit</STRONG> (Thumb, 28 bytes, Stack size unknown bytes, __scatter_zi.o(!!handler_zi), UNUSED)
 
 <P><STRONG><a name="[46]"></a>__rt_lib_init</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit.o(.ARM.Collect$$libinit$$00000000))
@@ -137,6 +217,69 @@ Global Symbols
 <P><STRONG><a name="[62]"></a>__rt_lib_init_exceptions_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000030))
 
 <P><STRONG><a name="[63]"></a>__rt_lib_init_fp_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000002))
+=======
+<P><STRONG><a name="[51]"></a>__rt_lib_init_alloca_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000030))
+
+<P><STRONG><a name="[52]"></a>__rt_lib_init_argv_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000002E))
+
+<P><STRONG><a name="[53]"></a>__rt_lib_init_atexit_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000001D))
+
+<P><STRONG><a name="[54]"></a>__rt_lib_init_clock_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000023))
+
+<P><STRONG><a name="[55]"></a>__rt_lib_init_cpp_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000034))
+
+<P><STRONG><a name="[56]"></a>__rt_lib_init_exceptions_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000032))
+
+<P><STRONG><a name="[57]"></a>__rt_lib_init_fp_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000002))
+
+<P><STRONG><a name="[58]"></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="[59]"></a>__rt_lib_init_getenv_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000025))
+
+<P><STRONG><a name="[5a]"></a>__rt_lib_init_heap_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000000C))
+
+<P><STRONG><a name="[5b]"></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="[5c]"></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="[5d]"></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="[5e]"></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="[5f]"></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="[60]"></a>__rt_lib_init_preinit_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000006))
+
+<P><STRONG><a name="[61]"></a>__rt_lib_init_rand_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000010))
+
+<P><STRONG><a name="[62]"></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="[63]"></a>__rt_lib_init_return</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000035))
+
+<P><STRONG><a name="[64]"></a>__rt_lib_init_signal_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000001F))
+
+<P><STRONG><a name="[65]"></a>__rt_lib_init_stdio_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$00000027))
+
+<P><STRONG><a name="[66]"></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="[45]"></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="#[44]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__rt_exit_ls
+</UL>
+
+<P><STRONG><a name="[67]"></a>__rt_lib_shutdown_cpp_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000002))
+
+<P><STRONG><a name="[68]"></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="[69]"></a>__rt_lib_shutdown_heap_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$0000000F))
+
+<P><STRONG><a name="[6a]"></a>__rt_lib_shutdown_return</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000010))
+
+<P><STRONG><a name="[6b]"></a>__rt_lib_shutdown_signal_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$0000000A))
+
+<P><STRONG><a name="[6c]"></a>__rt_lib_shutdown_stdio_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000004))
+
+<P><STRONG><a name="[6d]"></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="[64]"></a>__rt_lib_init_fp_trap_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libinit2.o(.ARM.Collect$$libinit$$0000001F))
 
@@ -170,7 +313,11 @@ Global Symbols
 <BR><BR>[Called By]<UL><LI><a href="#[4a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__rt_exit_ls
 </UL>
 
+<<<<<<< HEAD
 <P><STRONG><a name="[72]"></a>__rt_lib_shutdown_cpp_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000004))
+=======
+<P><STRONG><a name="[6e]"></a>__rt_entry_presh_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$00000002))
+>>>>>>> encoder
 
 <P><STRONG><a name="[73]"></a>__rt_lib_shutdown_fini_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, libshutdown2.o(.ARM.Collect$$libshutdown$$00000002))
 
@@ -204,17 +351,29 @@ Global Symbols
 <BR><BR>[Calls]<UL><LI><a href="#[46]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__rt_lib_init
 </UL>
 
+<<<<<<< HEAD
 <P><STRONG><a name="[7b]"></a>__rt_entry_postsh_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$00000009))
 
 <P><STRONG><a name="[47]"></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 = 40 + Unknown Stack Size
 <LI>Call Chain = __rt_entry_main &rArr; main &rArr; source_IMU_read
+=======
+<P><STRONG><a name="[6f]"></a>__rt_entry_postsh_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$00000009))
+
+<P><STRONG><a name="[41]"></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 = 40 + Unknown Stack Size
+<LI>Call Chain = __rt_entry_main &rArr; main &rArr; MyGPIO_Init
+>>>>>>> encoder
 </UL>
 <BR>[Calls]<UL><LI><a href="#[49]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;exit
 <LI><a href="#[48]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
 </UL>
 
+<<<<<<< HEAD
 <P><STRONG><a name="[7c]"></a>__rt_entry_postli_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$0000000C))
+=======
+<P><STRONG><a name="[70]"></a>__rt_entry_postli_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __rtentry2.o(.ARM.Collect$$rtentry$$0000000C))
+>>>>>>> encoder
 
 <P><STRONG><a name="[4f]"></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="#[49]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;exit
@@ -224,7 +383,11 @@ Global Symbols
 <BR><BR>[Calls]<UL><LI><a href="#[4b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__rt_lib_shutdown
 </UL>
 
+<<<<<<< HEAD
 <P><STRONG><a name="[7d]"></a>__rt_exit_prels_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, rtexit2.o(.ARM.Collect$$rtexit$$00000002))
+=======
+<P><STRONG><a name="[71]"></a>__rt_exit_prels_1</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, rtexit2.o(.ARM.Collect$$rtexit$$00000002))
+>>>>>>> encoder
 
 <P><STRONG><a name="[4c]"></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="#[4d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_sys_exit
@@ -404,10 +567,14 @@ Global Symbols
 <P><STRONG><a name="[34]"></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>
+<<<<<<< HEAD
 <P><STRONG><a name="[37]"></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>
 <P><STRONG><a name="[20]"></a>USB_HP_CAN1_TX_IRQHandler</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
+=======
+<P><STRONG><a name="[34]"></a>USBWakeUp_IRQHandler</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
+>>>>>>> encoder
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
 </UL>
 <P><STRONG><a name="[21]"></a>USB_LP_CAN1_RX0_IRQHandler</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
@@ -420,11 +587,19 @@ Global Symbols
 <BR><BR>[Called By]<UL><LI><a href="#[44]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__user_setup_stackheap
 </UL>
 
+<<<<<<< HEAD
 <P><STRONG><a name="[7e]"></a>__use_two_region_memory</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED)
 
 <P><STRONG><a name="[7f]"></a>__rt_heap_escrow$2region</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED)
 
 <P><STRONG><a name="[80]"></a>__rt_heap_expand$2region</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED)
+=======
+<P><STRONG><a name="[72]"></a>__use_two_region_memory</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED)
+
+<P><STRONG><a name="[73]"></a>__rt_heap_escrow$2region</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED)
+
+<P><STRONG><a name="[74]"></a>__rt_heap_expand$2region</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, heapauxi.o(.text), UNUSED)
+>>>>>>> encoder
 
 <P><STRONG><a name="[44]"></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
@@ -445,23 +620,39 @@ Global Symbols
 <BR>[Called By]<UL><LI><a href="#[47]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__rt_entry_main
 </UL>
 
+<<<<<<< HEAD
 <P><STRONG><a name="[81]"></a>__user_libspace</STRONG> (Thumb, 8 bytes, Stack size 0 bytes, libspace.o(.text), UNUSED)
+=======
+<P><STRONG><a name="[75]"></a>__user_libspace</STRONG> (Thumb, 8 bytes, Stack size 0 bytes, libspace.o(.text), UNUSED)
+>>>>>>> encoder
 
 <P><STRONG><a name="[4e]"></a>__user_perproc_libspace</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, libspace.o(.text))
 <BR><BR>[Called By]<UL><LI><a href="#[44]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__user_setup_stackheap
 </UL>
 
+<<<<<<< HEAD
 <P><STRONG><a name="[82]"></a>__user_perthread_libspace</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, libspace.o(.text), UNUSED)
+=======
+<P><STRONG><a name="[76]"></a>__user_perthread_libspace</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, libspace.o(.text), UNUSED)
+>>>>>>> encoder
 
 <P><STRONG><a name="[4d]"></a>_sys_exit</STRONG> (Thumb, 8 bytes, Stack size 0 bytes, sys_exit.o(.text))
 <BR><BR>[Called By]<UL><LI><a href="#[4c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__rt_exit_exit
 </UL>
 
+<<<<<<< HEAD
 <P><STRONG><a name="[83]"></a>__I$use$semihosting</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, use_no_semi.o(.text), UNUSED)
 
 <P><STRONG><a name="[84]"></a>__use_no_semihosting_swi</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, use_no_semi.o(.text), UNUSED)
 
 <P><STRONG><a name="[85]"></a>__semihosting_library_function</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, indicate_semi.o(.text), UNUSED)
+=======
+<P><STRONG><a name="[77]"></a>__I$use$semihosting</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, use_no_semi.o(.text), UNUSED)
+
+<P><STRONG><a name="[78]"></a>__use_no_semihosting_swi</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, use_no_semi.o(.text), UNUSED)
+
+<P><STRONG><a name="[79]"></a>__semihosting_library_function</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, indicate_semi.o(.text), UNUSED)
+>>>>>>> encoder
 
 <P><STRONG><a name="[1f]"></a>ADC1_2_IRQHandler</STRONG> (Thumb, 22 bytes, Stack size 8 bytes, driver_adc.o(i.ADC1_2_IRQHandler))
 <BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = ADC1_2_IRQHandler
@@ -476,6 +667,7 @@ Global Symbols
 <LI><a href="#[55]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;source_IMU_read
 </UL>
 
+<<<<<<< HEAD
 <P><STRONG><a name="[50]"></a>MySPI_Init</STRONG> (Thumb, 480 bytes, Stack size 4 bytes, myspi.o(i.MySPI_Init))
 <BR><BR>[Stack]<UL><LI>Max Depth = 4<LI>Call Chain = MySPI_Init
 </UL>
@@ -503,6 +695,22 @@ Global Symbols
 <BR><BR>[Stack]<UL><LI>Max Depth = 28<LI>Call Chain = SystemInit &rArr; SetSysClock &rArr; SetSysClockTo72
 </UL>
 <BR>[Calls]<UL><LI><a href="#[52]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SetSysClock
+=======
+<P><STRONG><a name="[4b]"></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="#[42]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[4c]"></a>MyTimer_ConfigureEncoder</STRONG> (Thumb, 70 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_ConfigureEncoder))
+<BR><BR>[Called By]<UL><LI><a href="#[42]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<P><STRONG><a name="[4d]"></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="#[42]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+</UL>
+
+<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
+>>>>>>> encoder
 </UL>
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(.text)
 </UL>
@@ -521,11 +729,24 @@ Global Symbols
 </UL>
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
 </UL>
+<<<<<<< HEAD
 <P><STRONG><a name="[3b]"></a>erreur</STRONG> (Thumb, 4 bytes, Stack size 0 bytes, driver_adc.o(i.erreur))
 <BR>[Address Reference Count : 1]<UL><LI> driver_adc.o(.data)
 </UL>
 <P><STRONG><a name="[48]"></a>main</STRONG> (Thumb, 22 bytes, Stack size 16 bytes, main.o(i.main))
 <BR><BR>[Stack]<UL><LI>Max Depth = 40<LI>Call Chain = main &rArr; source_IMU_read
+=======
+<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="[42]"></a>main</STRONG> (Thumb, 78 bytes, Stack size 32 bytes, main.o(.text.main))
+<BR><BR>[Stack]<UL><LI>Max Depth = 40<LI>Call Chain = main &rArr; MyGPIO_Init
+</UL>
+<BR>[Calls]<UL><LI><a href="#[4d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_Start
+<LI><a href="#[4c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_ConfigureEncoder
+<LI><a href="#[4b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_Base_Init
+<LI><a href="#[4a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyGPIO_Init
+>>>>>>> encoder
 </UL>
 <BR>[Calls]<UL><LI><a href="#[55]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;source_IMU_read
 <LI><a href="#[54]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;source_IMU_init

projet-voilier/Objects/projet-voilier_sim.dep

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

-I.\RTE\Device\STM32F103RB

-I.\RTE\_sim

-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)
@@ -74,3 +75,64 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_versio
 I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22)
 I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582)
 I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
+=======
+CompilerVersion: 6190000::V6.19::ARMCLANG
+F (.\src\main.c)(0x642FFEBA)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c

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

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

-I./RTE/Device/STM32F103RB

-I./RTE/_sim

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

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

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

-o ./objects/main.o -MD)
+I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
+I (RTE\_sim\RTE_Components.h)(0x6421A260)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E)
+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)(0x642FF88E)
+I (..\driver\Driver_Timer.h)(0x642C7C81)
+I (..\driver\Driver_UART.h)(0x642C85A4)
+F (..\driver\Driver_GPIO.c)(0x642FFBC6)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c

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

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

-I./RTE/Device/STM32F103RB

-I./RTE/_sim

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

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

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

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

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

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

-I./RTE/Device/STM32F103RB

-I./RTE/_sim

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

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

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

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

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

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

-I./RTE/Device/STM32F103RB

-I./RTE/_sim

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

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

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

-o ./objects/driver_uart.o -MD)
+I (..\driver\Driver_UART.h)(0x642C85A4)
+I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
+I (RTE\_sim\RTE_Components.h)(0x6421A260)
+I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E)
+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)(0x642C85A4)()
+F (RTE/Device/STM32F103RB/RTE_Device.h)(0x641B050C)()
+F (RTE/Device/STM32F103RB/startup_stm32f10x_md.s)(0x641B050C)(--target=arm-arm-none-eabi -mcpu=cortex-m3 -masm=auto  -Wa,armasm,--diag_suppress=A1950W -c

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

-I./RTE/Device/STM32F103RB

-I./RTE/_sim

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

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

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

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

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

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

-I./RTE/Device/STM32F103RB

-I./RTE/_sim

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

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

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

-o ./objects/system_stm32f10x.o -MD)
+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)
+>>>>>>> encoder

projet-voilier/projet-voilier.uvoptx

@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>8000000</CLKADS>
+      <CLKADS>12000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -75,6 +75,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
+<<<<<<< HEAD
         <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
@@ -282,6 +283,8 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
+=======
+>>>>>>> encoder
         <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
@@ -332,7 +335,11 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGTARM</Key>
+<<<<<<< HEAD
           <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=75,104,496,509,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=120,153,405,449,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=252,566,855,1200,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=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>
+>>>>>>> encoder
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -355,6 +362,7 @@
           <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM))</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
+<<<<<<< HEAD
       <Breakpoint/>
       <WatchWindow1>
         <Ww>
@@ -376,6 +384,90 @@
           <AccSizeX>0</AccSizeX>
         </Mm>
       </MemoryWindow1>
+=======
+      <Breakpoint>
+        <Bp>
+          <Number>0</Number>
+          <Type>0</Type>
+          <LineNumber>84</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134219102</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>.\src\main.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\projet_voilier\src/main.c\84</Expression>
+        </Bp>
+        <Bp>
+          <Number>1</Number>
+          <Type>0</Type>
+          <LineNumber>78</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134219086</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>.\src\main.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\projet_voilier\src/main.c\78</Expression>
+        </Bp>
+        <Bp>
+          <Number>2</Number>
+          <Type>0</Type>
+          <LineNumber>55</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>0</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>0</BreakIfRCount>
+          <Filename>.\src\main.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression></Expression>
+        </Bp>
+        <Bp>
+          <Number>3</Number>
+          <Type>0</Type>
+          <LineNumber>67</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>0</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>0</BreakIfRCount>
+          <Filename>.\src\main.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression></Expression>
+        </Bp>
+        <Bp>
+          <Number>4</Number>
+          <Type>0</Type>
+          <LineNumber>69</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>0</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>0</BreakIfRCount>
+          <Filename>.\src\main.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression></Expression>
+        </Bp>
+      </Breakpoint>
+>>>>>>> encoder
       <Tracepoint>
         <THDelay>0</THDelay>
       </Tracepoint>
@@ -509,8 +601,13 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
+<<<<<<< HEAD
       <PathWithFileName>..\driver\Driver_ADC.c</PathWithFileName>
       <FilenameWithoutPath>Driver_ADC.c</FilenameWithoutPath>
+=======
+      <PathWithFileName>..\driver\Driver_UART.c</PathWithFileName>
+      <FilenameWithoutPath>Driver_UART.c</FilenameWithoutPath>
+>>>>>>> encoder
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -521,6 +618,7 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
+<<<<<<< HEAD
       <PathWithFileName>..\driver\Driver_ADC.h</PathWithFileName>
       <FilenameWithoutPath>Driver_ADC.h</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
@@ -571,6 +669,10 @@
       <bDave2>0</bDave2>
       <PathWithFileName>..\driver\Driver_IMU.h</PathWithFileName>
       <FilenameWithoutPath>Driver_IMU.h</FilenameWithoutPath>
+=======
+      <PathWithFileName>..\driver\Driver_UART.h</PathWithFileName>
+      <FilenameWithoutPath>Driver_UART.h</FilenameWithoutPath>
+>>>>>>> encoder
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -586,7 +688,7 @@
 
   <Group>
     <GroupName>::Device</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>1</RteFlg>

projet-voilier/projet-voilier.uvprojx

@@ -414,6 +414,7 @@
               <FilePath>..\driver\Driver_Timer.h</FilePath>
             </File>
             <File>
+<<<<<<< HEAD
               <FileName>Driver_ADC.c</FileName>
               <FileType>1</FileType>
               <FilePath>..\driver\Driver_ADC.c</FilePath>
@@ -442,6 +443,16 @@
               <FileName>Driver_IMU.h</FileName>
               <FileType>5</FileType>
               <FilePath>..\driver\Driver_IMU.h</FilePath>
+=======
+              <FileName>Driver_UART.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\driver\Driver_UART.c</FilePath>
+            </File>
+            <File>
+              <FileName>Driver_UART.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\driver\Driver_UART.h</FilePath>
+>>>>>>> encoder
             </File>
           </Files>
         </Group>
@@ -861,6 +872,7 @@
               <FilePath>..\driver\Driver_Timer.h</FilePath>
             </File>
             <File>
+<<<<<<< HEAD
               <FileName>Driver_ADC.c</FileName>
               <FileType>1</FileType>
               <FilePath>..\driver\Driver_ADC.c</FilePath>
@@ -889,6 +901,16 @@
               <FileName>Driver_IMU.h</FileName>
               <FileType>5</FileType>
               <FilePath>..\driver\Driver_IMU.h</FilePath>
+=======
+              <FileName>Driver_UART.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\driver\Driver_UART.c</FilePath>
+            </File>
+            <File>
+              <FileName>Driver_UART.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\driver\Driver_UART.h</FilePath>
+>>>>>>> encoder
             </File>
           </Files>
         </Group>