gauch/Projet-Voilier-3
1
0
Fork 0
Koodi Ongelmat Pull-pyynnöt Julkaisut Wiki Toiminta

UART DONE

Selaa lähdekoodia
This commit is contained in:
Robin Marin-Muller 2023-03-31 12:04:31 +02:00
commit be145ebbd7
15 muutettua tiedostoa jossa 748 lisäystä ja 25 poistoa
Show stats Download patch file Download diff file Expand all files Collapse all files

29
.gitignore vendored Tavallinen tiedosto
Näytä tiedosto

@ -0,0 +1,29 @@
*.obj
*.o
*.bin
*.list
*.map
*.mk
*.makefile
*.o
*.su
*.d
*.elf
*.scvd
*.crf
*.map
*.sct
*.dbgconf
*.axf
*.htm
*.lnp
*.dep
*.uvguix.*
*.lst
*.iex
**/Objects/
**/Listings/
**/Debug/

67
driver/Driver_ADC.c Tavallinen tiedosto
Näytä tiedosto

@ -0,0 +1,67 @@
#include "stm32f10x.h"
#include "stdio.h"
#include "Driver_ADC.h"
void erreur (void)
{
while(1);
}
void (*ADC1_2_fx) (void) = &erreur;
/**
*************************************************************************************************
* @brief Activation et configuration de l'ADC1.
* @param -> Priorité de l'intérruption.
* @Note -> Fonction à lancer systématiquement avant d’aller plus en détail dans les conf plus fines (PWM, codeur inc...)
*************************************************************************************************
*/
void driver_adc_1_init (char Prio, void (*IT_function)(void))
{
//On règle la fréquence à 12Mhz
RCC->CFGR |= RCC_CFGR_ADCPRE_DIV6;
//Validation de l'horloge ACD1
RCC->APB2ENR |= RCC_APB2ENR_ADC1EN;
//Activation de l'external trig
ADC1->CR2 |= ADC_CR2_EXTTRIG;
//Activation SWSTART
ADC1->CR2 |= ADC_CR2_EXTSEL;
//Validation de l'horloge ACD1
RCC->APB2ENR |= RCC_APB2ENR_ADC1EN;
//Activation de l'ADC1
ADC1->CR2 |= ADC_CR2_ADON;
//Fixe le nb de conversion, ici 1
ADC1->SQR1 &= ADC_SQR1_L;
//Numéro de voie à convertir
ADC1->SQR3 |= 1;
//Lancement de la calibration
ADC1->CR2 |= ADC_CR2_CAL;
//Attente de la fin de la calibration
while((ADC1->CR2 & ADC_CR2_CAL));
//Activation de l'intéruption sur le flag EOC
ADC1->CR1 |= ADC_CR1_EOCIE;
//Activation de l'intéruption et configuration du niveau de priorité
NVIC_EnableIRQ(ADC1_2_IRQn);
NVIC_SetPriority(ADC1_2_IRQn, Prio);
//Fonction à appeler à l'intéruption
ADC1_2_fx = IT_function;
}
void driver_adc_1_launch_read (void)
{
//Lancement de la conversion
ADC1->CR2 |= ADC_CR2_SWSTART;
}
uint16_t driver_adc_1_read (void)
{
//Retour de la conversion
return ADC1->DR &~ ((0x0F) << 12);
}
void ADC1_2_IRQHandler(void)
{
//On abaisse le flag pour la prochaine lecture
ADC1->SR &= ~ADC_SR_EOC;
//On lance la fonction de l'utilisateur
(*ADC1_2_fx)();
}

9
driver/Driver_ADC.h Tavallinen tiedosto
Näytä tiedosto

@ -0,0 +1,9 @@
#ifndef DRIVER_ADC_H
#define DRIVER_ADC_H
#include "stm32f10x.h"
void driver_adc_1_init (char Prio, void (*IT_function)(void));
void driver_adc_1_launch_read (void);
uint16_t driver_adc_1_read (void);
#endif

40
projet-voilier/Driver_ADC.c Tavallinen tiedosto
Näytä tiedosto

@ -0,0 +1,40 @@
#include "Driver_ADC.h"
#include "stm32f10x.h"
#include "stdio.h"
void init_adc1 (void)
{
//Activation de l'external trig
ADC1->CR2 |= ADC_CR2_EXTTRIG;
//Activation SWSTART
ADC1->CR2 |= ADC_CR2_EXTSEL;
//On règle la fréquence à 12Mhz
RCC->CFGR |= RCC_CFGR_ADCPRE_DIV6;
//Activation de l'ADC
ADC1->CR2 |= ADC_CR2_ADON;
//Fixe le nb de conversion, ici 1
ADC1->SQR1 &= ADC_SQR1_L;
//Numéro de voie à convertir
ADC1->SQR3 |= 1;
//Lancement de la calibration
ADC1->CR2 |= ADC_CR2_CAL;
//Attente de la fin de la calibration
while((ADC1->CR2 & ADC_CR2_CAL));
//Activation de l'intéruption sur le flag EOC
ADC1->CR1 |= ADC_CR1_EOCIE;
}
void launch_read_adc1 (void)
{
//Lancement de la conversion
ADC1->CR2 |= ADC_CR2_SWSTART;
}
int read_adc1 (void)
{
//On abaisse le flag pour la prochaine lecture
ADC1->SR &= ~ADC_SR_EOC;
//Retour de la conversion
return ADC1->DR &~ ((0x0F) << 12);
}

