diff --git a/projet-voilier/Objects/driver_gpio.o b/projet-voilier/Objects/driver_gpio.o
index f94093f..d6b8572 100644
Binary files a/projet-voilier/Objects/driver_gpio.o and b/projet-voilier/Objects/driver_gpio.o differ
diff --git a/projet-voilier/Objects/driver_timer.o b/projet-voilier/Objects/driver_timer.o
index 38da3b6..b2382aa 100644
Binary files a/projet-voilier/Objects/driver_timer.o and b/projet-voilier/Objects/driver_timer.o differ
diff --git a/projet-voilier/Objects/main.d b/projet-voilier/Objects/main.d
index 32b7909..ee56831 100644
--- a/projet-voilier/Objects/main.d
+++ b/projet-voilier/Objects/main.d
@@ -8,9 +8,5 @@
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 \
-<<<<<<< HEAD
..\driver\Driver_UART.h ..\driver\Driver_ADC.h ..\driver\MySPI.h \
- ..\driver\Driver_IMU.h
-=======
- ..\driver\Driver_UART.h src\App_girouette.h
->>>>>>> encoder
+ ..\driver\Driver_IMU.h src\App_girouette.h
diff --git a/projet-voilier/Objects/main.o b/projet-voilier/Objects/main.o
deleted file mode 100644
index 5dc4d13..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 97cfaae..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 9cce77d..e580efa 100644
--- a/projet-voilier/Objects/projet-voilier_reel.build_log.htm
+++ b/projet-voilier/Objects/projet-voilier_reel.build_log.htm
@@ -27,7 +27,6 @@ Project File Date: 04/11/2023
Output:
*** Using Compiler 'V6.19', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
Rebuild target 'reel'
-<<<<<<< HEAD
src/main.c(19): error: unknown type name 'Encoder'
Encoder->Timer = TIM4;
^
@@ -91,34 +90,26 @@ MyTimer_Start(&Encoder);
../driver\Driver_Timer.h(29): note: previous declaration is here
void MyTimer_Start(MyTimer_Struct_TypeDef * Timer);
^
-3 warnings and 11 errors generated.
+src/main.c(47): error: too few arguments to function call, expected 3, have 2
+ MyTimer_ConfigurePWM(&PWM_VOILE, 10);
+ ~~~~~~~~~~~~~~~~~~~~ ^
+../driver\Driver_Timer.h(66): note: 'MyTimer_ConfigurePWM' declared here
+void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint8_t pwm_channel, uint16_t duty_cycle);
+ ^
+src/main.c(128): warning: implicitly declaring library function 'sprintf' with type 'int (char *, const char *, ...)' [-Wimplicit-function-declaration]
+ sprintf(str, "Dir: %f deg", (float)dir);
+ ^
+src/main.c(128): note: include the header or explicitly provide a declaration for 'sprintf'
+4 warnings and 12 errors generated.
compiling main.c...
-compiling system_stm32f10x.c...
assembling startup_stm32f10x_md.s...
-compiling Driver_UART.c...
-=======
-assembling startup_stm32f10x_md.s...
->>>>>>> encoder
+compiling Driver_ADC.c...
compiling Driver_GPIO.c...
compiling App_girouette.c...
compiling Driver_UART.c...
-src/main.c(108): warning: implicitly declaring library function 'sprintf' with type 'int (char *, const char *, ...)' [-Wimplicit-function-declaration]
- sprintf(str, "Dir: %f deg", (float)dir);
- ^
-src/main.c(108): note: include the header or explicitly provide a declaration for 'sprintf'
-1 warning generated.
-compiling main.c...
compiling Driver_Timer.c...
-compiling Driver_ADC.c...
-<<<<<<< HEAD
-compiling Driver_Timer.c...
-".\Objects\projet-voilier_reel.axf" - 11 Error(s), 3 Warning(s).
-=======
compiling system_stm32f10x.c...
-linking...
-Program Size: Code=5584 RO-data=268 RW-data=16 ZI-data=1024
-".\Objects\projet-voilier_reel.axf" - 0 Error(s), 1 Warning(s).
->>>>>>> encoder
+".\Objects\projet-voilier_reel.axf" - 12 Error(s), 4 Warning(s).
Software Packages used:
@@ -149,10 +140,7 @@ 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.
-=======
->>>>>>> encoder
Build Time Elapsed: 00:00:01
diff --git a/projet-voilier/Objects/projet-voilier_reel.dep b/projet-voilier/Objects/projet-voilier_reel.dep
index 1466177..82009fe 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)(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)
-=======
-F (.\src\main.c)(0x6435437D)(-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)
->>>>>>> encoder
+F (.\src\main.c)(0x6435459E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c
-fno-rtti -funsigned-char -fshort-enums -fshort-wchar
-D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver
-I./RTE/Device/STM32F103RB
-I./RTE/_reel
-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include
-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
-D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_
-o ./objects/main.o -MD)
I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
I (RTE\_reel\RTE_Components.h)(0x64218849)
I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E)
@@ -13,22 +9,15 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms
I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_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)(0x64351277)
-I (..\driver\Driver_Timer.h)(0x64351277)
-I (..\driver\Driver_UART.h)(0x642C85A4)
-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 (..\driver\Driver_GPIO.h)(0x64351540)
-I (..\driver\Driver_Timer.h)(0x64351540)
-I (..\driver\Driver_UART.h)(0x64352E77)
-I (src\App_girouette.h)(0x643516BD)
-F (.\src\App_girouette.c)(0x64353982)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c
-fno-rtti -funsigned-char -fshort-enums -fshort-wchar
-D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver
-I./RTE/Device/STM32F103RB
-I./RTE/_reel
-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include
-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
-D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_
-o ./objects/app_girouette.o -MD)
-I (src\App_girouette.h)(0x643516BD)
+I (..\driver\Driver_GPIO.h)(0x64354588)
+I (..\driver\Driver_Timer.h)(0x64354588)
+I (..\driver\Driver_UART.h)(0x6435459E)
+I (..\driver\Driver_ADC.h)(0x64354588)
+I (..\driver\MySPI.h)(0x64354588)
+I (..\driver\Driver_IMU.h)(0x64354588)
+I (src\App_girouette.h)(0x6435459E)
+F (.\src\App_girouette.c)(0x6435459E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c
-fno-rtti -funsigned-char -fshort-enums -fshort-wchar
-D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver
-I./RTE/Device/STM32F103RB
-I./RTE/_reel
-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include
-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
-D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_
-o ./objects/app_girouette.o -MD)
+I (src\App_girouette.h)(0x6435459E)
I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
I (RTE\_reel\RTE_Components.h)(0x64218849)
I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E)
@@ -37,12 +26,11 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms
I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E)
I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E)
I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE)
-I (..\driver\Driver_GPIO.h)(0x64351540)
-I (..\driver\Driver_Timer.h)(0x64351540)
-F (.\src\App_girouette.h)(0x643516BD)()
-F (..\driver\Driver_GPIO.c)(0x6435274E)(-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)(0x64351540)
->>>>>>> encoder
+I (..\driver\Driver_GPIO.h)(0x64354588)
+I (..\driver\Driver_Timer.h)(0x64354588)
+F (.\src\App_girouette.h)(0x6435459E)()
+F (..\driver\Driver_GPIO.c)(0x6435459E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c
-fno-rtti -funsigned-char -fshort-enums -fshort-wchar
-D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver
-I./RTE/Device/STM32F103RB
-I./RTE/_reel
-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include
-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
-D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_
-o ./objects/driver_gpio.o -MD)
+I (..\driver\Driver_GPIO.h)(0x64354588)
I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
I (RTE\_reel\RTE_Components.h)(0x64218849)
I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E)
@@ -52,15 +40,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)(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)
-=======
-F (..\driver\Driver_GPIO.h)(0x64351540)()
-F (..\driver\Driver_Timer.c)(0x64353731)(-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)(0x64351540)
->>>>>>> encoder
+F (..\driver\Driver_GPIO.h)(0x64354588)()
+F (..\driver\Driver_Timer.c)(0x6435459E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c
-fno-rtti -funsigned-char -fshort-enums -fshort-wchar
-D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver
-I./RTE/Device/STM32F103RB
-I./RTE/_reel
-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include
-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
-D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_
-o ./objects/driver_timer.o -MD)
+I (..\driver\Driver_Timer.h)(0x64354588)
I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
I (RTE\_reel\RTE_Components.h)(0x64218849)
I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E)
@@ -70,15 +52,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_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)
-=======
-F (..\driver\Driver_Timer.h)(0x64351540)()
-F (..\driver\Driver_UART.c)(0x64352E6F)(-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)(0x64352E77)
->>>>>>> encoder
+F (..\driver\Driver_Timer.h)(0x64354588)()
+F (..\driver\Driver_UART.c)(0x6435459E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c
-fno-rtti -funsigned-char -fshort-enums -fshort-wchar
-D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver
-I./RTE/Device/STM32F103RB
-I./RTE/_reel
-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include
-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
-D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_
-o ./objects/driver_uart.o -MD)
+I (..\driver\Driver_UART.h)(0x6435459E)
I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
I (RTE\_reel\RTE_Components.h)(0x64218849)
I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E)
@@ -87,13 +63,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_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
-F (..\driver\Driver_UART.h)(0x642C85A4)()
-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)
-=======
-F (..\driver\Driver_UART.h)(0x64352E77)()
-F (..\driver\Driver_ADC.c)(0x64351540)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c
-fno-rtti -funsigned-char -fshort-enums -fshort-wchar
-D__EVAL -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)
->>>>>>> encoder
+F (..\driver\Driver_UART.h)(0x6435459E)()
+F (..\driver\Driver_ADC.c)(0x64354588)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c
-fno-rtti -funsigned-char -fshort-enums -fshort-wchar
-D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver
-I./RTE/Device/STM32F103RB
-I./RTE/_reel
-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include
-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
-D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_
-o ./objects/driver_adc.o -MD)
I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
I (RTE\_reel\RTE_Components.h)(0x64218849)
I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E)
@@ -103,13 +74,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)(0x64351277)
-F (..\driver\Driver_ADC.h)(0x64351277)()
-=======
-I (..\driver\Driver_ADC.h)(0x64351540)
-F (..\driver\Driver_ADC.h)(0x64351540)()
->>>>>>> encoder
+I (..\driver\Driver_ADC.h)(0x64354588)
+F (..\driver\Driver_ADC.h)(0x64354588)()
F (RTE/Device/STM32F103RB/RTE_Device.h)(0x641B050C)()
F (RTE/Device/STM32F103RB/startup_stm32f10x_md.s)(0x641B050C)(--target=arm-arm-none-eabi -mcpu=cortex-m3 -masm=auto -Wa,armasm,--diag_suppress=A1950W -c
-gdwarf-4 -Wa,armasm,--pd,"__MICROLIB SETA 1" -Wa,armasm,--pd,"__EVAL SETA 1"
-I./RTE/Device/STM32F103RB
-I./RTE/_reel
-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include
-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
-Wa,armasm,--pd,"__UVISION_VERSION SETA 538" -Wa,armasm,--pd,"_RTE_ SETA 1" -Wa,armasm,--pd,"STM32F10X_MD SETA 1" -Wa,armasm,--pd,"_RTE_ SETA 1"
-o ./objects/startup_stm32f10x_md.o)
F (RTE/Device/STM32F103RB/system_stm32f10x.c)(0x641B050C)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c
-fno-rtti -funsigned-char -fshort-enums -fshort-wchar
-D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver
-I./RTE/Device/STM32F103RB
-I./RTE/_reel
-IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include
-IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
-D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_
-o ./objects/system_stm32f10x.o -MD)
diff --git a/projet-voilier/projet-voilier.uvguix.robin b/projet-voilier/projet-voilier.uvguix.robin
index 94a1056..1b37013 100644
--- a/projet-voilier/projet-voilier.uvguix.robin
+++ b/projet-voilier/projet-voilier.uvguix.robin
@@ -111,7 +111,7 @@