diff --git a/projet-voilier/Objects/main.o b/projet-voilier/Objects/main.o
deleted file mode 100644
index be53699..0000000
Binary files a/projet-voilier/Objects/main.o and /dev/null differ
diff --git a/projet-voilier/Objects/projet-voilier_reel.axf b/projet-voilier/Objects/projet-voilier_reel.axf
deleted file mode 100644
index 4d0eb73..0000000
Binary files a/projet-voilier/Objects/projet-voilier_reel.axf and /dev/null differ
diff --git a/projet-voilier/Objects/projet-voilier_reel.build_log.htm b/projet-voilier/Objects/projet-voilier_reel.build_log.htm
index 9eb5300..390d1ac 100644
--- a/projet-voilier/Objects/projet-voilier_reel.build_log.htm
+++ b/projet-voilier/Objects/projet-voilier_reel.build_log.htm
@@ -27,8 +27,6 @@ Project File Date:  04/11/2023
 <h2>Output:</h2>
 *** Using Compiler 'V6.19', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
 Rebuild target 'reel'
-<<<<<<< HEAD
-compiling Driver_GPIO.c...
 src/main.c(19): error: unknown type name 'Encoder'
 Encoder->Timer = TIM4;
 ^
@@ -94,25 +92,13 @@ void MyTimer_Start(MyTimer_Struct_TypeDef * Timer);
      ^
 3 warnings and 11 errors generated.
 compiling main.c...
+compiling system_stm32f10x.c...
 assembling startup_stm32f10x_md.s...
 compiling Driver_UART.c...
-=======
-assembling startup_stm32f10x_md.s...
-compiling main.c...
-compiling Driver_UART.c...
 compiling Driver_GPIO.c...
 compiling Driver_ADC.c...
->>>>>>> 73cabe3969d793656407180a8db5feffe014593b
-compiling system_stm32f10x.c...
-compiling Driver_ADC.c...
 compiling Driver_Timer.c...
-<<<<<<< HEAD
 ".\Objects\projet-voilier_reel.axf" - 11 Error(s), 3 Warning(s).
-=======
-linking...
-Program Size: Code=1212 RO-data=268 RW-data=16 ZI-data=1024  
-".\Objects\projet-voilier_reel.axf" - 0 Error(s), 0 Warning(s).
->>>>>>> 73cabe3969d793656407180a8db5feffe014593b
 
 <h2>Software Packages used:</h2>
 
@@ -143,12 +129,8 @@ Package Vendor: Keil
       Source file:   Device/Source/system_stm32f10x.c
       Include file:  RTE_Driver/Config/RTE_Device.h
       Source file:   Device/Source/ARM/STM32F1xx_OPT.s
-<<<<<<< HEAD
 Target not created.
 Build Time Elapsed:  00:00:01
-=======
-Build Time Elapsed:  00:00:00
->>>>>>> 73cabe3969d793656407180a8db5feffe014593b
 </pre>
 </body>
 </html>
diff --git a/projet-voilier/Objects/projet-voilier_reel.dep b/projet-voilier/Objects/projet-voilier_reel.dep
index a1f9e23..cf02d66 100644
--- a/projet-voilier/Objects/projet-voilier_reel.dep
+++ b/projet-voilier/Objects/projet-voilier_reel.dep
@@ -1,10 +1,6 @@
 Dependencies for Project 'projet-voilier', Target 'reel': (DO NOT MODIFY !)
 CompilerVersion: 6190000::V6.19::ARMCLANG
-<<<<<<< HEAD
-F (.\src\main.c)(0x64351167)(-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)
-=======
-F (.\src\main.c)(0x643511B0)(-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)
->>>>>>> 73cabe3969d793656407180a8db5feffe014593b
+F (.\src\main.c)(0x64351277)(-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)
@@ -13,22 +9,14 @@ 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
-I (..\driver\Driver_GPIO.h)(0x64351060)
-I (..\driver\Driver_Timer.h)(0x64351060)
+I (..\driver\Driver_GPIO.h)(0x64351277)
+I (..\driver\Driver_Timer.h)(0x64351277)
 I (..\driver\Driver_UART.h)(0x642C85A4)
-I (..\driver\Driver_ADC.h)(0x64351060)
-I (..\driver\MySPI.h)(0x64351060)
-I (..\driver\Driver_IMU.h)(0x64351060)
-F (..\driver\Driver_GPIO.c)(0x64351084)(-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)(0x64351060)
-=======
-I (..\driver\Driver_GPIO.h)(0x643511B0)
-I (..\driver\Driver_Timer.h)(0x643511B0)
-I (..\driver\Driver_UART.h)(0x642C85A4)
-F (..\driver\Driver_GPIO.c)(0x643511B0)(-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)(0x643511B0)
->>>>>>> 73cabe3969d793656407180a8db5feffe014593b
+I (..\driver\Driver_ADC.h)(0x64351277)
+I (..\driver\MySPI.h)(0x64351277)
+I (..\driver\Driver_IMU.h)(0x64351277)
+F (..\driver\Driver_GPIO.c)(0x64351277)(-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)(0x64351277)
 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)