98
projet-voilier/Listings/projet-voilier_reel.map
Näytä tiedosto

@ -70,6 +70,7 @@ Section Cross References
Removing Unused input sections from the image. Removing Unused input sections from the image.
<<<<<<< HEAD
Removing main.o(.text), (0 bytes). Removing main.o(.text), (0 bytes).
Removing main.o(.ARM.exidx.text.main), (8 bytes). Removing main.o(.ARM.exidx.text.main), (8 bytes).
Removing main.o(.ARM.use_no_argv), (4 bytes). Removing main.o(.ARM.use_no_argv), (4 bytes).
@ -99,6 +100,32 @@ Removing Unused input sections from the image.
Removing driver_uart.o(.ARM.exidx.text.MyUART_SendByte), (8 bytes). Removing driver_uart.o(.ARM.exidx.text.MyUART_SendByte), (8 bytes).
Removing driver_uart.o(.text.MyUART_ReceiveByte), (16 bytes). Removing driver_uart.o(.text.MyUART_ReceiveByte), (16 bytes).
Removing driver_uart.o(.ARM.exidx.text.MyUART_ReceiveByte), (8 bytes). Removing driver_uart.o(.ARM.exidx.text.MyUART_ReceiveByte), (8 bytes).
=======
Removing main.o(.rev16_text), (4 bytes).
Removing main.o(.revsh_text), (4 bytes).
Removing main.o(.rrx_text), (6 bytes).
Removing driver_gpio.o(.rev16_text), (4 bytes).
Removing driver_gpio.o(.revsh_text), (4 bytes).
Removing driver_gpio.o(.rrx_text), (6 bytes).
Removing driver_gpio.o(i.MyGPIO_Read), (14 bytes).
Removing driver_gpio.o(i.MyGPIO_Reset), (12 bytes).
Removing driver_gpio.o(i.MyGPIO_Toggle), (12 bytes).
Removing driver_timer.o(.rev16_text), (4 bytes).
Removing driver_timer.o(.revsh_text), (4 bytes).
Removing driver_timer.o(.rrx_text), (6 bytes).
Removing driver_timer.o(i.MyTimer_ActiveIT), (112 bytes).
Removing driver_timer.o(i.MyTimer_Base_Init), (116 bytes).
Removing driver_timer.o(i.MyTimer_Start), (10 bytes).
Removing driver_timer.o(i.MyTimer_Stop), (10 bytes).
Removing driver_timer.o(i.__NVIC_EnableIRQ), (34 bytes).
Removing driver_timer.o(i.__NVIC_SetPriority), (40 bytes).
Removing driver_adc.o(.rev16_text), (4 bytes).
Removing driver_adc.o(.revsh_text), (4 bytes).
Removing driver_adc.o(.rrx_text), (6 bytes).
Removing driver_adc.o(i.init_adc1), (132 bytes).
Removing driver_adc.o(i.launch_read_adc1), (20 bytes).
Removing driver_adc.o(i.read_adc1), (28 bytes).
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
Removing startup_stm32f10x_md.o(HEAP), (512 bytes). Removing startup_stm32f10x_md.o(HEAP), (512 bytes).
Removing system_stm32f10x.o(.text), (0 bytes). Removing system_stm32f10x.o(.text), (0 bytes).
Removing system_stm32f10x.o(.ARM.exidx.text.SystemInit), (8 bytes). Removing system_stm32f10x.o(.ARM.exidx.text.SystemInit), (8 bytes).
@ -107,7 +134,11 @@ Removing Unused input sections from the image.
Removing system_stm32f10x.o(.data.SystemCoreClock), (4 bytes). Removing system_stm32f10x.o(.data.SystemCoreClock), (4 bytes).
Removing system_stm32f10x.o(.rodata.AHBPrescTable), (16 bytes). Removing system_stm32f10x.o(.rodata.AHBPrescTable), (16 bytes).
<<<<<<< HEAD
36 unused section(s) (total 1026 bytes) removed from the image. 36 unused section(s) (total 1026 bytes) removed from the image.
=======
30 unused section(s) (total 1306 bytes) removed from the image.
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
============================================================================== ==============================================================================
@ -117,6 +148,7 @@ Image Symbol Table
Symbol Name Value Ov Type Size Object(Section) Symbol Name Value Ov Type Size Object(Section)
<<<<<<< HEAD
../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE
@ -134,6 +166,32 @@ Image Symbol Table
Driver_Timer.c 0x00000000 Number 0 driver_timer.o ABSOLUTE Driver_Timer.c 0x00000000 Number 0 driver_timer.o ABSOLUTE
Driver_UART.c 0x00000000 Number 0 driver_uart.o ABSOLUTE Driver_UART.c 0x00000000 Number 0 driver_uart.o ABSOLUTE
RTE/Device/STM32F103RB/startup_stm32f10x_md.s 0x00000000 Number 0 startup_stm32f10x_md.o ABSOLUTE RTE/Device/STM32F103RB/startup_stm32f10x_md.s 0x00000000 Number 0 startup_stm32f10x_md.o ABSOLUTE
=======
../clib/microlib/init/entry.s 0x00000000 Number 0 entry12a.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry12b.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry7a.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry8a.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry8b.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry9a.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry7b.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry9b.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry10a.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry10b.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry11a.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE
../clib/microlib/init/entry.s 0x00000000 Number 0 entry11b.o ABSOLUTE
..\\driver\\Driver_ADC.c 0x00000000 Number 0 driver_adc.o ABSOLUTE
..\\driver\\Driver_GPIO.c 0x00000000 Number 0 driver_gpio.o ABSOLUTE
..\\driver\\Driver_Timer.c 0x00000000 Number 0 driver_timer.o ABSOLUTE
..\driver\Driver_ADC.c 0x00000000 Number 0 driver_adc.o ABSOLUTE
..\driver\Driver_GPIO.c 0x00000000 Number 0 driver_gpio.o ABSOLUTE
..\driver\Driver_Timer.c 0x00000000 Number 0 driver_timer.o ABSOLUTE
RTE\Device\STM32F103RB\startup_stm32f10x_md.s 0x00000000 Number 0 startup_stm32f10x_md.o ABSOLUTE
RTE\Device\STM32F103RB\system_stm32f10x.c 0x00000000 Number 0 system_stm32f10x.o ABSOLUTE
RTE\\Device\\STM32F103RB\\system_stm32f10x.c 0x00000000 Number 0 system_stm32f10x.o ABSOLUTE
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
dc.s 0x00000000 Number 0 dc.o ABSOLUTE dc.s 0x00000000 Number 0 dc.o ABSOLUTE
handlers.s 0x00000000 Number 0 handlers.o ABSOLUTE handlers.s 0x00000000 Number 0 handlers.o ABSOLUTE
init.s 0x00000000 Number 0 init.o ABSOLUTE init.s 0x00000000 Number 0 init.o ABSOLUTE
@ -281,6 +339,7 @@ Memory Map of the image
Exec Addr Load Addr Size Type Attr Idx E Section Name Object Exec Addr Load Addr Size Type Attr Idx E Section Name Object
<<<<<<< HEAD
0x08000000 0x08000000 0x000000ec Data RO 73 RESET startup_stm32f10x_md.o 0x08000000 0x08000000 0x000000ec Data RO 73 RESET startup_stm32f10x_md.o
0x080000ec 0x080000ec 0x00000000 Code RO 94 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) 0x080000ec 0x080000ec 0x00000000 Code RO 94 * .ARM.Collect$$$$00000000 mc_w.l(entry.o)
0x080000ec 0x080000ec 0x00000004 Code RO 97 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) 0x080000ec 0x080000ec 0x00000004 Code RO 97 .ARM.Collect$$$$00000001 mc_w.l(entry2.o)
@ -314,22 +373,61 @@ Memory Map of the image
0x0800059c 0x0800059c 0x00000002 Code RO 116 i.__scatterload_null mc_w.l(handlers.o) 0x0800059c 0x0800059c 0x00000002 Code RO 116 i.__scatterload_null mc_w.l(handlers.o)
0x0800059e 0x0800059e 0x0000000e Code RO 117 i.__scatterload_zeroinit mc_w.l(handlers.o) 0x0800059e 0x0800059e 0x0000000e Code RO 117 i.__scatterload_zeroinit mc_w.l(handlers.o)
0x080005ac 0x080005ac 0x00000020 Data RO 114 Region$$Table anon$$obj.o 0x080005ac 0x080005ac 0x00000020 Data RO 114 Region$$Table anon$$obj.o
=======
0x08000000 0x08000000 0x000000ec Data RO 236 RESET startup_stm32f10x_md.o
0x080000ec 0x080000ec 0x00000000 Code RO 287 * .ARM.Collect$$$$00000000 mc_w.l(entry.o)
0x080000ec 0x080000ec 0x00000004 Code RO 290 .ARM.Collect$$$$00000001 mc_w.l(entry2.o)
0x080000f0 0x080000f0 0x00000004 Code RO 293 .ARM.Collect$$$$00000004 mc_w.l(entry5.o)
0x080000f4 0x080000f4 0x00000000 Code RO 295 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o)
0x080000f4 0x080000f4 0x00000000 Code RO 297 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o)
0x080000f4 0x080000f4 0x00000008 Code RO 298 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o)
0x080000fc 0x080000fc 0x00000004 Code RO 305 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o)
0x08000100 0x08000100 0x00000000 Code RO 300 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o)
0x08000100 0x08000100 0x00000000 Code RO 302 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o)
0x08000100 0x08000100 0x00000004 Code RO 291 .ARM.Collect$$$$00002712 mc_w.l(entry2.o)
0x08000104 0x08000104 0x00000024 Code RO 237 * .text startup_stm32f10x_md.o
0x08000128 0x08000128 0x00000024 Code RO 306 .text mc_w.l(init.o)
0x0800014c 0x0800014c 0x00000004 Code RO 118 i.Bug driver_timer.o
0x08000150 0x08000150 0x00000108 Code RO 66 i.MyGPIO_Init driver_gpio.o
0x08000258 0x08000258 0x0000000c Code RO 69 i.MyGPIO_Set driver_gpio.o
0x08000264 0x08000264 0x00000008 Code RO 244 i.SetSysClock system_stm32f10x.o
0x0800026c 0x0800026c 0x000000e0 Code RO 245 i.SetSysClockTo72 system_stm32f10x.o
0x0800034c 0x0800034c 0x00000060 Code RO 247 i.SystemInit system_stm32f10x.o
0x080003ac 0x080003ac 0x00000020 Code RO 123 i.TIM2_IRQHandler driver_timer.o
0x080003cc 0x080003cc 0x00000020 Code RO 124 i.TIM3_IRQHandler driver_timer.o
0x080003ec 0x080003ec 0x00000020 Code RO 125 i.TIM4_IRQHandler driver_timer.o
0x0800040c 0x0800040c 0x0000000e Code RO 310 i.__scatterload_copy mc_w.l(handlers.o)
0x0800041a 0x0800041a 0x00000002 Code RO 311 i.__scatterload_null mc_w.l(handlers.o)
0x0800041c 0x0800041c 0x0000000e Code RO 312 i.__scatterload_zeroinit mc_w.l(handlers.o)
0x0800042a 0x0800042a 0x00000002 PAD
0x0800042c 0x0800042c 0x0000002c Code RO 4 i.main main.o
0x08000458 0x08000458 0x00000020 Data RO 308 Region$$Table anon$$obj.o
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x080005cc, Size: 0x0000000c, Max: 0xffffffff, ABSOLUTE) Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x080005cc, Size: 0x0000000c, Max: 0xffffffff, ABSOLUTE)
Exec Addr Load Addr Size Type Attr Idx E Section Name Object Exec Addr Load Addr Size Type Attr Idx E Section Name Object
<<<<<<< HEAD
0x20000000 0x080005cc 0x00000004 Data RW 47 .data.TIM2_fx driver_timer.o 0x20000000 0x080005cc 0x00000004 Data RW 47 .data.TIM2_fx driver_timer.o
0x20000004 0x080005d0 0x00000004 Data RW 48 .data.TIM3_fx driver_timer.o 0x20000004 0x080005d0 0x00000004 Data RW 48 .data.TIM3_fx driver_timer.o
0x20000008 0x080005d4 0x00000004 Data RW 49 .data.TIM4_fx driver_timer.o 0x20000008 0x080005d4 0x00000004 Data RW 49 .data.TIM4_fx driver_timer.o
=======
0x20000000 0x08000478 0x0000000c Data RW 128 .data driver_timer.o
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
Execution Region ER_ZI (Exec base: 0x20000010, Load base: 0x080005d8, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE) Execution Region ER_ZI (Exec base: 0x20000010, Load base: 0x080005d8, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE)
Exec Addr Load Addr Size Type Attr Idx E Section Name Object Exec Addr Load Addr Size Type Attr Idx E Section Name Object
<<<<<<< HEAD
0x20000010 - 0x00000400 Zero RW 71 STACK startup_stm32f10x_md.o 0x20000010 - 0x00000400 Zero RW 71 STACK startup_stm32f10x_md.o
=======
0x2000000c 0x08000484 0x00000004 PAD
0x20000010 - 0x00000400 Zero RW 234 STACK startup_stm32f10x_md.o
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
============================================================================== ==============================================================================

