From 0039eddc4eb25f46c2422e70450cd32e4bd9819e Mon Sep 17 00:00:00 2001 From: Robin M Date: Tue, 11 Apr 2023 13:37:44 +0200 Subject: [PATCH] Merge --- projet-voilier/Objects/driver_gpio.o | Bin 5436 -> 5440 bytes projet-voilier/Objects/driver_timer.o | Bin 15976 -> 16424 bytes projet-voilier/Objects/main.d | 6 +- projet-voilier/Objects/main.o | Bin 6096 -> 0 bytes .../Objects/projet-voilier_reel.axf | Bin 44016 -> 0 bytes .../Objects/projet-voilier_reel.build_log.htm | 38 +++----- .../Objects/projet-voilier_reel.dep | 84 ++++++------------ projet-voilier/projet-voilier.uvguix.robin | 42 ++++----- 8 files changed, 60 insertions(+), 110 deletions(-) delete mode 100644 projet-voilier/Objects/main.o delete mode 100644 projet-voilier/Objects/projet-voilier_reel.axf diff --git a/projet-voilier/Objects/driver_gpio.o b/projet-voilier/Objects/driver_gpio.o index f94093fce3cc59cb68a8c22edecd79bbd26482a5..d6b857281df81160f3628ad5f70b71f77fe9ecec 100644 GIT binary patch delta 1439 zcmZ8hJ!n%=6h1faz4X1LN$S5ts*O~rMM|)XLzRbMhgfK&barqnRwC%&psz&d(lm}D z9o!TYDmYlsu~0=vML`EAb%^LtiiqEL?tMw>ft>$yzH{!qFB{{p##cs6r&XCW!>#$r z!^JOqroB$to9&c}7q|V{;*R%g^qc3k9*k$?WovV3@T!OysZ%VsZ<*osYvy^ztgN5# z%LZaPSk0KV^$!CJW@s!s5tN(3Xe}t$f-~7W?YXFGYVEtxJG0WB&;3SvE&tkI9SV{Q z=n3-3K-aCQKA1O)V5uP`W`L%AE4w_a+EibvoTQ6+Hl_(8Ym{F2iNbFjLqW6svve>4 zL`dH~TSJv(agJyxibe8Lfw#;MXi&L9RzC)({i+emnh*^nbRf~l?{2df4re41Ys^;2 z03?ATB!tDhdhfefpV-c(^>)%l9u|87h9eVMn_T|yyolPsPu&lpBtYtsu3M2yIdq9F z`iw%^HbcEkYPv$7uOa8sgb^xDgEF_Lo>?f5=?`(5XQ_Y^Y|9a18d8wZBB_PqZnZiP zbLYJyW5S)AOyEL}d_0u!bZSv*hmHv6Onb-nkbeL=37^@4mi6Vjw0{a_1{K US}4ry7ulx~GpHzY`bL-j0f#qaF#rGn delta 1391 zcmZ8gO-NKx6#lOBW_)kP87DK{jMk)(NQq=ii&s#DMHvy%%0*xhMz(0trZHD7BplzS zg^O7VEfQQL)S_jeQ9+9!BKNs4av`qz&N=tZh-Y!n&pr1$-#O>KkHa5^7f-nDdUecI z>UYL^id#pnWOgc<$2*;+TYJIH(thUOKwNJO*Ei=nW&k)$idslsxW2Wg?p>Q(SUVF` z9Mwd2sm(2~{c3;c%BON8*~)x&U?N+Y$ezzVNbW|XZX|gbeRT`Tz5FiIZxl9zes|3g zO(at?J!=Yh2ABNp?5&Nb0nwc#AQAvM(aUm}oTkb-_;e;55)YiQFk$9@;H1w91<*^C zrg;TM`fI=<5Zh%GhCWMFhqr~2ve`NiKv41Fv_nOm2evh9)^$-g;ZlP-D52_sUIR7O zZs*)1K=@Gnpnyl>HHq)iAq%PInk5m+z0ZkYGq}$X+iz9ROGY(R{3$f_T8@adQz|H1 zk9KJl0$k@5xTT)jEFm1EWtWacT4E94lC^okc!Y>oB&z+eD^^BP6s5&mDVH#);e9>z zR_83RJE3&L2l^(@FC#doX-T8In@iIvuNwPi|0u+g6P9^6dnx`n&MMAlaatVc$omll zF_p=>Dl`XW_BIzmXT=fpkC&)rU)BA?tk3!Ne zYbkPTNqenv{A4l! diff --git a/projet-voilier/Objects/driver_timer.o b/projet-voilier/Objects/driver_timer.o index 38da3b679d06be719b117dad4070356176db0c4b..b2382aa6f3fc5fe212fe304d9df3bc55f7daf223 100644 GIT binary patch delta 6437 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 B?34fi delta 5866 zcmZXY4Qy7`8ONV<-`n@5aP1%y#LzHDbOTuiQ?`IM!Vs1D zHq{x&0Kp3c3_}8_jl+Q}*_g$JEMpNTh7iS#;6i{zCUe1sDRJ!M|2*gazNPFm_x{fF zan5<3=broVwx`QoUblHvNi;>Y<#;s79j~|k$c52A9xUnorCZ>7ixWo@y`Sc;cSC;C z?Idm=wyk}5i4&=dpGXdm_a&#fu=m4cWiqcLPsHW+#s4a<^8MPrxVnV>RA2nnlBx;j zGp?^dq~Z%Kx=@FVTb%>36;uAu#1jdTq01q5#Xl}t=BJw57hf$|Qe(qcy#!mu&_HCp z`md5fA~kNo)_6tfo^-k9Qia1UE>P>nQLaNpF+;T(s?-p}pyJJjW;N{080yp-;&6+< zqJ|e&BF_3?Pqy!eA`W=WRPDY7nqN{^NgP9-g@459epqt~M;GSgraI!&Wer7|xTc*m zC@Fc*#fkFMy&slO%j->5k9G0kn!+V!lD|r!R(QrQP6&BY=`s)s*jwsC+oLx9Qr^(M*sLohw& zGd-xSd8lW7^Dy6Ow)+bSeaXxHjNfSNPV1Ejuw@FBwSH}-P7`3O=xCMel_N!T7L_L} z5vyKbmFFsv%Y4e;Rw5?NUF|E#N659FX?c>0r^)r?W^y~Zi`+|MOW4G}APB7dRc68SNCmHdpnLF(?)jFMy#Sx#avnSB)5NRA^XkyDjvOf-XvS>#-@ zgIq{1BEL)OLs$cOh+IuRPIi&ckQ>P7$sJ%?CwP&HgXB^21bK$MNM0rXO%~w3(0MA! z(PS$*gS?Bpm;7FU`&S1(LPeU~K<*^T+{achDP~zysVfX)|s=xwID6!x(l-E<avnhpf(QVZaLwMRg2TiNK(=7azSwxmdR;&J;V zjLed}$z=^RN$fJ*(-FQqQ|5s0#@u*ITV=XXLcCDrl-KGxX;F6jud0mtod4O=slFl+ z4y>u4p&~Z5ztkdmX1hzRnGi0iqYAl&Ozxs;thq9UdE)(^{Bw6Fl8B2Ms^Z;kx#{SA zzl!&jd@dQuXmQwdHY^mIA1*Ij{vy}u&RSdDp|ZjF56_%ltP;erAw`4KMqt0CK*Phkg9)#+`!zu%bYP1G%s)bUZD*HxfP>n!dSn@NAHio8G*eQ)3mq1|pA zx_;8~VbxQTtmIs)xBCtzw8`M=%aO?$iV(j;+32%Ye;(_mMZNu;n`F4UMEF~W>!k5z z=F|1zZQP>pn^RxA8O z^RceqwW^cG{NGEY)ztmxn@-~=^a~|ypq~mRHLs)H1|+02lsVnD$+}GAPrCb>Zjx;; zQpSo%4BKdo)-b}0C>_nF4a023#F*^h@Y!q^9VD17Isf}0@*b`bros_g9kT;`+WssF z+oD*(7pXGqmB~LjURA05j?E+d-g-OB;!^W?W)_CDgOWu;f(|2FKHDVoFW#A@mA zY7RnwllrnYnG)l6heJoF$Sydbh~??vJ@sq1FFWn^H+MeU4_mU`>An}~E|ehBU10yd zkz-;rc{9&=Pg-z3s>7-c^?^3YCo)0g>sFx|-hZopD%uXfwBdKW($4j|>#TxdJ@!(u M&kiPMPpUxv2MHv*>>>>>> encoder + ..\driver\Driver_IMU.h src\App_girouette.h diff --git a/projet-voilier/Objects/main.o b/projet-voilier/Objects/main.o deleted file mode 100644 index 5dc4d13be0cd015db089e2c02a5672e20fbbc1c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6096 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 diff --git a/projet-voilier/Objects/projet-voilier_reel.axf b/projet-voilier/Objects/projet-voilier_reel.axf deleted file mode 100644 index 97cfaae95fe296ea38c94fbd3a54fa04218ef314..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44016 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: *** Using Compiler 'V6.19', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin' Rebuild target 'reel' -<<<<<<< HEAD src/main.c(19): error: unknown type name 'Encoder' Encoder->Timer = TIM4; ^ @@ -91,34 +90,26 @@ MyTimer_Start(&Encoder); ../driver\Driver_Timer.h(29): note: previous declaration is here void MyTimer_Start(MyTimer_Struct_TypeDef * Timer); ^ -3 warnings and 11 errors generated. +src/main.c(47): error: too few arguments to function call, expected 3, have 2 + MyTimer_ConfigurePWM(&PWM_VOILE, 10); + ~~~~~~~~~~~~~~~~~~~~ ^ +../driver\Driver_Timer.h(66): note: 'MyTimer_ConfigurePWM' declared here +void MyTimer_ConfigurePWM(MyTimer_Struct_TypeDef *Timer, uint8_t pwm_channel, uint16_t duty_cycle); + ^ +src/main.c(128): warning: implicitly declaring library function 'sprintf' with type 'int (char *, const char *, ...)' [-Wimplicit-function-declaration] + sprintf(str, "Dir: %f deg", (float)dir); + ^ +src/main.c(128): note: include the header or explicitly provide a declaration for 'sprintf' +4 warnings and 12 errors generated. compiling main.c... -compiling system_stm32f10x.c... assembling startup_stm32f10x_md.s... -compiling Driver_UART.c... -======= -assembling startup_stm32f10x_md.s... ->>>>>>> encoder +compiling Driver_ADC.c... compiling Driver_GPIO.c... compiling App_girouette.c... compiling Driver_UART.c... -src/main.c(108): warning: implicitly declaring library function 'sprintf' with type 'int (char *, const char *, ...)' [-Wimplicit-function-declaration] - sprintf(str, "Dir: %f deg", (float)dir); - ^ -src/main.c(108): note: include the header or explicitly provide a declaration for 'sprintf' -1 warning generated. -compiling main.c... compiling Driver_Timer.c... -compiling Driver_ADC.c... -<<<<<<< HEAD -compiling Driver_Timer.c... -".\Objects\projet-voilier_reel.axf" - 11 Error(s), 3 Warning(s). -======= compiling system_stm32f10x.c... -linking... -Program Size: Code=5584 RO-data=268 RW-data=16 ZI-data=1024 -".\Objects\projet-voilier_reel.axf" - 0 Error(s), 1 Warning(s). ->>>>>>> encoder +".\Objects\projet-voilier_reel.axf" - 12 Error(s), 4 Warning(s).

Software Packages used:

@@ -149,10 +140,7 @@ Package Vendor: Keil Source file: Device/Source/system_stm32f10x.c Include file: RTE_Driver/Config/RTE_Device.h Source file: Device/Source/ARM/STM32F1xx_OPT.s -<<<<<<< HEAD Target not created. -======= ->>>>>>> encoder Build Time Elapsed: 00:00:01 diff --git a/projet-voilier/Objects/projet-voilier_reel.dep b/projet-voilier/Objects/projet-voilier_reel.dep index 1466177..82009fe 100644 --- a/projet-voilier/Objects/projet-voilier_reel.dep +++ b/projet-voilier/Objects/projet-voilier_reel.dep @@ -1,10 +1,6 @@ Dependencies for Project 'projet-voilier', Target 'reel': (DO NOT MODIFY !) CompilerVersion: 6190000::V6.19::ARMCLANG -<<<<<<< HEAD -F (.\src\main.c)(0x64351277)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) -======= -F (.\src\main.c)(0x6435437D)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) ->>>>>>> encoder +F (.\src\main.c)(0x6435459E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_reel\RTE_Components.h)(0x64218849) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -13,22 +9,15 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) -<<<<<<< HEAD -I (..\driver\Driver_GPIO.h)(0x64351277) -I (..\driver\Driver_Timer.h)(0x64351277) -I (..\driver\Driver_UART.h)(0x642C85A4) -I (..\driver\Driver_ADC.h)(0x64351277) -I (..\driver\MySPI.h)(0x64351277) -I (..\driver\Driver_IMU.h)(0x64351277) -F (..\driver\Driver_GPIO.c)(0x64351277)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_gpio.o -MD) -I (..\driver\Driver_GPIO.h)(0x64351277) -======= -I (..\driver\Driver_GPIO.h)(0x64351540) -I (..\driver\Driver_Timer.h)(0x64351540) -I (..\driver\Driver_UART.h)(0x64352E77) -I (src\App_girouette.h)(0x643516BD) -F (.\src\App_girouette.c)(0x64353982)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/app_girouette.o -MD) -I (src\App_girouette.h)(0x643516BD) +I (..\driver\Driver_GPIO.h)(0x64354588) +I (..\driver\Driver_Timer.h)(0x64354588) +I (..\driver\Driver_UART.h)(0x6435459E) +I (..\driver\Driver_ADC.h)(0x64354588) +I (..\driver\MySPI.h)(0x64354588) +I (..\driver\Driver_IMU.h)(0x64354588) +I (src\App_girouette.h)(0x6435459E) +F (.\src\App_girouette.c)(0x6435459E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/app_girouette.o -MD) +I (src\App_girouette.h)(0x6435459E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_reel\RTE_Components.h)(0x64218849) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -37,12 +26,11 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) -I (..\driver\Driver_GPIO.h)(0x64351540) -I (..\driver\Driver_Timer.h)(0x64351540) -F (.\src\App_girouette.h)(0x643516BD)() -F (..\driver\Driver_GPIO.c)(0x6435274E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_gpio.o -MD) -I (..\driver\Driver_GPIO.h)(0x64351540) ->>>>>>> encoder +I (..\driver\Driver_GPIO.h)(0x64354588) +I (..\driver\Driver_Timer.h)(0x64354588) +F (.\src\App_girouette.h)(0x6435459E)() +F (..\driver\Driver_GPIO.c)(0x6435459E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_gpio.o -MD) +I (..\driver\Driver_GPIO.h)(0x64354588) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_reel\RTE_Components.h)(0x64218849) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -52,15 +40,9 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) I (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78) -<<<<<<< HEAD -F (..\driver\Driver_GPIO.h)(0x64351277)() -F (..\driver\Driver_Timer.c)(0x64351277)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_timer.o -MD) -I (..\driver\Driver_Timer.h)(0x64351277) -======= -F (..\driver\Driver_GPIO.h)(0x64351540)() -F (..\driver\Driver_Timer.c)(0x64353731)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_timer.o -MD) -I (..\driver\Driver_Timer.h)(0x64351540) ->>>>>>> encoder +F (..\driver\Driver_GPIO.h)(0x64354588)() +F (..\driver\Driver_Timer.c)(0x6435459E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_timer.o -MD) +I (..\driver\Driver_Timer.h)(0x64354588) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_reel\RTE_Components.h)(0x64218849) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -70,15 +52,9 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) I (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78) -<<<<<<< HEAD -F (..\driver\Driver_Timer.h)(0x64351277)() -F (..\driver\Driver_UART.c)(0x64300B0F)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_uart.o -MD) -I (..\driver\Driver_UART.h)(0x642C85A4) -======= -F (..\driver\Driver_Timer.h)(0x64351540)() -F (..\driver\Driver_UART.c)(0x64352E6F)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_uart.o -MD) -I (..\driver\Driver_UART.h)(0x64352E77) ->>>>>>> encoder +F (..\driver\Driver_Timer.h)(0x64354588)() +F (..\driver\Driver_UART.c)(0x6435459E)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_uart.o -MD) +I (..\driver\Driver_UART.h)(0x6435459E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_reel\RTE_Components.h)(0x64218849) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -87,13 +63,8 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) -<<<<<<< HEAD -F (..\driver\Driver_UART.h)(0x642C85A4)() -F (..\driver\Driver_ADC.c)(0x64351277)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_adc.o -MD) -======= -F (..\driver\Driver_UART.h)(0x64352E77)() -F (..\driver\Driver_ADC.c)(0x64351540)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_adc.o -MD) ->>>>>>> encoder +F (..\driver\Driver_UART.h)(0x6435459E)() +F (..\driver\Driver_ADC.c)(0x64354588)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_adc.o -MD) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_reel\RTE_Components.h)(0x64218849) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -103,13 +74,8 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) I (C:\Keil_v5\ARM\ARMCLANG\include\stdio.h)(0x6388AB78) -<<<<<<< HEAD -I (..\driver\Driver_ADC.h)(0x64351277) -F (..\driver\Driver_ADC.h)(0x64351277)() -======= -I (..\driver\Driver_ADC.h)(0x64351540) -F (..\driver\Driver_ADC.h)(0x64351540)() ->>>>>>> encoder +I (..\driver\Driver_ADC.h)(0x64354588) +F (..\driver\Driver_ADC.h)(0x64354588)() F (RTE/Device/STM32F103RB/RTE_Device.h)(0x641B050C)() F (RTE/Device/STM32F103RB/startup_stm32f10x_md.s)(0x641B050C)(--target=arm-arm-none-eabi -mcpu=cortex-m3 -masm=auto -Wa,armasm,--diag_suppress=A1950W -c -gdwarf-4 -Wa,armasm,--pd,"__MICROLIB SETA 1" -Wa,armasm,--pd,"__EVAL SETA 1" -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -Wa,armasm,--pd,"__UVISION_VERSION SETA 538" -Wa,armasm,--pd,"_RTE_ SETA 1" -Wa,armasm,--pd,"STM32F10X_MD SETA 1" -Wa,armasm,--pd,"_RTE_ SETA 1" -o ./objects/startup_stm32f10x_md.o) F (RTE/Device/STM32F103RB/system_stm32f10x.c)(0x641B050C)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../driver -I./RTE/Device/STM32F103RB -I./RTE/_reel -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/system_stm32f10x.o -MD) diff --git a/projet-voilier/projet-voilier.uvguix.robin b/projet-voilier/projet-voilier.uvguix.robin index 94a1056..1b37013 100644 --- a/projet-voilier/projet-voilier.uvguix.robin +++ b/projet-voilier/projet-voilier.uvguix.robin @@ -111,7 +111,7 @@ 0 1632 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D000000020000000100000050433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C7372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF4B433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F554152542E68000000000D4472697665725F554152542E6800000000FFDC7800FFFFFFFF4B433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F554152542E63000000000D4472697665725F554152542E6300000000BECEA100FFFFFFFF4C433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F54696D65722E63000000000E4472697665725F54696D65722E6300000000F0A0A100FFFFFFFF73433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000BCA8E100FFFFFFFF4C433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F54696D65722E68000000000E4472697665725F54696D65722E68000000009CC1B600FFFFFFFF6F433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C5254455C4465766963655C53544D33324631303352425C73797374656D5F73746D3332663130782E63000000001273797374656D5F73746D3332663130782E6300000000F7B88600FFFFFFFF5A433A5C55736572735C726F62696E5C417070446174615C4C6F63616C5C41726D5C5061636B735C4B65696C5C53544D3332463178785F4446505C322E342E305C4465766963655C496E636C7564655C73746D3332663130782E68000000000B73746D3332663130782E6800000000D9ADC200FFFFFFFF4B433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E6300000000A5C2D700FFFFFFFF5A433A5C55736572735C726F62696E5C417070446174615C4C6F63616C5C41726D5C5061636B735C41524D5C434D5349535C352E392E305C434D5349535C436F72655C496E636C7564655C636D7369735F61726D636C616E672E680000000010636D7369735F61726D636C616E672E6800000000B3A6BE00FFFFFFFF20433A5C55736572735C726F62696E5C4F6E6544726976655C4275726561755C3100000000013100000000EAD6A300FFFFFFFF59433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C7372635C4170705F6769726F75657474652E63000000000F4170705F6769726F75657474652E6300000000F6FA7D00FFFFFFFF4A433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F4144432E63000000000C4472697665725F4144432E6300000000B5E99D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F4000000660000008007000033030000 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D000000000000000100000050433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C7372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF4B433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F554152542E68000000000D4472697665725F554152542E6800000000FFDC7800FFFFFFFF4B433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F554152542E63000000000D4472697665725F554152542E6300000000BECEA100FFFFFFFF4C433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F54696D65722E63000000000E4472697665725F54696D65722E6300000000F0A0A100FFFFFFFF73433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000BCA8E100FFFFFFFF4C433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F54696D65722E68000000000E4472697665725F54696D65722E68000000009CC1B600FFFFFFFF6F433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C5254455C4465766963655C53544D33324631303352425C73797374656D5F73746D3332663130782E63000000001273797374656D5F73746D3332663130782E6300000000F7B88600FFFFFFFF5A433A5C55736572735C726F62696E5C417070446174615C4C6F63616C5C41726D5C5061636B735C4B65696C5C53544D3332463178785F4446505C322E342E305C4465766963655C496E636C7564655C73746D3332663130782E68000000000B73746D3332663130782E6800000000D9ADC200FFFFFFFF4B433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E6300000000A5C2D700FFFFFFFF5A433A5C55736572735C726F62696E5C417070446174615C4C6F63616C5C41726D5C5061636B735C41524D5C434D5349535C352E392E305C434D5349535C436F72655C496E636C7564655C636D7369735F61726D636C616E672E680000000010636D7369735F61726D636C616E672E6800000000B3A6BE00FFFFFFFF20433A5C55736572735C726F62696E5C4F6E6544726976655C4275726561755C3100000000013100000000EAD6A300FFFFFFFF59433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C70726F6A65742D766F696C6965725C7372635C4170705F6769726F75657474652E63000000000F4170705F6769726F75657474652E6300000000F6FA7D00FFFFFFFF4A433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C50726F6A65742D566F696C6965722D335C6472697665725C4472697665725F4144432E63000000000C4472697665725F4144432E6300000000B5E99D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F40000006600000080070000CD010000 @@ -150,7 +150,7 @@ 0 16 - 0300000066000000ED00000003030000 + 0300000066000000ED0000009D010000 16 @@ -170,7 +170,7 @@ 0 16 - 0300000066000000ED00000003030000 + 0300000066000000ED0000009D010000 16 @@ -450,7 +450,7 @@ 0 16 - 0300000066000000ED00000003030000 + 0300000066000000ED0000009D010000 16 @@ -470,7 +470,7 @@ 0 16 - 0300000066000000ED00000003030000 + 0300000066000000ED0000009D010000 16 @@ -490,7 +490,7 @@ 0 16 - 03000000370300007D070000C5030000 + 03000000D10100007D070000C5030000 16 @@ -530,7 +530,7 @@ 0 16 - 03000000370300007D070000C5030000 + 03000000D10100007D070000C5030000 16 @@ -1170,7 +1170,7 @@ 0 16 - 03000000370300007D070000C5030000 + 03000000D10100007D0700005F020000 16 @@ -1190,7 +1190,7 @@ 0 16 - 03000000370300007D070000C5030000 + 03000000D10100007D0700005F020000 16 @@ -1250,7 +1250,7 @@ 0 16 - 03000000370300007D070000C5030000 + 03000000D10100007D0700005F020000 16 @@ -1270,7 +1270,7 @@ 0 16 - 03000000370300007D070000C5030000 + 03000000D10100007D0700005F020000 16 @@ -1799,14 +1799,14 @@ 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DD00000090050000E1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F4000000F40000004F00000090050000DD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000025020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A004000066000000900500003C020000A00400004F000000900500002502000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F40000001C030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F000000033030000000000004F000000F00000001C0300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000011020000900500001502000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000002C02000090050000CE020000000000001502000090050000B702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000015020000CC020000B702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000001C030000800700002003000001000000010000100400000001000000A7FDFFFF2B010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000003703000080070000F5030000000000002003000080070000DE0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DD00000090050000E1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F4000000F40000004F00000090050000DD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000025020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A004000066000000900500003C020000A00400004F000000900500002502000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000B6010000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F000000033030000000000004F000000F0000000B60100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000011020000900500001502000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000002C02000090050000CE020000000000001502000090050000B702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000015020000CC020000B702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000B601000080070000BA0100000100000001000010040000000100000038FDFFFFBC000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000003703000080070000F503000000000000BA01000080070000DE0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File 2684 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000D5243435F41504231454E525F55960000000000000008000D5243435F41504231454E525F55145243435F41504231454E525F555341525431454E065553415254310E4750494F5F4352485F434E4631330C4750494F5F4352485F434E46084750494F5F43524803435248125243435F41504232454E525F494F5041454E0000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000000004000000000000000000000000000000000100000001000000018022E100000000000005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000000460000000000000000000000000000000001000000010000000180FE880000000000004500000000000000000000000000000000010000000100000001800B810000000000001300000000000000000000000000000000010000000100000001800C810000000000001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000D5243435F41504231454E525F55960000000000000008000D5243435F41504231454E525F55145243435F41504231454E525F555341525431454E065553415254310E4750494F5F4352485F434E4631330C4750494F5F4352485F434E46084750494F5F43524803435248125243435F41504232454E525F494F5041454E0000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 976 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205001000000047265656C960000000000000002000373696D047265656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205001000000047265656C960000000000000002000373696D047265656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3547,7 +3547,7 @@ File 2684 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000D5243435F41504231454E525F55960000000000000008000D5243435F41504231454E525F55145243435F41504231454E525F555341525431454E065553415254310E4750494F5F4352485F434E4631330C4750494F5F4352485F434E46084750494F5F43524803435248125243435F41504232454E525F494F5041454E0000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020000001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000D5243435F41504231454E525F55960000000000000008000D5243435F41504231454E525F55145243435F41504231454E525F555341525431454E065553415254310E4750494F5F4352485F434E4631330C4750494F5F4352485F434E46084750494F5F43524803435248125243435F41504232454E525F494F5041454E0000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020000001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3563,7 +3563,7 @@ Build 976 - 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000004001D000000000000000000000000000000000100000001000000018030800000000004001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000004006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000040000000000000000000000000000000000000100000001000000960000000300205001000000047265656C960000000000000002000373696D047265656C00000000000000000180EB880000000004002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000400230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000004001D000000000000000000000000000000000100000001000000018030800000000004001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000004006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000040000000000000000000000000000000000000100000001000000960000000300205001000000047265656C960000000000000002000373696D047265656C00000000000000000180EB880000000004002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000400230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3579,7 +3579,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020000002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020000002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3603,12 +3603,12 @@ 0 100 - 2 + 0 .\src\main.c - 0 + 7 1 - 9 + 19 1 0