From 3ed3a68f15afb7ee2f3519b103cd6f6e495b3af2 Mon Sep 17 00:00:00 2001 From: Robin M Date: Thu, 30 Mar 2023 20:13:42 +0200 Subject: [PATCH] Modified Driver_Timer to allow generic PWM configuration --- driver/Driver_Timer.c | 39 +++++++- driver/Driver_Timer.h | 2 +- .../Listings/projet-voilier_reel.map | 94 +++++++++--------- projet-voilier/Objects/driver_timer.o | Bin 13308 -> 13916 bytes projet-voilier/Objects/main.o | Bin 4424 -> 4424 bytes .../Objects/projet-voilier_reel.axf | Bin 22204 -> 22772 bytes .../Objects/projet-voilier_reel.build_log.htm | 4 +- .../Objects/projet-voilier_reel.dep | 10 +- .../Objects/projet-voilier_reel.htm | 4 +- projet-voilier/projet-voilier.uvguix.robin | 26 ++--- projet-voilier/projet-voilier.uvoptx | 2 +- projet-voilier/src/main.c | 12 +-- 12 files changed, 110 insertions(+), 83 deletions(-) diff --git a/driver/Driver_Timer.c b/driver/Driver_Timer.c index 607ffc5..b75e1b2 100644 --- a/driver/Driver_Timer.c +++ b/driver/Driver_Timer.c @@ -37,10 +37,41 @@ void MyTimer_Stop(MyTimer_Struct_TypeDef * Timer) Timer->Timer->CR1 &= ~TIM_CR1_CEN; } -void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint16_t duty_cycle) { - Timer->Timer->CCMR1 |= 0x6 << 0xC; - Timer->Timer->CCR2 = (duty_cycle * Timer->ARR) / 100; - Timer->Timer->CCER |= TIM_CCER_CC2E; +// Note : PWM Tested on PA0 +void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint8_t channel, uint16_t duty_cycle) { + + uint16_t CCR_Value = (duty_cycle * TIM2->ARR) / 100; + + // Configurer le Timer en mode PWM + + + // Configurer le Channel + if (channel == 1) { + Timer->Timer->CCMR1 = TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC1M_1; + Timer->Timer->CCMR1 |= TIM_CCMR1_OC1PE; // activer la précharge du registre de comparaison + Timer->Timer->CCER |= TIM_CCER_CC1E; + Timer->Timer->CCR1 = CCR_Value; + } else if (channel == 2) { + Timer->Timer->CCMR1 = TIM_CCMR1_OC2M_2 | TIM_CCMR1_OC2M_1; + Timer->Timer->CCMR1 |= TIM_CCMR1_OC2PE; // activer la précharge du registre de comparaison + Timer->Timer->CCER |= TIM_CCER_CC2E; + Timer->Timer->CCR2 = CCR_Value; + } else if (channel == 3) { + Timer->Timer->CCMR2 = TIM_CCMR2_OC3M_2 | TIM_CCMR2_OC3M_1; + Timer->Timer->CCMR2 |= TIM_CCMR2_OC3PE; // activer la précharge du registre de comparaison + Timer->Timer->CCER |= TIM_CCER_CC3E; + Timer->Timer->CCER &= ~TIM_CCER_CC3P; + Timer->Timer->CCR3 = CCR_Value; + } else if (channel == 4) { + Timer->Timer->CCMR2 = TIM_CCMR2_OC4M_2 | TIM_CCMR2_OC4M_1; + Timer->Timer->CCMR2 |= TIM_CCMR2_OC4PE; // activer la précharge du registre de comparaison + Timer->Timer->CCER |= TIM_CCER_CC4E; + Timer->Timer->CCR4 = CCR_Value; + } + + + + } void Bug (void) diff --git a/driver/Driver_Timer.h b/driver/Driver_Timer.h index f5aa844..95e4ccd 100644 --- a/driver/Driver_Timer.h +++ b/driver/Driver_Timer.h @@ -46,6 +46,6 @@ void MyTimer_ActiveIT (TIM_TypeDef * Timer, char Prio, void (*IT_function)(void) */ void MyTimer_PWM(TIM_TypeDef * Timer, char Channel); -void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint16_t duty_cycle); +void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint8_t pwm_channel, uint16_t duty_cycle); #endif diff --git a/projet-voilier/Listings/projet-voilier_reel.map b/projet-voilier/Listings/projet-voilier_reel.map index 0bf62bb..c75aab4 100644 --- a/projet-voilier/Listings/projet-voilier_reel.map +++ b/projet-voilier/Listings/projet-voilier_reel.map @@ -148,15 +148,15 @@ Image Symbol Table [Anonymous Symbol] 0x080001e8 Section 0 driver_gpio.o(.text.MyGPIO_Set) [Anonymous Symbol] 0x080001f8 Section 0 driver_timer.o(.text.MyTimer_Base_Init) [Anonymous Symbol] 0x08000284 Section 0 driver_timer.o(.text.MyTimer_ConfigurePWM) - [Anonymous Symbol] 0x080002ac Section 0 driver_timer.o(.text.MyTimer_Start) - [Anonymous Symbol] 0x080002b8 Section 0 system_stm32f10x.o(.text.SystemInit) - [Anonymous Symbol] 0x080003c8 Section 0 driver_timer.o(.text.TIM2_IRQHandler) - [Anonymous Symbol] 0x080003e4 Section 0 driver_timer.o(.text.TIM3_IRQHandler) - [Anonymous Symbol] 0x08000400 Section 0 driver_timer.o(.text.TIM4_IRQHandler) - [Anonymous Symbol] 0x0800041c Section 0 main.o(.text.main) - i.__scatterload_copy 0x0800047a Section 14 handlers.o(i.__scatterload_copy) - i.__scatterload_null 0x08000488 Section 2 handlers.o(i.__scatterload_null) - i.__scatterload_zeroinit 0x0800048a Section 14 handlers.o(i.__scatterload_zeroinit) + [Anonymous Symbol] 0x0800032c Section 0 driver_timer.o(.text.MyTimer_Start) + [Anonymous Symbol] 0x08000338 Section 0 system_stm32f10x.o(.text.SystemInit) + [Anonymous Symbol] 0x08000448 Section 0 driver_timer.o(.text.TIM2_IRQHandler) + [Anonymous Symbol] 0x08000464 Section 0 driver_timer.o(.text.TIM3_IRQHandler) + [Anonymous Symbol] 0x08000480 Section 0 driver_timer.o(.text.TIM4_IRQHandler) + [Anonymous Symbol] 0x0800049c Section 0 main.o(.text.main) + i.__scatterload_copy 0x080004fa Section 14 handlers.o(i.__scatterload_copy) + i.__scatterload_null 0x08000508 Section 2 handlers.o(i.__scatterload_null) + i.__scatterload_zeroinit 0x0800050a Section 14 handlers.o(i.__scatterload_zeroinit) STACK 0x20000010 Section 1024 startup_stm32f10x_md.o(STACK) Global Symbols @@ -237,18 +237,18 @@ Image Symbol Table MyGPIO_Init 0x0800014d Thumb Code 140 driver_gpio.o(.text.MyGPIO_Init) MyGPIO_Set 0x080001e9 Thumb Code 14 driver_gpio.o(.text.MyGPIO_Set) MyTimer_Base_Init 0x080001f9 Thumb Code 140 driver_timer.o(.text.MyTimer_Base_Init) - MyTimer_ConfigurePWM 0x08000285 Thumb Code 40 driver_timer.o(.text.MyTimer_ConfigurePWM) - MyTimer_Start 0x080002ad Thumb Code 12 driver_timer.o(.text.MyTimer_Start) - SystemInit 0x080002b9 Thumb Code 272 system_stm32f10x.o(.text.SystemInit) - TIM2_IRQHandler 0x080003c9 Thumb Code 26 driver_timer.o(.text.TIM2_IRQHandler) - TIM3_IRQHandler 0x080003e5 Thumb Code 28 driver_timer.o(.text.TIM3_IRQHandler) - TIM4_IRQHandler 0x08000401 Thumb Code 28 driver_timer.o(.text.TIM4_IRQHandler) - main 0x0800041d Thumb Code 94 main.o(.text.main) - __scatterload_copy 0x0800047b Thumb Code 14 handlers.o(i.__scatterload_copy) - __scatterload_null 0x08000489 Thumb Code 2 handlers.o(i.__scatterload_null) - __scatterload_zeroinit 0x0800048b Thumb Code 14 handlers.o(i.__scatterload_zeroinit) - Region$$Table$$Base 0x08000498 Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x080004b8 Number 0 anon$$obj.o(Region$$Table) + MyTimer_ConfigurePWM 0x08000285 Thumb Code 168 driver_timer.o(.text.MyTimer_ConfigurePWM) + MyTimer_Start 0x0800032d Thumb Code 12 driver_timer.o(.text.MyTimer_Start) + SystemInit 0x08000339 Thumb Code 272 system_stm32f10x.o(.text.SystemInit) + TIM2_IRQHandler 0x08000449 Thumb Code 26 driver_timer.o(.text.TIM2_IRQHandler) + TIM3_IRQHandler 0x08000465 Thumb Code 28 driver_timer.o(.text.TIM3_IRQHandler) + TIM4_IRQHandler 0x08000481 Thumb Code 28 driver_timer.o(.text.TIM4_IRQHandler) + main 0x0800049d Thumb Code 94 main.o(.text.main) + __scatterload_copy 0x080004fb Thumb Code 14 handlers.o(i.__scatterload_copy) + __scatterload_null 0x08000509 Thumb Code 2 handlers.o(i.__scatterload_null) + __scatterload_zeroinit 0x0800050b Thumb Code 14 handlers.o(i.__scatterload_zeroinit) + Region$$Table$$Base 0x08000518 Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x08000538 Number 0 anon$$obj.o(Region$$Table) TIM2_fx 0x20000000 Data 4 driver_timer.o(.data.TIM2_fx) TIM3_fx 0x20000004 Data 4 driver_timer.o(.data.TIM3_fx) TIM4_fx 0x20000008 Data 4 driver_timer.o(.data.TIM4_fx) @@ -262,9 +262,9 @@ Memory Map of the image Image Entry point : 0x08000101 - Load Region LR_1 (Base: 0x08000000, Size: 0x000004c4, Max: 0xffffffff, ABSOLUTE) + Load Region LR_1 (Base: 0x08000000, Size: 0x00000544, Max: 0xffffffff, ABSOLUTE) - Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000004b8, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000538, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -286,30 +286,30 @@ Memory Map of the image 0x080001e8 0x080001e8 0x0000000e Code RO 15 .text.MyGPIO_Set driver_gpio.o 0x080001f6 0x080001f6 0x00000002 PAD 0x080001f8 0x080001f8 0x0000008c Code RO 29 .text.MyTimer_Base_Init driver_timer.o - 0x08000284 0x08000284 0x00000028 Code RO 35 .text.MyTimer_ConfigurePWM driver_timer.o - 0x080002ac 0x080002ac 0x0000000c Code RO 31 .text.MyTimer_Start driver_timer.o - 0x080002b8 0x080002b8 0x00000110 Code RO 68 .text.SystemInit system_stm32f10x.o - 0x080003c8 0x080003c8 0x0000001a Code RO 41 .text.TIM2_IRQHandler driver_timer.o - 0x080003e2 0x080003e2 0x00000002 PAD - 0x080003e4 0x080003e4 0x0000001c Code RO 43 .text.TIM3_IRQHandler driver_timer.o - 0x08000400 0x08000400 0x0000001c Code RO 45 .text.TIM4_IRQHandler driver_timer.o - 0x0800041c 0x0800041c 0x0000005e Code RO 2 .text.main main.o - 0x0800047a 0x0800047a 0x0000000e Code RO 102 i.__scatterload_copy mc_w.l(handlers.o) - 0x08000488 0x08000488 0x00000002 Code RO 103 i.__scatterload_null mc_w.l(handlers.o) - 0x0800048a 0x0800048a 0x0000000e Code RO 104 i.__scatterload_zeroinit mc_w.l(handlers.o) - 0x08000498 0x08000498 0x00000020 Data RO 101 Region$$Table anon$$obj.o + 0x08000284 0x08000284 0x000000a8 Code RO 35 .text.MyTimer_ConfigurePWM driver_timer.o + 0x0800032c 0x0800032c 0x0000000c Code RO 31 .text.MyTimer_Start driver_timer.o + 0x08000338 0x08000338 0x00000110 Code RO 68 .text.SystemInit system_stm32f10x.o + 0x08000448 0x08000448 0x0000001a Code RO 41 .text.TIM2_IRQHandler driver_timer.o + 0x08000462 0x08000462 0x00000002 PAD + 0x08000464 0x08000464 0x0000001c Code RO 43 .text.TIM3_IRQHandler driver_timer.o + 0x08000480 0x08000480 0x0000001c Code RO 45 .text.TIM4_IRQHandler driver_timer.o + 0x0800049c 0x0800049c 0x0000005e Code RO 2 .text.main main.o + 0x080004fa 0x080004fa 0x0000000e Code RO 102 i.__scatterload_copy mc_w.l(handlers.o) + 0x08000508 0x08000508 0x00000002 Code RO 103 i.__scatterload_null mc_w.l(handlers.o) + 0x0800050a 0x0800050a 0x0000000e Code RO 104 i.__scatterload_zeroinit mc_w.l(handlers.o) + 0x08000518 0x08000518 0x00000020 Data RO 101 Region$$Table anon$$obj.o - Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x080004b8, Size: 0x0000000c, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000538, Size: 0x0000000c, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 0x080004b8 0x00000004 Data RW 47 .data.TIM2_fx driver_timer.o - 0x20000004 0x080004bc 0x00000004 Data RW 48 .data.TIM3_fx driver_timer.o - 0x20000008 0x080004c0 0x00000004 Data RW 49 .data.TIM4_fx driver_timer.o + 0x20000000 0x08000538 0x00000004 Data RW 47 .data.TIM2_fx driver_timer.o + 0x20000004 0x0800053c 0x00000004 Data RW 48 .data.TIM3_fx driver_timer.o + 0x20000008 0x08000540 0x00000004 Data RW 49 .data.TIM4_fx driver_timer.o - Execution Region ER_ZI (Exec base: 0x20000010, Load base: 0x080004c4, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_ZI (Exec base: 0x20000010, Load base: 0x08000544, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -324,13 +324,13 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name 170 16 0 0 0 2108 driver_gpio.o - 276 0 0 12 0 6396 driver_timer.o + 404 4 0 12 0 6789 driver_timer.o 94 0 0 0 0 2087 main.o 36 8 236 0 1024 860 startup_stm32f10x_md.o 272 0 0 0 0 2813 system_stm32f10x.o ---------------------------------------------------------------------- - 854 24 268 12 1024 14264 Object Totals + 982 28 268 12 1024 14657 Object Totals 0 0 32 0 0 0 (incl. Generated) 6 0 0 0 0 0 (incl. Padding) @@ -369,15 +369,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 940 40 268 12 1024 14424 Grand Totals - 940 40 268 12 1024 14424 ELF Image Totals - 940 40 268 12 0 0 ROM Totals + 1068 44 268 12 1024 14817 Grand Totals + 1068 44 268 12 1024 14817 ELF Image Totals + 1068 44 268 12 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 1208 ( 1.18kB) + Total RO Size (Code + RO Data) 1336 ( 1.30kB) Total RW Size (RW Data + ZI Data) 1036 ( 1.01kB) - Total ROM Size (Code + RO Data + RW Data) 1220 ( 1.19kB) + Total ROM Size (Code + RO Data + RW Data) 1348 ( 1.32kB) ============================================================================== diff --git a/projet-voilier/Objects/driver_timer.o b/projet-voilier/Objects/driver_timer.o index cac2cf57cacbf4ac08a062616dad77ca184f5c58..bbd875b18100955ed879a3ad923ff2d9cd3368b9 100644 GIT binary patch literal 13916 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 K#O6k><7@z~dli`g delta 56 zcmX@1bV6xD0*k{pMumwfYJ3`s|G)qHuiyqE8TN0Sae{-Xxpi|Arx+t=00RR97Y_qN K*ycvA<7@!C9u>s^ diff --git a/projet-voilier/Objects/projet-voilier_reel.axf b/projet-voilier/Objects/projet-voilier_reel.axf index 8822effabbd1c568abda2944ed099cd00e6b9a2d..eb8dcc9bae32ed001f94da469dc9becd7c6a5f6d 100644 GIT binary patch delta 5723 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 delta 5149 zcma)=dvq1W9mi*8XEu8uNiTUnZpbAGAq2Q2Jc0_6OG09xio8tXu_>w8sOVAjU{8S_ z)&pw8%YrM)L9MU)I2HuFNJBwD3yN0o0UV$8RI8Srq9?JuL`wSo?Y$E&d;Ft&vNQAf zeSg2%nc3g&PVR}VeAgzvCTxahGd5xN+S1p3ZyL<{3MXINTgQu?8eS%L2&aXYn(HOA zx@CL`pU5l3O<5}&PV8;ST6T9=b3^lYB{TMa_wNBu{J?p$FZA2cs#s5mh3<)8Z>->x zSDu&aA3KvB>N|bpeC!mDY&sKU;(764-{~diukN`!#@0;wuB-ahQ<2!MO?*wHsqgfG z^O2^?L4BwFeMCilY>!i|A_KcI0LEA(h++}i`*4Q9Oft4Y#&1*C3OmXM@Jut7|8RYQ zk#SjId|*gHT>)cxQSPD|QVr(`i!pqR){I1?5Y^O~${^4bE|23p}-q*yq; z2KF%A@~Ba~d?{y6eg3-of&rYdfmu8dper#}lI}!&#qm3>4P2~{PKLi;bzzLc8Q>r9 ztno{}$XVxa@FE{Dl!aVY&yGuB6EJ09<%wP6o#DOSef5 zIpcs!T|^==mfOrRf7d@k)@a^yxP|gd#q-NdxA9dPRBH~3ZYbjKJnuE~=rofaohEtY zAGH(KPpH>yoa`Z-yuF-y9hcLgM=|ahv~qT$SnVqFP!{l+54%89E_{c&qu4s5DEuK^ zy|5Q$HJM^YcpOH1797q+!^A}s5zRK~KQ)R5UI^(R)0IYefex8% zQ*O1T-Axwf% z3k*&|aSKir7-%W8gl-ZojH!UtWKcb#pi;u;!dSnbr%BqM6ChAU(_ zv)%<++;=4&gjE)ouq$6xSH z^zEZ7#%%2#bKURI?lITh`UYJpDK5cy(;84*jv(nvx1`LVAyJGpSq6=V0%V%Z7_Hlu zLcX9s$)2W?&w{|&!zk&&dWrr+O&uZn*Nal@N*(nFA?McNJyO7#Dwe*TCRr__&ZdtD0)XE-N zp$=q}{ zHgpeB+VBKfJBc!q#P$(o-w2IaccZOj+Bm>7Xi8rIPgSrB&E!)RT#a@IWIR>DN7C7) z3BY4zJp{$#X?H?Agr*7v@F@r$Kyx#?#-|`iH{>&{AU*}b!|`ZoBd2Y~U1jSy9~BP_ zew@=rWn;yqbBAyh^k=C8Gpa_I%T&1;HCj5=D5Gks%I#G7=19et3BfpLO5hQ96l9XWuOnWTV+%!HP18}qQ>P*6*rB{rKYjfIXGm5`3{Ss`9S693#}_))BVtA z(s++?74YAvWx2F2rn330Ee$s)aOf&ZCUS1A=ni1UpFaM`f{OupR0PTA9LAQYJ zS^0%~#$NO22f_4z6n*BYzc0Y<|0_v84PKF=hwz$69!)GHdi$P*ff9rc;+GQ+?mZhI zINOuZ-5C2$7^&N@9|Y&6@TUeg z76mDW<8UYf)0)zN&U-i$4@9b7;o&+Dw|V#u53jI2hNnHe%fm-K{I!RF@Nf{jyVL;} zd)SV840Rr!>EXE^{*{N9d-zcgZ@!pqw)27AW?nqQkcUe>Tze7YRW{`! z182YR@B$Ct=i&7pe!;_gJp55A+eoq#sRpo2!@nI!!Z4DM9@NYvQ&JL_gQp~umbemp z6?j!r9|QgunBFX;*MYxJ(Px0~#pkjTx=jw9Fl>S$m<(6|-T|gxIY_s`^ve|eMne2M zF#SrU2lzOc)3-FKZw42GY2QWu+rW#HuQK8{z{|mS>^ohDk6~Du;z0j-&<|dS$Eyu{ z8nlwXKe=4!DlCFzX9KVSDFvh5&sAXj_46oaQ1jrx7*>8mw1$;0h>nh5*IZ)7e>44< zGVwbWJ778UTAD<+bY5yHRXwl-owaRQ&heIzI47O+Efwkx^I2Q&{{TW^w7mcT diff --git a/projet-voilier/Objects/projet-voilier_reel.build_log.htm b/projet-voilier/Objects/projet-voilier_reel.build_log.htm index 2fa2e12..0cdf371 100644 --- a/projet-voilier/Objects/projet-voilier_reel.build_log.htm +++ b/projet-voilier/Objects/projet-voilier_reel.build_log.htm @@ -34,7 +34,7 @@ compiling system_stm32f10x.c... compiling Driver_GPIO.c... compiling Driver_Timer.c... linking... -Program Size: Code=940 RO-data=268 RW-data=12 ZI-data=1024 +Program Size: Code=1068 RO-data=268 RW-data=12 ZI-data=1024 ".\Objects\projet-voilier_reel.axf" - 0 Error(s), 0 Warning(s).

Software Packages used:

@@ -63,8 +63,8 @@ Package Vendor: Keil * 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/ARM/STM32F1xx_OPT.s Source file: Device/Source/system_stm32f10x.c 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 53c462e..e8f9c6e 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: 6190000::V6.19::ARMCLANG -F (.\src\main.c)(0x6421A69F)(-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)(0x6425D0CF)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_reel\RTE_Components.h)(0x64218849) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -10,7 +10,7 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) I (..\driver\Driver_GPIO.h)(0x641B050C) -I (..\driver\Driver_Timer.h)(0x6421A591) +I (..\driver\Driver_Timer.h)(0x6421D747) F (..\driver\Driver_GPIO.c)(0x641B050C)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_gpio.o -MD) I (..\driver\Driver_GPIO.h)(0x641B050C) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) @@ -23,8 +23,8 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) I (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78) F (..\driver\Driver_GPIO.h)(0x641B050C)() -F (..\driver\Driver_Timer.c)(0x6421A5B1)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_timer.o -MD) -I (..\driver\Driver_Timer.h)(0x6421A591) +F (..\driver\Driver_Timer.c)(0x6425CEE2)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_timer.o -MD) +I (..\driver\Driver_Timer.h)(0x6421D747) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_reel\RTE_Components.h)(0x64218849) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -34,7 +34,7 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) I (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78) -F (..\driver\Driver_Timer.h)(0x6421A591)() +F (..\driver\Driver_Timer.h)(0x6421D747)() F (..\driver\Driver_UART.c)(0x642195B9)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_uart.o -MD) I (..\driver\Driver_UART.h)(0x6421962C) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) diff --git a/projet-voilier/Objects/projet-voilier_reel.htm b/projet-voilier/Objects/projet-voilier_reel.htm index bc93090..2f5b86e 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, 6190004: Last Updated: Mon Mar 27 16:22:51 2023 +