BIN
projet-voilier/Objects/main.crf
Näytä tiedosto

Binary file not shown.

15
projet-voilier/Objects/main.d
Näytä tiedosto

@ -1,3 +1,4 @@
<<<<<<< HEAD
./objects/main.o: src\main.c \ ./objects/main.o: src\main.c \
C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h \ C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h \
RTE\_sim\RTE_Components.h \ RTE\_sim\RTE_Components.h \
@ -9,3 +10,17 @@
C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.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_GPIO.h ..\driver\Driver_Timer.h \
..\driver\Driver_UART.h ..\driver\Driver_UART.h
=======
.\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
.\objects\main.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h
.\objects\main.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
.\objects\main.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h
.\objects\main.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h
.\objects\main.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h
.\objects\main.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h
.\objects\main.o: ..\driver\Driver_GPIO.h
.\objects\main.o: ..\driver\Driver_Timer.h
.\objects\main.o: ..\driver\Driver_ADC.h
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110

19
projet-voilier/Objects/projet-voilier_reel.build_log.htm
Näytä tiedosto

@ -25,9 +25,20 @@ C:\Users\robin\OneDrive\Documents\Dev\Projet-Voilier-3\projet-voilier\projet-voi
Project File Date: 03/27/2023 Project File Date: 03/27/2023
<h2>Output:</h2> <h2>Output:</h2>
<<<<<<< HEAD
*** Using Compiler 'V6.19', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin' *** Using Compiler 'V6.19', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
Build target 'reel' Build target 'reel'
compiling Driver_UART.c... compiling Driver_UART.c...
=======
*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
Rebuild target 'reel'
assembling startup_stm32f10x_md.s...
compiling Driver_ADC.c...
compiling system_stm32f10x.c...
compiling Driver_GPIO.c...
compiling main.c...
compiling Driver_Timer.c...
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
linking... linking...
Program Size: Code=1216 RO-data=268 RW-data=12 ZI-data=1024 Program Size: Code=1216 RO-data=268 RW-data=12 ZI-data=1024
".\Objects\projet-voilier_reel.axf" - 0 Error(s), 0 Warning(s). ".\Objects\projet-voilier_reel.axf" - 0 Error(s), 0 Warning(s).
@ -57,11 +68,19 @@ Package Vendor: Keil
* Component: ARM::CMSIS:CORE:5.6.0 * Component: ARM::CMSIS:CORE:5.6.0
* Component: Keil::Device:Startup:1.0.0 * Component: Keil::Device:Startup:1.0.0
<<<<<<< HEAD
Source file: Device/Source/ARM/startup_stm32f10x_md.s Source file: Device/Source/ARM/startup_stm32f10x_md.s
Include file: RTE_Driver/Config/RTE_Device.h Include file: RTE_Driver/Config/RTE_Device.h
Source file: Device/Source/system_stm32f10x.c Source file: Device/Source/system_stm32f10x.c
Source file: Device/Source/ARM/STM32F1xx_OPT.s Source file: Device/Source/ARM/STM32F1xx_OPT.s
Build Time Elapsed: 00:00:00 Build Time Elapsed: 00:00:00
=======
Include file: RTE_Driver\Config\RTE_Device.h
Source file: Device\Source\system_stm32f10x.c
Source file: Device\Source\ARM\startup_stm32f10x_md.s
Source file: Device\Source\ARM\STM32F1xx_OPT.s
Build Time Elapsed: 00:00:01
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
</pre> </pre>
</body> </body>
</html> </html>

