From 73141578cd17c192a0b40182ee0c59d3d241074f Mon Sep 17 00:00:00 2001 From: Manon Sanchez Date: Wed, 22 Mar 2023 16:34:06 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Librairie=20ADC=20non=20g=C3=A9n=C3=A9rique?= =?UTF-8?q?,=20=C3=A0=20tester?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 30 ++++++ driver/Driver_ADC.c | 39 ++++++++ driver/Driver_ADC.h | 9 ++ projet-voilier/Driver_ADC.c | 40 ++++++++ .../Listings/projet-voilier_reel.map | 92 ++++++++++-------- projet-voilier/Objects/driver_gpio.o | Bin 262236 -> 262236 bytes projet-voilier/Objects/driver_timer.o | Bin 269472 -> 269472 bytes projet-voilier/Objects/main.crf | Bin 238819 -> 238994 bytes projet-voilier/Objects/main.d | 1 + projet-voilier/Objects/main.o | Bin 255424 -> 256400 bytes .../Objects/projet-voilier_reel.axf | Bin 227060 -> 228208 bytes .../Objects/projet-voilier_reel.build_log.htm | 9 +- .../Objects/projet-voilier_reel.dep | 15 ++- .../Objects/projet-voilier_reel.htm | 2 +- .../Objects/projet-voilier_reel.lnp | 1 + projet-voilier/Objects/system_stm32f10x.o | Bin 258696 -> 258696 bytes projet-voilier/projet-voilier.uvguix.sanch | 80 ++++++++++----- projet-voilier/projet-voilier.uvoptx | 26 ++++- projet-voilier/projet-voilier.uvprojx | 20 ++++ projet-voilier/src/main.c | 2 +- 20 files changed, 294 insertions(+), 72 deletions(-) create mode 100644 .gitignore create mode 100644 driver/Driver_ADC.c create mode 100644 driver/Driver_ADC.h create mode 100644 projet-voilier/Driver_ADC.c diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..43314a8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,30 @@ +*.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/ + + + + diff --git a/driver/Driver_ADC.c b/driver/Driver_ADC.c new file mode 100644 index 0000000..d834661 --- /dev/null +++ b/driver/Driver_ADC.c @@ -0,0 +1,39 @@ +#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); +} diff --git a/driver/Driver_ADC.h b/driver/Driver_ADC.h new file mode 100644 index 0000000..3533f1d --- /dev/null +++ b/driver/Driver_ADC.h @@ -0,0 +1,9 @@ +#ifndef DRIVER_ADC_H +#define DRIVER_ADC_H +#include "stm32f10x.h" + +void init_adc1 (void); +void launch_read_adc1 (void); +int read_adc1 (void); + +#endif diff --git a/projet-voilier/Driver_ADC.c b/projet-voilier/Driver_ADC.c new file mode 100644 index 0000000..f9f7bdf --- /dev/null +++ b/projet-voilier/Driver_ADC.c @@ -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); +} diff --git a/projet-voilier/Listings/projet-voilier_reel.map b/projet-voilier/Listings/projet-voilier_reel.map index a7c3353..6ba7406 100644 --- a/projet-voilier/Listings/projet-voilier_reel.map +++ b/projet-voilier/Listings/projet-voilier_reel.map @@ -63,6 +63,12 @@ Removing Unused input sections from the image. 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). Removing startup_stm32f10x_md.o(HEAP), (512 bytes). Removing system_stm32f10x.o(.rev16_text), (4 bytes). Removing system_stm32f10x.o(.revsh_text), (4 bytes). @@ -70,7 +76,7 @@ Removing Unused input sections from the image. Removing system_stm32f10x.o(i.SystemCoreClockUpdate), (164 bytes). Removing system_stm32f10x.o(.data), (20 bytes). -24 unused section(s) (total 1112 bytes) removed from the image. +30 unused section(s) (total 1306 bytes) removed from the image. ============================================================================== @@ -80,23 +86,25 @@ Image Symbol Table Symbol Name Value Ov Type Size Object(Section) - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11a.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 @@ -248,41 +256,41 @@ Memory Map of the image Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x08000000 0x08000000 0x000000ec Data RO 197 RESET startup_stm32f10x_md.o - 0x080000ec 0x080000ec 0x00000000 Code RO 248 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) - 0x080000ec 0x080000ec 0x00000004 Code RO 251 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) - 0x080000f0 0x080000f0 0x00000004 Code RO 254 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 256 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 258 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) - 0x080000f4 0x080000f4 0x00000008 Code RO 259 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) - 0x080000fc 0x080000fc 0x00000004 Code RO 266 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o) - 0x08000100 0x08000100 0x00000000 Code RO 261 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o) - 0x08000100 0x08000100 0x00000000 Code RO 263 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o) - 0x08000100 0x08000100 0x00000004 Code RO 252 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) - 0x08000104 0x08000104 0x00000024 Code RO 198 * .text startup_stm32f10x_md.o - 0x08000128 0x08000128 0x00000024 Code RO 267 .text mc_w.l(init.o) - 0x0800014c 0x0800014c 0x00000004 Code RO 115 i.Bug driver_timer.o - 0x08000150 0x08000150 0x00000108 Code RO 63 i.MyGPIO_Init driver_gpio.o - 0x08000258 0x08000258 0x0000000c Code RO 66 i.MyGPIO_Set driver_gpio.o - 0x08000264 0x08000264 0x00000008 Code RO 205 i.SetSysClock system_stm32f10x.o - 0x0800026c 0x0800026c 0x000000e0 Code RO 206 i.SetSysClockTo72 system_stm32f10x.o - 0x0800034c 0x0800034c 0x00000060 Code RO 208 i.SystemInit system_stm32f10x.o - 0x080003ac 0x080003ac 0x00000020 Code RO 120 i.TIM2_IRQHandler driver_timer.o - 0x080003cc 0x080003cc 0x00000020 Code RO 121 i.TIM3_IRQHandler driver_timer.o - 0x080003ec 0x080003ec 0x00000020 Code RO 122 i.TIM4_IRQHandler driver_timer.o - 0x0800040c 0x0800040c 0x0000000e Code RO 271 i.__scatterload_copy mc_w.l(handlers.o) - 0x0800041a 0x0800041a 0x00000002 Code RO 272 i.__scatterload_null mc_w.l(handlers.o) - 0x0800041c 0x0800041c 0x0000000e Code RO 273 i.__scatterload_zeroinit mc_w.l(handlers.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 269 Region$$Table anon$$obj.o + 0x08000458 0x08000458 0x00000020 Data RO 308 Region$$Table anon$$obj.o Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000478, Size: 0x0000000c, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 0x08000478 0x0000000c Data RW 125 .data driver_timer.o + 0x20000000 0x08000478 0x0000000c Data RW 128 .data driver_timer.o Execution Region ER_ZI (Exec base: 0x2000000c, Load base: 0x08000484, Size: 0x00000404, Max: 0xffffffff, ABSOLUTE) @@ -290,7 +298,7 @@ Memory Map of the image Exec Addr Load Addr Size Type Attr Idx E Section Name Object 0x2000000c 0x08000484 0x00000004 PAD - 0x20000010 - 0x00000400 Zero RW 195 STACK startup_stm32f10x_md.o + 0x20000010 - 0x00000400 Zero RW 234 STACK startup_stm32f10x_md.o ============================================================================== diff --git a/projet-voilier/Objects/driver_gpio.o b/projet-voilier/Objects/driver_gpio.o index a3766e0dc00e1d5435b76be55dc99fbfae591368..1fff219b6cf6e6066276aaf1f2e577ee02985367 100644 GIT binary patch delta 62 zcmcc9AaJKaU_*i+yP1`drIm?sbGl%Ax*#JEGi^^7WG-06W^8I^qH8>T-!5j`$@f`! Rx2x@8KFPHG!#?I5M*x1V6-xjB delta 61 zcmcc9AaJKaU_*i+yNQ*tsg;RQbGl%Ax*#JEGi^^7WG-06YHn(vYdn45E@s=w_gQ$i QtM6ex$+Z3bKIU9U0Br~r4*&oF diff --git a/projet-voilier/Objects/driver_timer.o b/projet-voilier/Objects/driver_timer.o index c6caef13460f4019dcd29edb30995ea6510d1bc3..a01ae9c9fb61338c95403eb0d4b57d6c60960def 100644 GIT binary patch delta 56 zcmZ3mQ((bPfen+S+0CqsEUiq8n`cV5&y;2aVy5jgrJ4O#u^U@jSm+uvO#Z-SIXRw5 LV7tXJ=8P}^9itLW delta 56 zcmZ3mQ((bPfen+S*-fmBO|49fnrBM4&y;2aVy5jgrJ4O#u^U<>C+iwBO#Z-SIXRw5 LV7tXJ=8P}^BA61I diff --git a/projet-voilier/Objects/main.crf b/projet-voilier/Objects/main.crf index 5599ca6ca397aeb671b95b97e22272bf16c136fc..d0ee2156980b97bc9b198c33c9c569265825be51 100644 GIT binary patch delta 465 zcmYL`&nrYx6vxlGZ{Ez@x!3qLGPB{u4n0?v7MhGg7MjAsXqsloh$-X8LKZiQvXB{z zSCZ6}t*l3Vk z>1+g2tLw2;HoY*GjYXUi4@bK63AjIb+;f8+PdBxIY&M&WO()VBJqg!;6W5BStZ53G znnI!*qct!9fBae<05hK>9|4v7B!JmFDTV$KqB`@ zd^LgvrA6gb;;PYGP;`|ui9utjpmeC5ODs2z3(Du94~_*xiHvCTmIqD*Qzh=%bSjuz o;;v0+g4qXmEH|7Bu4-Ra5H18SxuE378gtq1>>Mt->=#1AH$+K!2mk;8 delta 308 zcmbPqn(y&RKAsz#3=B++4BUGS7*r-tU{v0ye}hR}|gjhQK^Pl1;~K#rA>fq@mIj=}mC9|MPs5+ei09s?F1R~H7B?P8Od z{)n)0b2TtJZ5Ln8l;#L#2XAkB!6e8IX78Fl<2{ohn5n(}+2nq{>#%ZjHZZnNKf9P&kCmIdfl+eW5@u^wZk`54f$0uQnEz_AG3+tmW>sLm dEy1wYfE!{mClkmzZWf@8K$LWY1sF;UN&pp_N*DkD diff --git a/projet-voilier/Objects/main.d b/projet-voilier/Objects/main.d index 7977765..d47aea8 100644 --- a/projet-voilier/Objects/main.d +++ b/projet-voilier/Objects/main.d @@ -9,3 +9,4 @@ .\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 diff --git a/projet-voilier/Objects/main.o b/projet-voilier/Objects/main.o index 80c23c6885578b721f8e49fc53cef8525105a95e..51e1e0a1f19ffefd91d0a61c93004711f6c8afff 100644 GIT binary patch delta 8942 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 YJ8%5wjXWi1nxCM_S1QrgQBLfC0q_m`mjD0& delta 8402 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 Sv^*7PO@DtwJA=YDv;P5kg@xe& diff --git a/projet-voilier/Objects/projet-voilier_reel.axf b/projet-voilier/Objects/projet-voilier_reel.axf index db47f2aa7af78f49796f4391ed0fd176dc017eb1..cae373032d9a49e96d1724771107bc6787bd15fb 100644 GIT binary patch delta 2376 zcma*oPiPc(6bJC%%-gJ+kkusWHkydC)ff?j;x;60peYFjsR~VrZp>nkT?1>9Qd3;E z2OScyRA__2!?e+ZM+;UwD1!-zWDsE_@A6*($^ZXz!?72pmL!BQ`p`4-YOBsAupH{6Od5 z!8@tcfeP5%RpH_RqcA2{96)^~@{8-8T)tg5zykdh^>72MsOVwC77~j)$mK_opTmH~ zdYP9#jr#fG1f7p`C>vZd8+@dGO6PgWd`o0|=~>jH%-}w}=PH-yL)2&-qLzgMKi>gY22^M%TJZ$p@M@Un#U6s|jr^}h`zkw^U&Z%EU+m2= zA7G^%oNffZEEM?nu-dj%XQ9B~B6b)2Qs1*0xJNh%=ZyRj_>JK);fbO#zTyu5E(WwO z!S9U@?!cD5XI%eS_&HpLJkL0a{C_YWZGVT@fik6*8IHi!u)|x(1&s(SHws$em4T9bjp5(mwJ?VB$D1hFDFrTwg6qOF!t=u6;Nk%qgufP!`*s#)bXXLO z3cJGRgs%wS7M>A)#deG>$%}%TC5u2^TPiM-xGc+ z{9d>!gy+wkKoqCJbWHeL;a=e*!Y75#!ke(;^*Dt56kQ16`QreeN)Alo*De@OkMEoC z_wZ}&X&B#!P^I<^*W+WfTYDD%2VSlH7M_A5+QD+XM+`?C1j72w#S_>B*XcJKyA57r z?I2?yTyvQsy2xkqCz_`}&f~sv>oq+MXehqhGG)~zvjx}R=%eb^S%SAq&uFZHh1kIx=gGCKhZ|o)|&K-{Rr~E znDt9j6mf?JX-OICn^Nw`04?{%2C3Kb%U=yqgfK_1{6{)w+p%W%Za>}hb|0nz+w*>= z6L$H<3VcwoC41c+8LBJ$vzyd8H=Uu+?e;!*EJF>!L?5X~weHmnMeSJDeUhQb2lF!s AFaQ7m delta 2265 zcmb8xT}V@57zgn8oOiBiTW7;cG*$Sgreu04%QWqI0DGFhknWP3$1}nouphN^A z8LUr`pqs2qJ<&xsNl75xhO3|XFJ1BO0o$n&+Pp$Xv?A|M<>Nc;t1T&^E@lR^`FVTUGMyKEnb$0-LT zi)*dSci?lna8aD0L|$Ip-{1T`3F zn78lQRyf2Qh8LB14ZNbbg}IaY8goDVm+CRTpaCDFL9_1}`33VEI1O>SsRrT`um`3c zB2U4YisxXT;-7Gq;`B5ja$qyjfgcUql!PF>U2!E`p!gVEsJIE<0b@R~33W2}G2e^Z zOcso=gmLB>=2hlQ=lTf*nGZ47$84r%+`$qe%(s~zF^@36W&XtcnT+R8atBsef@{russI9g7a;^hbQ4& z+tcv8;yKu3Ke%WDzu*GG&8a2}N)TTx@q3gqvUxPcltZ!4buEFs=Zt$fxU~ z8OHxfx56k+`U32AhyWG&bSa__8szfOa9Q3^bycqQy-}99^>BGK&>_dInKoH1WqIj7 zYiEaaN~^e2hBU|iing{W8a`Tu-SUV&GW*-@y@Dd|tck0#OSeiR@|GSN z%)ql9qcz|~v&4@L5y4A&WQ$0H6p`qc>#|5+Xo+U@%3`Pcv=lG1qh-C)$a{T7iYF*Z JT!~)<{{T@m+ynps diff --git a/projet-voilier/Objects/projet-voilier_reel.build_log.htm b/projet-voilier/Objects/projet-voilier_reel.build_log.htm index 4974b2b..61c9650 100644 --- a/projet-voilier/Objects/projet-voilier_reel.build_log.htm +++ b/projet-voilier/Objects/projet-voilier_reel.build_log.htm @@ -28,9 +28,10 @@ Project File Date: 03/22/2023 *** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin' Rebuild target 'reel' assembling startup_stm32f10x_md.s... -compiling main.c... -compiling Driver_GPIO.c... +compiling Driver_ADC.c... compiling system_stm32f10x.c... +compiling Driver_GPIO.c... +compiling main.c... compiling Driver_Timer.c... linking... Program Size: Code=876 RO-data=268 RW-data=12 ZI-data=1028 @@ -61,10 +62,10 @@ Package Vendor: Keil * Component: ARM::CMSIS:CORE:5.4.0 * Component: Keil::Device:Startup:1.0.0 - Source file: Device\Source\ARM\startup_stm32f10x_md.s - Source file: Device\Source\ARM\STM32F1xx_OPT.s 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 diff --git a/projet-voilier/Objects/projet-voilier_reel.dep b/projet-voilier/Objects/projet-voilier_reel.dep index 77c8b18..e1a6e3c 100644 --- a/projet-voilier/Objects/projet-voilier_reel.dep +++ b/projet-voilier/Objects/projet-voilier_reel.dep @@ -1,6 +1,6 @@ Dependencies for Project 'projet-voilier', Target 'reel': (DO NOT MODIFY !) CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC -F (.\src\main.c)(0x641B042E)(-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) +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) @@ -11,6 +11,7 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc. 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) @@ -35,6 +36,18 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc. 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) diff --git a/projet-voilier/Objects/projet-voilier_reel.htm b/projet-voilier/Objects/projet-voilier_reel.htm index 1fc49f7..4db081e 100644 --- a/projet-voilier/Objects/projet-voilier_reel.htm +++ b/projet-voilier/Objects/projet-voilier_reel.htm @@ -3,7 +3,7 @@ Static Call Graph - [.\Objects\projet-voilier_reel.axf]

