From fe352d342d5b475065b523c4ee754a47a6064786 Mon Sep 17 00:00:00 2001 From: Robin M Date: Tue, 11 Apr 2023 10:07:19 +0200 Subject: [PATCH] help --- projet-voilier/Objects/main.o | Bin 5120 -> 0 bytes .../Objects/projet-voilier_reel.axf | Bin 31404 -> 0 bytes .../Objects/projet-voilier_reel.build_log.htm | 20 +----- .../Objects/projet-voilier_reel.dep | 61 +++++------------- projet-voilier/projet-voilier.uvguix.robin | 9 --- projet-voilier/projet-voilier.uvoptx | 23 ------- 6 files changed, 16 insertions(+), 97 deletions(-) delete mode 100644 projet-voilier/Objects/main.o delete mode 100644 projet-voilier/Objects/projet-voilier_reel.axf diff --git a/projet-voilier/Objects/main.o b/projet-voilier/Objects/main.o deleted file mode 100644 index be536990097223da95b0f51ce83cb391a6895904..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5120 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 Kd#*kr-u*8?!z%y) diff --git a/projet-voilier/Objects/projet-voilier_reel.axf b/projet-voilier/Objects/projet-voilier_reel.axf deleted file mode 100644 index 4d0eb7339034277a680ad5bd71e1b7b56f219327..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31404 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 RPIu#_`1N!O5Wke({{zEO{}=!O 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

Output:

*** 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

Software Packages used:

@@ -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 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 @@ File 2631 -<<<<<<< HEAD - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000E4750494F5F4352485F434E463133960000000000000005000E4750494F5F4352485F434E4631330C4750494F5F4352485F434E46084750494F5F43524803435248125243435F41504232454E525F494F5041454E0000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000000180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 -======= 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000E4750494F5F4352485F434E463133960000000000000005000E4750494F5F4352485F434E4631330C4750494F5F4352485F434E46084750494F5F43524803435248125243435F41504232454E525F494F5041454E0000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 ->>>>>>> 73cabe3969d793656407180a8db5feffe014593b 1423 @@ -3611,13 +3607,8 @@ .\src\main.c 0 -<<<<<<< HEAD - 63 - 110 -======= 1 19 ->>>>>>> 73cabe3969d793656407180a8db5feffe014593b 1 0 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 @@ 1 0 110 -<<<<<<< HEAD 1
134218088
0 @@ -379,28 +378,6 @@ \\projet_voilier_reel\src/main.c\110 - - 2 - 0 - 100 -======= ->>>>>>> 73cabe3969d793656407180a8db5feffe014593b - 1 -
0
- 0 - 0 - 0 - 0 - 0 - 0 - .\src\main.c - -<<<<<<< HEAD - -======= - \\projet_voilier_reel\src/main.c\110 ->>>>>>> 73cabe3969d793656407180a8db5feffe014593b - 0