63
projet-voilier/Objects/projet-voilier_reel.dep
Näytä tiedosto

@ -1,4 +1,5 @@
Dependencies for Project 'projet-voilier', Target 'reel': (DO NOT MODIFY !) Dependencies for Project 'projet-voilier', Target 'reel': (DO NOT MODIFY !)
<<<<<<< HEAD
CompilerVersion: 6190000::V6.19::ARMCLANG CompilerVersion: 6190000::V6.19::ARMCLANG
F (.\src\main.c)(0x6426A876)(-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)(0x6426A876)(-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 (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE)
@ -58,3 +59,65 @@ 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_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\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:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE)
=======
CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC
F (.\src\main.c)(0x641B1ED7)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\src -I ..\driver -I.\RTE\Device\STM32F103RB -I.\RTE\_reel -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\main.o --omf_browse .\objects\main.crf --depend .\objects\main.d)
I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
I (.\RTE\_reel\RTE_Components.h)(0x641B02F1)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582)
I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582)
I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
I (..\driver\Driver_GPIO.h)(0x641864E8)
I (..\driver\Driver_Timer.h)(0x6419C780)
I (..\driver\Driver_ADC.h)(0x641B1EE6)
F (..\driver\Driver_GPIO.c)(0x64186DCB)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\src -I ..\driver -I.\RTE\Device\STM32F103RB -I.\RTE\_reel -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\driver_gpio.o --omf_browse .\objects\driver_gpio.crf --depend .\objects\driver_gpio.d)
I (..\driver\Driver_GPIO.h)(0x641864E8)
I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
I (.\RTE\_reel\RTE_Components.h)(0x641B02F1)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582)
I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582)
I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
I (C:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5E8E9122)
F (..\driver\Driver_GPIO.h)(0x641864E8)()
F (..\driver\Driver_Timer.c)(0x6419C743)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\src -I ..\driver -I.\RTE\Device\STM32F103RB -I.\RTE\_reel -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\driver_timer.o --omf_browse .\objects\driver_timer.crf --depend .\objects\driver_timer.d)
I (..\driver\Driver_Timer.h)(0x6419C780)
I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
I (.\RTE\_reel\RTE_Components.h)(0x641B02F1)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582)
I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582)
I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
I (C:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5E8E9122)
F (..\driver\Driver_Timer.h)(0x6419C780)()
F (..\driver\Driver_ADC.c)(0x641B1EBA)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\src -I ..\driver -I.\RTE\Device\STM32F103RB -I.\RTE\_reel -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\driver_adc.o --omf_browse .\objects\driver_adc.crf --depend .\objects\driver_adc.d)
I (..\driver\Driver_ADC.h)(0x641B1EE6)
I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
I (.\RTE\_reel\RTE_Components.h)(0x641B02F1)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582)
I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582)
I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
I (C:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5E8E9122)
F (..\driver\Driver_ADC.h)(0x641B1EE6)()
F (RTE\Device\STM32F103RB\RTE_Device.h)(0x59283406)()
F (RTE\Device\STM32F103RB\startup_stm32f10x_md.s)(0x58258CCC)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\Device\STM32F103RB -I.\RTE\_reel -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 534" --pd "_RTE_ SETA 1" --pd "STM32F10X_MD SETA 1" --pd "_RTE_ SETA 1" --list .\listings\startup_stm32f10x_md.lst --xref -o .\objects\startup_stm32f10x_md.o --depend .\objects\startup_stm32f10x_md.d)
F (RTE\Device\STM32F103RB\system_stm32f10x.c)(0x58258CCC)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\src -I ..\driver -I.\RTE\Device\STM32F103RB -I.\RTE\_reel -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\system_stm32f10x.o --omf_browse .\objects\system_stm32f10x.crf --depend .\objects\system_stm32f10x.d)
I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
I (.\RTE\_reel\RTE_Components.h)(0x641B02F1)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582)
I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22)
I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582)
I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110