Static Call Graph for image .\Objects\projet-voilier_reel.axf

-

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Wed Mar 22 14:35:43 2023 +

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Wed Mar 22 16:29:44 2023

Maximum Stack Usage = 28 bytes + Unknown(Cycles, Untraceable Function Pointers)

Call chain for Maximum Stack Depth:

diff --git a/projet-voilier/Objects/projet-voilier_reel.lnp b/projet-voilier/Objects/projet-voilier_reel.lnp index 3a8f344..ce4053c 100644 --- a/projet-voilier/Objects/projet-voilier_reel.lnp +++ b/projet-voilier/Objects/projet-voilier_reel.lnp @@ -2,6 +2,7 @@ ".\objects\main.o" ".\objects\driver_gpio.o" ".\objects\driver_timer.o" +".\objects\driver_adc.o" ".\objects\startup_stm32f10x_md.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 diff --git a/projet-voilier/Objects/system_stm32f10x.o b/projet-voilier/Objects/system_stm32f10x.o index 9b0bbd74d639960ed96aaafde1f884a60ea7e866..9a0669a4f4406fb894fc0c2cafc5d66a05933e06 100644 GIT binary patch delta 50 zcmeBp%HQ#ne?yWGyP1`drIm?sbEZ&xrVt|#Gi}clV!phH*~H9XyTevy8|LlRJD7Q` E0IFRO4gdfE delta 51 zcmeBp%HQ#ne?yWGyNQ*tsg;RQbEZ&xrVt|#Gi}clV!phH#n?F2V!QoTW*g@1H9MGj FtN^<05ODwi diff --git a/projet-voilier/projet-voilier.uvguix.sanch b/projet-voilier/projet-voilier.uvguix.sanch index 471a3ad..6693679 100644 --- a/projet-voilier/projet-voilier.uvguix.sanch +++ b/projet-voilier/projet-voilier.uvguix.sanch @@ -15,17 +15,17 @@ 38003 Registers - 186 185 + 185 186 346 Code Coverage - 1010 515 + 1010 160 204 Performance Analyzer - 352 175 175 823 + 1170 @@ -34,7 +34,7 @@ 35141 Event Statistics - 250 50 874 + 200 50 700 1506 @@ -110,8 +110,8 @@ 0 - 805 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000006000000000000000100000047553A5C446F63756D656E74735C6D6963726F636F6E74726F6C6575725C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C7372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF42553A5C446F63756D656E74735C6D6963726F636F6E74726F6C6575725C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E6300000000FFDC7800FFFFFFFF42553A5C446F63756D656E74735C6D6963726F636F6E74726F6C6575725C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F4750494F2E68000000000D4472697665725F4750494F2E6800000000BECEA100FFFFFFFF43553A5C446F63756D656E74735C6D6963726F636F6E74726F6C6575725C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F54696D65722E63000000000E4472697665725F54696D65722E6300000000F0A0A100FFFFFFFF43553A5C446F63756D656E74735C6D6963726F636F6E74726F6C6575725C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F54696D65722E68000000000E4472697665725F54696D65722E6800000000BCA8E100FFFFFFFF6A553A5C446F63756D656E74735C6D6963726F636F6E74726F6C6575725C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E73000000009CC1B600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000081010000660000008007000094030000 + 1231 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000A000000090000000100000047553A5C446F63756D656E74735C6D6963726F636F6E74726F6C6575725C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C7372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF42553A5C446F63756D656E74735C6D6963726F636F6E74726F6C6575725C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E6300000000FFDC7800FFFFFFFF42553A5C446F63756D656E74735C6D6963726F636F6E74726F6C6575725C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F4750494F2E68000000000D4472697665725F4750494F2E6800000000BECEA100FFFFFFFF43553A5C446F63756D656E74735C6D6963726F636F6E74726F6C6575725C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F54696D65722E63000000000E4472697665725F54696D65722E6300000000F0A0A100FFFFFFFF43553A5C446F63756D656E74735C6D6963726F636F6E74726F6C6575725C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F54696D65722E68000000000E4472697665725F54696D65722E6800000000BCA8E100FFFFFFFF6A553A5C446F63756D656E74735C6D6963726F636F6E74726F6C6575725C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E73000000009CC1B600FFFFFFFF60553A5C446F63756D656E74735C6D6963726F636F6E74726F6C6575725C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C5254455C4465766963655C53544D33324631303352425C5254455F4465766963652E68000000000C5254455F4465766963652E6800000000F7B88600FFFFFFFF51433A5C50726F6772616D646174615C4B65696C5C41726D5C5061636B735C4B65696C5C53544D3332463178785F4446505C322E332E305C4465766963655C496E636C7564655C73746D3332663130782E68000000000B73746D3332663130782E6800000000D9ADC200FFFFFFFF41553A5C446F63756D656E74735C6D6963726F636F6E74726F6C6575725C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F4144432E63000000000C4472697665725F4144432E6300000000A5C2D700FFFFFFFF41553A5C446F63756D656E74735C6D6963726F636F6E74726F6C6575725C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F4144432E68000000000C4472697665725F4144432E6800000000B3A6BE00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000081010000660000008007000094030000 @@ -1805,8 +1805,8 @@ 59392 File - 2561 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000006434B5F494E549600000000000000020006434B5F494E5402434B0000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2585 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000005454F4349459600000000000000030005454F434945106C61756E63685F726561645F616463310753575354415254000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 976 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205001000000047265656C960000000000000002000373696D047265656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205001000000047265656C960000000000000002000373696D047265656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3547,7 +3547,7 @@ File 2561 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000006434B5F494E549600000000000000020006434B5F494E5402434B0000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000006434B5F494E549600000000000000020006434B5F494E5402434B0000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3563,7 +3563,7 @@ Build 976 - 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000004001D000000000000000000000000000000000100000001000000018030800000000004001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000004006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000040000000000000000000000000000000000000100000001000000960000000300205001000000047265656C960000000000000002000373696D047265656C00000000000000000180EB880000000004002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000400230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000004001D000000000000000000000000000000000100000001000000018030800000000004001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000004006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000040000000000000000000000000000000000000100000001000000960000000300205001000000047265656C960000000000000002000373696D047265656C00000000000000000180EB880000000004002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000400230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3579,7 +3579,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3603,30 +3603,30 @@ 0 100 - 0 + 9 .\src\main.c - 19 + 23 1 - 10 + 4 1 0 ..\driver\Driver_GPIO.c - 0 + 7 1 - 1 + 11 1 0 ..\driver\Driver_GPIO.h - 15 + 0 1 - 22 + 1 1 0 @@ -3643,6 +3643,24 @@ ..\driver\Driver_Timer.h 0 + 4 + 49 + 1 + + 0 + + + RTE\Device\STM32F103RB\startup_stm32f10x_md.s + 35 + 134 + 135 + 1 + + 0 + + + RTE\Device\STM32F103RB\RTE_Device.h + 0 1 1 1 @@ -3650,10 +3668,28 @@ 0 - RTE\Device\STM32F103RB\startup_stm32f10x_md.s + C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h + 12 + 1412 + 1420 + 1 + + 0 + + + ..\driver\Driver_ADC.c + 1 + 1 + 34 + 1 + + 0 + + + ..\driver\Driver_ADC.h 0 - 122 - 133 + 1 + 10 1 0 diff --git a/projet-voilier/projet-voilier.uvoptx b/projet-voilier/projet-voilier.uvoptx index a53b4a5..dbd50ad 100644 --- a/projet-voilier/projet-voilier.uvoptx +++ b/projet-voilier/projet-voilier.uvoptx @@ -430,6 +430,30 @@ 0 0 + + 2 + 6 + 1 + 0 + 0 + 0 + ..\driver\Driver_ADC.c + Driver_ADC.c + 0 + 0 + + + 2 + 7 + 5 + 0 + 0 + 0 + ..\driver\Driver_ADC.h + Driver_ADC.h + 0 + 0 + @@ -442,7 +466,7 @@ ::Device - 0 + 1 0 0 1 diff --git a/projet-voilier/projet-voilier.uvprojx b/projet-voilier/projet-voilier.uvprojx index 779466c..9468547 100644 --- a/projet-voilier/projet-voilier.uvprojx +++ b/projet-voilier/projet-voilier.uvprojx @@ -413,6 +413,16 @@ 5 ..\driver\Driver_Timer.h + + Driver_ADC.c + 1 + ..\driver\Driver_ADC.c + + + Driver_ADC.h + 5 + ..\driver\Driver_ADC.h + @@ -830,6 +840,16 @@ 5 ..\driver\Driver_Timer.h + + Driver_ADC.c + 1 + ..\driver\Driver_ADC.c + + + Driver_ADC.h + 5 + ..\driver\Driver_ADC.h + diff --git a/projet-voilier/src/main.c b/projet-voilier/src/main.c index 5ef8425..098ca35 100644 --- a/projet-voilier/src/main.c +++ b/projet-voilier/src/main.c @@ -1,7 +1,7 @@ #include "stm32f10x.h" #include "Driver_GPIO.h" #include "Driver_Timer.h" - +#include "Driver_ADC.h" int main() { MyGPIO_Struct_TypeDef LED; From 26e44a6d5ba2eda12f591ccdce71c8c854107110 Mon Sep 17 00:00:00 2001 From: Manon Sanchez Date: Mon, 27 Mar 2023 16:39:42 +0200 Subject: [PATCH 2/2] Validation du fonctionnement de l'ADC1 --- .gitignore | 1 - driver/Driver_ADC.c | 48 +++++++-- driver/Driver_ADC.h | 6 +- projet-voilier/projet-voilier.uvoptx | 145 +++++++++++++++++++++++++-- projet-voilier/src/main.c | 18 +++- 5 files changed, 194 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 43314a8..f77ef35 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,3 @@ - diff --git a/driver/Driver_ADC.c b/driver/Driver_ADC.c index d834661..c1c0829 100644 --- a/driver/Driver_ADC.c +++ b/driver/Driver_ADC.c @@ -1,16 +1,34 @@ -#include "Driver_ADC.h" #include "stm32f10x.h" #include "stdio.h" - -void init_adc1 (void) +#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; - //On règle la fréquence à 12Mhz - RCC->CFGR |= RCC_CFGR_ADCPRE_DIV6; - //Activation de l'ADC + //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; @@ -22,18 +40,28 @@ void init_adc1 (void) 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 launch_read_adc1 (void) +void driver_adc_1_launch_read (void) { //Lancement de la conversion ADC1->CR2 |= ADC_CR2_SWSTART; } -int read_adc1 (void) +uint16_t driver_adc_1_read (void) { - //On abaisse le flag pour la prochaine lecture - ADC1->SR &= ~ADC_SR_EOC; //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)(); +} diff --git a/driver/Driver_ADC.h b/driver/Driver_ADC.h index 3533f1d..f1b80d0 100644 --- a/driver/Driver_ADC.h +++ b/driver/Driver_ADC.h @@ -2,8 +2,8 @@ #define DRIVER_ADC_H #include "stm32f10x.h" -void init_adc1 (void); -void launch_read_adc1 (void); -int read_adc1 (void); +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 diff --git a/projet-voilier/projet-voilier.uvoptx b/projet-voilier/projet-voilier.uvoptx index dbd50ad..69fe4d7 100644 --- a/projet-voilier/projet-voilier.uvoptx +++ b/projet-voilier/projet-voilier.uvoptx @@ -26,7 +26,7 @@ 0x4 ARM-ADS - 12000000 + 8000000 1 1 @@ -79,8 +79,8 @@ 18 - 0 - 1 + 1 + 0 1 1 1 @@ -117,25 +117,96 @@ BIN\UL2CM3.DLL + + 0 + ARMRTXEVENTFLAGS + -L70 -Z18 -C0 -M0 -T1 + + + 0 + DLGDARM + (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) + + + 0 + ARMDBGFLAGS + -T0 + 0 UL2CM3 UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)) - + + + 0 + 0 + 23 + 1 +
134219356
+ 0 + 0 + 0 + 0 + 0 + 1 + .\src\main.c + + \\projet_voilier\src/main.c\23 + + + 1 + 0 + 9 + 1 +
134219402
+ 0 + 0 + 0 + 0 + 0 + 1 + .\src\main.c + + \\projet_voilier\src/main.c\9 + + + 2 + 0 + 62 + 1 +
134218310
+ 0 + 0 + 0 + 0 + 0 + 1 + ..\driver\Driver_ADC.c + + \\projet_voilier\../driver/Driver_ADC.c\62 + + + + + 0 + 1 + val + + 0 0 1 - 0 + 1 0 0 0 0 - 0 + 1 0 0 0 @@ -181,7 +252,7 @@ 0x4 ARM-ADS - 12000000 + 8000000 1 1 @@ -280,7 +351,7 @@ 0 DLGTARM - (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=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0) + (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) 0 @@ -303,7 +374,63 @@ UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)) - + + + 0 + 0 + 62 + 1 +
134218062
+ 0 + 0 + 0 + 0 + 0 + 1 + ..\driver\Driver_ADC.c + + \\projet_voilier_reel\../driver/Driver_ADC.c\62 + + + 1 + 0 + 27 + 1 +
134219156
+ 0 + 0 + 0 + 0 + 0 + 1 + .\src\main.c + + \\projet_voilier_reel\src/main.c\27 + + + 2 + 0 + 64 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\driver\Driver_ADC.c + + + + + + + 0 + 1 + val + + 0 diff --git a/projet-voilier/src/main.c b/projet-voilier/src/main.c index 098ca35..3e66617 100644 --- a/projet-voilier/src/main.c +++ b/projet-voilier/src/main.c @@ -2,13 +2,29 @@ #include "Driver_GPIO.h" #include "Driver_Timer.h" #include "Driver_ADC.h" -int main() { +void toto (void) +{ + static uint16_t val; + val = driver_adc_1_read(); +} + +int main() { MyGPIO_Struct_TypeDef LED; + MyGPIO_Struct_TypeDef GPIO_ADC1; + LED.GPIO_Pin = 5; LED.GPIO_Conf = Out_Ppull; LED.GPIO = GPIOA; MyGPIO_Init(&LED); MyGPIO_Set(LED.GPIO, LED.GPIO_Pin); + + 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); }