#<CALLGRAPH># ARM Linker, 6190004: Last Updated: Thu Mar 30 20:11:36 2023

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

Call chain for Maximum Stack Depth:

@@ -335,7 +335,7 @@ Global Symbols

[Called By]
  • >>   main
-

MyTimer_ConfigurePWM (Thumb, 40 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_ConfigurePWM)) +

MyTimer_ConfigurePWM (Thumb, 168 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_ConfigurePWM))

[Called By]

  • >>   main
diff --git a/projet-voilier/projet-voilier.uvguix.robin b/projet-voilier/projet-voilier.uvguix.robin index 3d0085e..8fa9e55 100644 --- a/projet-voilier/projet-voilier.uvguix.robin +++ b/projet-voilier/projet-voilier.uvguix.robin @@ -1806,7 +1806,7 @@ File 2537 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 976 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205001000000047265656C960000000000000002000373696D047265656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205001000000047265656C960000000000000002000373696D047265656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3547,7 +3547,7 @@ File 2537 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3563,7 +3563,7 @@ Build 976 - 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000004001D000000000000000000000000000000000100000001000000018030800000000004001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000004006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000040000000000000000000000000000000000000100000001000000960000000300205001000000047265656C960000000000000002000373696D047265656C00000000000000000180EB880000000004002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000400230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000004001D000000000000000000000000000000000100000001000000018030800000000004001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000004006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000040000000000000000000000000000000000000100000001000000960000000300205001000000047265656C960000000000000002000373696D047265656C00000000000000000180EB880000000004002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000400230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3579,7 +3579,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000004002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000004002800000000000000000000000000000000010000000100000001801B80000000000400290000000000000000000000000000000001000000010000000180E57F0000000004002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000004002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3606,9 +3606,9 @@ 0 .\src\main.c - 31 + 0 1 - 25 + 29 1 0 @@ -3633,9 +3633,9 @@ ..\driver\Driver_Timer.c - 16 - 24 - 43 + 0 + 46 + 60 1 0 @@ -3651,9 +3651,9 @@ ..\driver\Driver_Timer.h - 30 + 23 1 - 26 + 9 1 0 diff --git a/projet-voilier/projet-voilier.uvoptx b/projet-voilier/projet-voilier.uvoptx index 8a51f0a..35e7a75 100644 --- a/projet-voilier/projet-voilier.uvoptx +++ b/projet-voilier/projet-voilier.uvoptx @@ -322,7 +322,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=819,183,1240,588,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=105,137,504,482,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=1144,190,1738,884,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=966,202,1387,607,0)(121=961,76,1382,481,0)(122=920,173,1341,578,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=105,137,504,482,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=1179,98,1773,792,0)(132=207,214,801,908,0)(133=442,222,1036,916,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) 0 diff --git a/projet-voilier/src/main.c b/projet-voilier/src/main.c index ac19549..d0364c4 100644 --- a/projet-voilier/src/main.c +++ b/projet-voilier/src/main.c @@ -12,21 +12,17 @@ int main() { MyGPIO_Set(LED.GPIO, LED.GPIO_Pin); MyGPIO_Struct_TypeDef PWM_GPIO; - PWM_GPIO.GPIO_Pin = 7; + PWM_GPIO.GPIO_Pin = 0; PWM_GPIO.GPIO_Conf = AltOut_Ppull; - PWM_GPIO.GPIO = GPIOC; + PWM_GPIO.GPIO = GPIOA; MyGPIO_Init(&PWM_GPIO); - //PC7 - - - MyTimer_Struct_TypeDef PWM; - PWM.Timer = TIM3; + PWM.Timer = TIM2; PWM.PSC = 7200; PWM.ARR = 5000; MyTimer_Base_Init(&PWM); - MyTimer_ConfigurePWM(&PWM, 40); + MyTimer_ConfigurePWM(&PWM, 1, 40); MyTimer_Start(&PWM);