4
projet-voilier/Objects/projet-voilier_reel.htm
Näytä tiedosto

@ -3,7 +3,11 @@
<title>Static Call Graph - [.\Objects\projet-voilier_reel.axf]</title></head> <title>Static Call Graph - [.\Objects\projet-voilier_reel.axf]</title></head>
<body><HR> <body><HR>
<H1>Static Call Graph for image .\Objects\projet-voilier_reel.axf</H1><HR> <H1>Static Call Graph for image .\Objects\projet-voilier_reel.axf</H1><HR>
<<<<<<< HEAD
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 6190004: Last Updated: Fri Mar 31 11:39:01 2023 <BR><P>#&#060CALLGRAPH&#062# ARM Linker, 6190004: Last Updated: Fri Mar 31 11:39:01 2023
=======
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060960: Last Updated: Wed Mar 22 16:29:44 2023
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
<BR><P> <BR><P>
<H3>Maximum Stack Usage = 48 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3> <H3>Maximum Stack Usage = 48 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
Call chain for Maximum Stack Depth:</H3> Call chain for Maximum Stack Depth:</H3>

4
projet-voilier/Objects/projet-voilier_reel.lnp
Näytä tiedosto

@ -2,7 +2,11 @@
".\objects\main.o" ".\objects\main.o"
".\objects\driver_gpio.o" ".\objects\driver_gpio.o"
".\objects\driver_timer.o" ".\objects\driver_timer.o"
<<<<<<< HEAD
".\objects\driver_uart.o" ".\objects\driver_uart.o"
=======
".\objects\driver_adc.o"
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
".\objects\startup_stm32f10x_md.o" ".\objects\startup_stm32f10x_md.o"
".\objects\system_stm32f10x.o" ".\objects\system_stm32f10x.o"
--library_type=microlib --ro-base 0x08000000 --entry 0x08000000 --rw-base 0x20000000 --entry Reset_Handler --first __Vectors --strict --summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols --library_type=microlib --ro-base 0x08000000 --entry 0x08000000 --rw-base 0x20000000 --entry Reset_Handler --first __Vectors --strict --summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols

80
projet-voilier/projet-voilier.uvguix.sanch
Näytä tiedosto

File diff suppressed because one or more lines are too long

298
projet-voilier/projet-voilier.uvoptx
Näytä tiedosto

@ -26,7 +26,7 @@
<ToolsetNumber>0x4</ToolsetNumber> <ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName> <ToolsetName>ARM-ADS</ToolsetName>
<TargetOption> <TargetOption>
<CLKADS>12000000</CLKADS> <CLKADS>8000000</CLKADS>
<OPTTT> <OPTTT>
<gFlags>1</gFlags> <gFlags>1</gFlags>
<BeepAtEnd>1</BeepAtEnd> <BeepAtEnd>1</BeepAtEnd>
@ -75,6 +75,235 @@
<OPTFL> <OPTFL>
<tvExp>1</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<<<<<<< HEAD
=======
<IsCurrentTarget>0</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
<uSim>1</uSim>
<uTrg>0</uTrg>
<sLdApp>1</sLdApp>
<sGomain>1</sGomain>
<sRbreak>1</sRbreak>
<sRwatch>1</sRwatch>
<sRmem>1</sRmem>
<sRfunc>1</sRfunc>
<sRbox>1</sRbox>
<tLdApp>1</tLdApp>
<tGomain>1</tGomain>
<tRbreak>1</tRbreak>
<tRwatch>1</tRwatch>
<tRmem>1</tRmem>
<tRfunc>0</tRfunc>
<tRbox>1</tRbox>
<tRtrace>1</tRtrace>
<sRSysVw>1</sRSysVw>
<tRSysVw>1</tRSysVw>
<sRunDeb>0</sRunDeb>
<sLrtime>0</sLrtime>
<bEvRecOn>1</bEvRecOn>
<bSchkAxf>0</bSchkAxf>
<bTchkAxf>0</bTchkAxf>
<nTsel>0</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
<sDlgDll></sDlgDll>
<sDlgPa></sDlgPa>
<sIfile></sIfile>
<tDll></tDll>
<tDllPa></tDllPa>
<tDlgDll></tDlgDll>
<tDlgPa></tDlgPa>
<tIfile></tIfile>
<pMon>BIN\UL2CM3.DLL</pMon>
</DebugOpt>
<TargetDriverDllRegistry>
<SetRegEntry>
<Number>0</Number>
<Key>ARMRTXEVENTFLAGS</Key>
<Name>-L70 -Z18 -C0 -M0 -T1</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>DLGDARM</Key>
<Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=75,104,496,531,0)(121=-1,-1,-1,-1,0)(122=75,104,496,531,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=-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)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=1125,344,1728,1095,1)(151=-1,-1,-1,-1,0)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>ARMDBGFLAGS</Key>
<Name>-T0</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>UL2CM3</Key>
<Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM))</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint>
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>23</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134219356</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\23</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
<LineNumber>9</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134219402</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\9</Expression>
</Bp>
<Bp>
<Number>2</Number>
<Type>0</Type>
<LineNumber>62</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134218310</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>..\driver\Driver_ADC.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\projet_voilier\../driver/Driver_ADC.c\62</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
<ItemText>val</ItemText>
</Ww>
</WatchWindow1>
<Tracepoint>
<THDelay>0</THDelay>
</Tracepoint>
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
<aLwin>1</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
<aPa>0</aPa>
<viewmode>1</viewmode>
<vrSel>0</vrSel>
<aSym>0</aSym>
<aTbox>0</aTbox>
<AscS1>0</AscS1>
<AscS2>0</AscS2>
<AscS3>0</AscS3>
<aSer3>0</aSer3>
<eProf>0</eProf>
<aLa>0</aLa>
<aPa1>0</aPa1>
<AscS4>0</AscS4>
<aSer4>0</aSer4>
<StkLoc>0</StkLoc>
<TrcWin>0</TrcWin>
<newCpu>0</newCpu>
<uProt>0</uProt>
</DebugFlag>
<LintExecutable></LintExecutable>
<LintConfigFile></LintConfigFile>
<bLintAuto>0</bLintAuto>
<bAutoGenD>0</bAutoGenD>
<LntExFlags>0</LntExFlags>
<pMisraName></pMisraName>
<pszMrule></pszMrule>
<pSingCmds></pSingCmds>
<pMultCmds></pMultCmds>
<pMisraNamep></pMisraNamep>
<pszMrulep></pszMrulep>
<pSingCmdsp></pSingCmdsp>
<pMultCmdsp></pMultCmdsp>
<DebugDescription>
<Enable>1</Enable>
<EnableFlashSeq>1</EnableFlashSeq>
<EnableLog>0</EnableLog>
<Protocol>2</Protocol>
<DbgClock>10000000</DbgClock>
</DebugDescription>
</TargetOption>
</Target>
<Target>
<TargetName>reel</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<TargetOption>
<CLKADS>8000000</CLKADS>
<OPTTT>
<gFlags>1</gFlags>
<BeepAtEnd>1</BeepAtEnd>
<RunSim>0</RunSim>
<RunTarget>1</RunTarget>
<RunAbUc>0</RunAbUc>
</OPTTT>
<OPTHX>
<HexSelection>1</HexSelection>
<FlashByte>65535</FlashByte>
<HexRangeLowAddress>0</HexRangeLowAddress>
<HexRangeHighAddress>0</HexRangeHighAddress>
<HexOffset>0</HexOffset>
</OPTHX>
<OPTLEX>
<PageWidth>79</PageWidth>
<PageLength>66</PageLength>
<TabStop>8</TabStop>
<ListingPath>.\Listings\</ListingPath>
</OPTLEX>
<ListingPage>
<CreateCListing>1</CreateCListing>
<CreateAListing>1</CreateAListing>
<CreateLListing>1</CreateLListing>
<CreateIListing>0</CreateIListing>
<AsmCond>1</AsmCond>
<AsmSymb>1</AsmSymb>
<AsmXref>0</AsmXref>
<CCond>1</CCond>
<CCode>0</CCode>
<CListInc>0</CListInc>
<CSymb>0</CSymb>
<LinkerCodeListing>0</LinkerCodeListing>
</ListingPage>
<OPTXL>
<LMap>1</LMap>
<LComments>1</LComments>
<LGenerateSymbols>1</LGenerateSymbols>
<LLibSym>1</LLibSym>
<LLines>1</LLines>
<LLocSym>1</LLocSym>
<LPubSym>1</LPubSym>
<LXref>0</LXref>
<LExpSel>0</LExpSel>
</OPTXL>
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
<IsCurrentTarget>1</IsCurrentTarget> <IsCurrentTarget>1</IsCurrentTarget>
</OPTFL> </OPTFL>
<CpuCode>18</CpuCode> <CpuCode>18</CpuCode>
@ -125,7 +354,11 @@
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
<Key>DLGTARM</Key> <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=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=1007,134,1601,828,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=1241,338,1689,752,0)(162=1244,281,1692,695,1)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name> <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=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=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=1007,134,1601,828,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=1241,338,1689,752,0)(162=1244,281,1692,695,1)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name>
=======
<Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=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=1048,459,1651,1093,1)(151=-1,-1,-1,-1,0)</Name>
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
</SetRegEntry> </SetRegEntry>
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
@ -152,9 +385,31 @@
<Bp> <Bp>
<Number>0</Number> <Number>0</Number>
<Type>0</Type> <Type>0</Type>
<<<<<<< HEAD
<LineNumber>53</LineNumber> <LineNumber>53</LineNumber>
<EnabledFlag>1</EnabledFlag> <EnabledFlag>1</EnabledFlag>
<Address>134219424</Address> <Address>134219424</Address>
=======
<LineNumber>62</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134218062</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>..\driver\Driver_ADC.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\projet_voilier_reel\../driver/Driver_ADC.c\62</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
<LineNumber>27</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134219156</Address>
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
<ByteObject>0</ByteObject> <ByteObject>0</ByteObject>
<HtxType>0</HtxType> <HtxType>0</HtxType>
<ManyObjects>0</ManyObjects> <ManyObjects>0</ManyObjects>
@ -163,9 +418,38 @@
<BreakIfRCount>1</BreakIfRCount> <BreakIfRCount>1</BreakIfRCount>
<Filename>.\src\main.c</Filename> <Filename>.\src\main.c</Filename>
<ExecCommand></ExecCommand> <ExecCommand></ExecCommand>
<<<<<<< HEAD
<Expression>\\projet_voilier\src/main.c\53</Expression> <Expression>\\projet_voilier\src/main.c\53</Expression>
</Bp> </Bp>
</Breakpoint> </Breakpoint>
=======
<Expression>\\projet_voilier_reel\src/main.c\27</Expression>
</Bp>
<Bp>
<Number>2</Number>
<Type>0</Type>
<LineNumber>64</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>..\driver\Driver_ADC.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
<ItemText>val</ItemText>
</Ww>
</WatchWindow1>
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
<Tracepoint> <Tracepoint>
<THDelay>0</THDelay> <THDelay>0</THDelay>
</Tracepoint> </Tracepoint>
@ -496,8 +780,13 @@
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<<<<<<< HEAD
<PathWithFileName>..\driver\Driver_UART.c</PathWithFileName> <PathWithFileName>..\driver\Driver_UART.c</PathWithFileName>
<FilenameWithoutPath>Driver_UART.c</FilenameWithoutPath> <FilenameWithoutPath>Driver_UART.c</FilenameWithoutPath>
=======
<PathWithFileName>..\driver\Driver_ADC.c</PathWithFileName>
<FilenameWithoutPath>Driver_ADC.c</FilenameWithoutPath>
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
@ -508,8 +797,13 @@
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<<<<<<< HEAD
<PathWithFileName>..\driver\Driver_UART.h</PathWithFileName> <PathWithFileName>..\driver\Driver_UART.h</PathWithFileName>
<FilenameWithoutPath>Driver_UART.h</FilenameWithoutPath> <FilenameWithoutPath>Driver_UART.h</FilenameWithoutPath>
=======
<PathWithFileName>..\driver\Driver_ADC.h</PathWithFileName>
<FilenameWithoutPath>Driver_ADC.h</FilenameWithoutPath>
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
@ -525,7 +819,7 @@
<Group> <Group>
<GroupName>::Device</GroupName> <GroupName>::Device</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>1</RteFlg> <RteFlg>1</RteFlg>