@@ -38,15 +26,9 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms
 I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E)
 I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78)
-<<<<<<< HEAD
-F (..\driver\Driver_GPIO.h)(0x64351060)()
-F (..\driver\Driver_Timer.c)(0x64351084)(-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)(0x64351060)
-=======
-F (..\driver\Driver_GPIO.h)(0x643511B0)()
-F (..\driver\Driver_Timer.c)(0x643511B0)(-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)(0x643511B0)
->>>>>>> 73cabe3969d793656407180a8db5feffe014593b
+F (..\driver\Driver_GPIO.h)(0x64351277)()
+F (..\driver\Driver_Timer.c)(0x64351277)(-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)(0x64351277)
 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)
@@ -56,11 +38,7 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms
 I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_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
-F (..\driver\Driver_Timer.h)(0x64351060)()
-=======
-F (..\driver\Driver_Timer.h)(0x643511B0)()
->>>>>>> 73cabe3969d793656407180a8db5feffe014593b
+F (..\driver\Driver_Timer.h)(0x64351277)()
 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 -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)(0x642C85A4)
 I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
@@ -72,11 +50,7 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms
 I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_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
-F (..\driver\Driver_ADC.c)(0x64351060)(-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)
-=======
-F (..\driver\Driver_ADC.c)(0x643511B0)(-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)
->>>>>>> 73cabe3969d793656407180a8db5feffe014593b
+F (..\driver\Driver_ADC.c)(0x64351277)(-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)
@@ -86,13 +60,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
-I (..\driver\Driver_ADC.h)(0x64351060)
-F (..\driver\Driver_ADC.h)(0x64351060)()
-=======
-I (..\driver\Driver_ADC.h)(0x643511B0)
-F (..\driver\Driver_ADC.h)(0x643511B0)()
->>>>>>> 73cabe3969d793656407180a8db5feffe014593b
+I (..\driver\Driver_ADC.h)(0x64351277)
+F (..\driver\Driver_ADC.h)(0x64351277)()
 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)
diff --git a/projet-voilier/projet-voilier.uvguix.robin b/projet-voilier/projet-voilier.uvguix.robin
index 050c09d..cab2c3d 100644
--- a/projet-voilier/projet-voilier.uvguix.robin
+++ b/projet-voilier/projet-voilier.uvguix.robin
@@ -1806,11 +1806,7 @@
         <Name>File</Name>
         <Buttons>
           <Len>2631</Len>
-<<<<<<< HEAD
-          <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000E4750494F5F4352485F434E463133960000000000000005000E4750494F5F4352485F434E4631330C4750494F5F4352485F434E46084750494F5F43524803435248125243435F41504232454E525F494F5041454E0000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000000180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
-=======
           <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000E4750494F5F4352485F434E463133960000000000000005000E4750494F5F4352485F434E4631330C4750494F5F4352485F434E46084750494F5F43524803435248125243435F41504232454E525F494F5041454E0000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
->>>>>>> 73cabe3969d793656407180a8db5feffe014593b
         </Buttons>
         <OriginalItems>
           <Len>1423</Len>
@@ -3611,13 +3607,8 @@
       <Doc>
         <Name>.\src\main.c</Name>
         <ColumnNumber>0</ColumnNumber>
-<<<<<<< HEAD
-        <TopLine>63</TopLine>
-        <CurrentLine>110</CurrentLine>
-=======
         <TopLine>1</TopLine>
         <CurrentLine>19</CurrentLine>
->>>>>>> 73cabe3969d793656407180a8db5feffe014593b
         <Folding>1</Folding>
         <ContractedFolders></ContractedFolders>
         <PaneID>0</PaneID>
diff --git a/projet-voilier/projet-voilier.uvoptx b/projet-voilier/projet-voilier.uvoptx
index 2deb6bb..1310198 100644
--- a/projet-voilier/projet-voilier.uvoptx
+++ b/projet-voilier/projet-voilier.uvoptx
@@ -366,7 +366,6 @@
           <Number>1</Number>
           <Type>0</Type>
           <LineNumber>110</LineNumber>
-<<<<<<< HEAD
           <EnabledFlag>1</EnabledFlag>
           <Address>134218088</Address>
           <ByteObject>0</ByteObject>
@@ -379,28 +378,6 @@
           <ExecCommand></ExecCommand>
           <Expression>\\projet_voilier_reel\src/main.c\110</Expression>
         </Bp>
-        <Bp>
-          <Number>2</Number>
-          <Type>0</Type>
-          <LineNumber>100</LineNumber>
-=======
->>>>>>> 73cabe3969d793656407180a8db5feffe014593b
-          <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>
-<<<<<<< HEAD
-          <Expression></Expression>
-=======
-          <Expression>\\projet_voilier_reel\src/main.c\110</Expression>
->>>>>>> 73cabe3969d793656407180a8db5feffe014593b
-        </Bp>
       </Breakpoint>
       <Tracepoint>
         <THDelay>0</THDelay>