22
projet-voilier/projet-voilier.uvprojx
Näytä tiedosto

@ -415,6 +415,7 @@
<FilePath>..\driver\Driver_Timer.h</FilePath> <FilePath>..\driver\Driver_Timer.h</FilePath>
</File> </File>
<File> <File>
<<<<<<< HEAD
<FileName>Driver_UART.c</FileName> <FileName>Driver_UART.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\driver\Driver_UART.c</FilePath> <FilePath>..\driver\Driver_UART.c</FilePath>
@ -423,6 +424,16 @@
<FileName>Driver_UART.h</FileName> <FileName>Driver_UART.h</FileName>
<FileType>5</FileType> <FileType>5</FileType>
<FilePath>..\driver\Driver_UART.h</FilePath> <FilePath>..\driver\Driver_UART.h</FilePath>
=======
<FileName>Driver_ADC.c</FileName>
<FileType>1</FileType>
<FilePath>..\driver\Driver_ADC.c</FilePath>
</File>
<File>
<FileName>Driver_ADC.h</FileName>
<FileType>5</FileType>
<FilePath>..\driver\Driver_ADC.h</FilePath>
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
</File> </File>
</Files> </Files>
</Group> </Group>
@ -843,6 +854,7 @@
<FilePath>..\driver\Driver_Timer.h</FilePath> <FilePath>..\driver\Driver_Timer.h</FilePath>
</File> </File>
<File> <File>
<<<<<<< HEAD
<FileName>Driver_UART.c</FileName> <FileName>Driver_UART.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\driver\Driver_UART.c</FilePath> <FilePath>..\driver\Driver_UART.c</FilePath>
@ -851,6 +863,16 @@
<FileName>Driver_UART.h</FileName> <FileName>Driver_UART.h</FileName>
<FileType>5</FileType> <FileType>5</FileType>
<FilePath>..\driver\Driver_UART.h</FilePath> <FilePath>..\driver\Driver_UART.h</FilePath>
=======
<FileName>Driver_ADC.c</FileName>
<FileType>1</FileType>
<FilePath>..\driver\Driver_ADC.c</FilePath>
</File>
<File>
<FileName>Driver_ADC.h</FileName>
<FileType>5</FileType>
<FilePath>..\driver\Driver_ADC.h</FilePath>
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
</File> </File>
</Files> </Files>
</Group> </Group>

25
projet-voilier/src/main.c
Näytä tiedosto

@ -1,16 +1,28 @@
#include "stm32f10x.h" #include "stm32f10x.h"
#include "Driver_GPIO.h" #include "Driver_GPIO.h"
#include "Driver_Timer.h" #include "Driver_Timer.h"
<<<<<<< HEAD
#include "Driver_UART.h" #include "Driver_UART.h"
=======
#include "Driver_ADC.h"
void toto (void)
{
static uint16_t val;
val = driver_adc_1_read();
}
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
int main() { int main() {
MyGPIO_Struct_TypeDef LED; MyGPIO_Struct_TypeDef LED;
MyGPIO_Struct_TypeDef GPIO_ADC1;
LED.GPIO_Pin = 5; LED.GPIO_Pin = 5;
LED.GPIO_Conf = Out_Ppull; LED.GPIO_Conf = Out_Ppull;
LED.GPIO = GPIOA; LED.GPIO = GPIOA;
MyGPIO_Init(&LED); MyGPIO_Init(&LED);
MyGPIO_Set(LED.GPIO, LED.GPIO_Pin); MyGPIO_Set(LED.GPIO, LED.GPIO_Pin);
<<<<<<< HEAD
MyGPIO_Struct_TypeDef PWM_GPIO; MyGPIO_Struct_TypeDef PWM_GPIO;
PWM_GPIO.GPIO_Pin = 0; PWM_GPIO.GPIO_Pin = 0;
@ -52,4 +64,15 @@ int main() {
int a = MyUART_ReceiveByte(&UART_TEST); int a = MyUART_ReceiveByte(&UART_TEST);
} }
=======
GPIO_ADC1.GPIO_Pin = 1;
GPIO_ADC1.GPIO_Conf = In_Analog;
GPIO_ADC1.GPIO = GPIOC;
MyGPIO_Init(&GPIO_ADC1);
driver_adc_1_init(0x01,&toto);
driver_adc_1_launch_read();
while(1);
>>>>>>> 26e44a6d5ba2eda12f591ccdce71c8c854107110
} }