From 7ae3d2353625002a612ef5127c3fec44acbf05fa Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期五, 04 七月 2025 09:31:10 +0800 Subject: [PATCH] 修改开机log打印的版本号1.2 --- dualboots_Gai_youhua/keil/customboot/Objects/customboot.build_log.htm | 26 ++-- dualboots_Gai_youhua/keil/secondboot/secondboot.uvguix.WXK | 12 +- dualboots_Gai_youhua/keil/customboot/Objects/customboot_MK8000 Release.dep | 2 dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.hex | 8 dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.htm | 2 dualboots_Gai_youhua/keil/secondboot/Output/secondboot.bin | 0 dualboots_Gai_youhua/keil/customboot/customboot.uvoptx | 19 --- dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.build_log.htm | 9 + dualboots_Gai_youhua/keil/customboot/Objects/customboot.axf | 0 dualboots_Gai_youhua/keil/secondboot/Objects/secondboot_MK8000 Release.dep | 4 dualboots_Gai_youhua/src/customboot/customboot.c | 2 dualboots_Gai_youhua/keil/customboot/Objects/customboot.hex | 6 dualboots_Gai_youhua/keil/customboot/Output/customboot.bin | 0 dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.axf | 0 dualboots_Gai_youhua/src/secondboot/_customboot_image.c | 6 dualboots_Gai_youhua/keil/dualboots.uvmpw.uvgui.WXK | 59 ++++++----- dualboots_Gai_youhua/keil/customboot/Objects/customboot.htm | 2 dualboots_Gai_youhua/keil/customboot/customboot.uvguix.WXK | 110 +++++++++++----------- 18 files changed, 132 insertions(+), 135 deletions(-) diff --git a/dualboots_Gai_youhua/keil/customboot/Objects/customboot.axf b/dualboots_Gai_youhua/keil/customboot/Objects/customboot.axf index 126b572..59a847a 100644 --- a/dualboots_Gai_youhua/keil/customboot/Objects/customboot.axf +++ b/dualboots_Gai_youhua/keil/customboot/Objects/customboot.axf Binary files differ diff --git a/dualboots_Gai_youhua/keil/customboot/Objects/customboot.build_log.htm b/dualboots_Gai_youhua/keil/customboot/Objects/customboot.build_log.htm index 9aabb62..b79e7c1 100644 --- a/dualboots_Gai_youhua/keil/customboot/Objects/customboot.build_log.htm +++ b/dualboots_Gai_youhua/keil/customboot/Objects/customboot.build_log.htm @@ -27,31 +27,31 @@ <h2>Output:</h2> *** Using Compiler 'V6.14', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin' Rebuild target 'MK8000 Release' -compiling startup_MK800X.c... -compiling mk_sleep_timer.c... compiling system_MK800X.c... -compiling mk_gpio.c... -compiling mk_dma.c... -compiling mk_io.c... +compiling startup_MK800X.c... +compiling mk_power.c... +compiling mk_sleep_timer.c... compiling mk_reset.c... -compiling mk_wdt.c... +compiling aes.c... +compiling mk_uart.c... +compiling mk_gpio.c... +compiling mk_io.c... compiling mk_clock.c... compiling mk_dual_timer.c... -compiling aes.c... -compiling mk_flash.c... +compiling mk_wdt.c... +compiling mk_dma.c... compiling mk_calib.c... -compiling mk_power.c... compiling mk_misc.c... -compiling mk_uart.c... +compiling mk_flash.c... compiling menu.c... compiling ymodem.c... -compiling pin_config.c... compiling board.c... +compiling pin_config.c... ../../src/customboot/customboot.c(194): warning: implicit declaration of function 'delay_ms' is invalid in C99 [-Wimplicit-function-declaration] delay_ms(200); ^ ../../src/customboot/customboot.c(250): warning: illegal character encoding in string literal [-Winvalid-source-encoding] - SerialPutString("MK8000-BootLoader-V1.1<C6><F4><B6><AF>\r\n"); + SerialPutString("MK8000-BootLoader-V1.2<C6><F4><B6><AF>\r\n"); ^~~~~~~~~~~~~~~~ ./include/drivers/mk_uart.h(69): note: expanded from macro 'SerialPutString' #define SerialPutString(x) Serial_PutString((uint8_t*)(x)) @@ -118,7 +118,7 @@ C:\Keil_v5\ARM\PACK\MKSEMI\MK800X_DFP\1.0.3\Device\Include <h2>Collection of Component Files used:</h2> -Build Time Elapsed: 00:00:02 +Build Time Elapsed: 00:00:03 </pre> </body> </html> diff --git a/dualboots_Gai_youhua/keil/customboot/Objects/customboot.hex b/dualboots_Gai_youhua/keil/customboot/Objects/customboot.hex index 6ef597f..b6246f7 100644 --- a/dualboots_Gai_youhua/keil/customboot/Objects/customboot.hex +++ b/dualboots_Gai_youhua/keil/customboot/Objects/customboot.hex @@ -586,7 +586,7 @@ :10C48000FEF7BEFE2AA0FEF79FF90298FEF7B8FE5F :10C49000FEF7F8FBC5C50202CC0C000010E8020252 :10C4A0008CEA02024D4B383030302D426F6F744CA5 -:10C4B0006F616465722D56312E31C6F4B6AF0D0A28 +:10C4B0006F616465722D56312E32C6F4B6AF0D0A27 :10C4C0000000000000A0000400D00204CCCC00005A :10C4D000BBBB0000AAAA0000BDF8C8EB4F54412C1A :10C4E000C9FDBCB6C6F4B6AF0D0A00000040050495 @@ -809,8 +809,8 @@ :10D41000000000000000000000000000000000000C :10D4200078D40202000000000A56656E646F72092B :10D430003A204D4B53454D490A43686970093A20DB -:10D440004D4B383030300A44617465093A204D61E3 -:10D450007920323320323032350A56657273696F63 +:10D440004D4B383030300A44617465093A204A75D2 +:10D450006C20203420323032350A56657273696F81 :10D460006E093A2056302E362E32000000000000A1 :08D470000000000000000000B4 :040000050202A0C192 diff --git a/dualboots_Gai_youhua/keil/customboot/Objects/customboot.htm b/dualboots_Gai_youhua/keil/customboot/Objects/customboot.htm index b360347..384755f 100644 --- a/dualboots_Gai_youhua/keil/customboot/Objects/customboot.htm +++ b/dualboots_Gai_youhua/keil/customboot/Objects/customboot.htm @@ -3,7 +3,7 @@ <title>Static Call Graph - [.\Objects\customboot.axf]</title></head> <body><HR> <H1>Static Call Graph for image .\Objects\customboot.axf</H1><HR> -<BR><P>#<CALLGRAPH># ARM Linker, 6140002: Last Updated: Fri May 23 10:12:54 2025 +<BR><P>#<CALLGRAPH># ARM Linker, 6140002: Last Updated: Fri Jul 4 09:25:05 2025 <BR><P> <H3>Maximum Stack Usage = 336 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3> Call chain for Maximum Stack Depth:</H3> diff --git a/dualboots_Gai_youhua/keil/customboot/Objects/customboot_MK8000 Release.dep b/dualboots_Gai_youhua/keil/customboot/Objects/customboot_MK8000 Release.dep index dcf0d85..13f11f7 100644 --- a/dualboots_Gai_youhua/keil/customboot/Objects/customboot_MK8000 Release.dep +++ b/dualboots_Gai_youhua/keil/customboot/Objects/customboot_MK8000 Release.dep @@ -357,7 +357,7 @@ I (include\drivers\mk_trace.h)(0x67E26686) I (C:\Keil_v5\ARM\ARMCLANG\include\stdarg.h)(0x5DDFFD72) I (include\drivers\mk_wdt.h)(0x67E26686) -F (..\..\src\customboot\customboot.c)(0x682EE30D)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__MICROLIB -gdwarf-3 -Oz -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 -I .. -I ../../.. -I ./include/CMSIS/Include -I ./include/devices/MK800X/Include -I ./include/components/libc -I ./include/drivers -I ../../src/customboot -I ../../../../../mk8000_evk -I ../customboot -I ./include/boards -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter -I./RTE/_MK8000_Release -IC:/Keil_v5/ARM/PACK/MKSEMI/MK800X_DFP/1.0.3/Device/Include -IC:/Keil_v5/ARM/CMSIS/Include -D__UVISION_VERSION="530" -D_RTE_ -DSTD_LIBC -o ./objects/customboot.o -MD) +F (..\..\src\customboot\customboot.c)(0x68672D4C)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__MICROLIB -gdwarf-3 -Oz -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 -I .. -I ../../.. -I ./include/CMSIS/Include -I ./include/devices/MK800X/Include -I ./include/components/libc -I ./include/drivers -I ../../src/customboot -I ../../../../../mk8000_evk -I ../customboot -I ./include/boards -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter -I./RTE/_MK8000_Release -IC:/Keil_v5/ARM/PACK/MKSEMI/MK800X_DFP/1.0.3/Device/Include -IC:/Keil_v5/ARM/CMSIS/Include -D__UVISION_VERSION="530" -D_RTE_ -DSTD_LIBC -o ./objects/customboot.o -MD) I (include\drivers\mk_flash.h)(0x67E26686) I (include\drivers\mk_common.h)(0x67E26686) I (C:\Keil_v5\ARM\ARMCLANG\include\stddef.h)(0x5DDFFD72) diff --git a/dualboots_Gai_youhua/keil/customboot/Output/customboot.bin b/dualboots_Gai_youhua/keil/customboot/Output/customboot.bin index eb61618..838338c 100644 --- a/dualboots_Gai_youhua/keil/customboot/Output/customboot.bin +++ b/dualboots_Gai_youhua/keil/customboot/Output/customboot.bin Binary files differ diff --git a/dualboots_Gai_youhua/keil/customboot/customboot.uvguix.WXK b/dualboots_Gai_youhua/keil/customboot/customboot.uvguix.WXK index b21894c..14fb565 100644 --- a/dualboots_Gai_youhua/keil/customboot/customboot.uvguix.WXK +++ b/dualboots_Gai_youhua/keil/customboot/customboot.uvguix.WXK @@ -101,17 +101,17 @@ <yPos>-1</yPos> </MaxPosition> <NormalPosition> - <Top>240</Top> - <Left>2660</Left> - <Right>4377</Right> - <Bottom>1169</Bottom> + <Top>377</Top> + <Left>2931</Left> + <Right>4648</Right> + <Bottom>1308</Bottom> </NormalPosition> </WindowPosition> <MDIClientArea> <RegID>0</RegID> <MDITabState> - <Len>2538</Len> - <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000012000000000000000100000068433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C796D6F64656D2E630000000008796D6F64656D2E6300000000C5D4F200FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C7372635C637573746F6D626F6F745C637573746F6D626F6F742E63000000000C637573746F6D626F6F742E6300000000FFDC7800FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C7372635C637573746F6D626F6F745C70696E5F636F6E6669672E63000000000C70696E5F636F6E6669672E6300000000BECEA100FFFFFFFF67433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F696F2E6800000000076D6B5F696F2E6800000000F0A0A100FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C417070436F6E6669672E68000000000B417070436F6E6669672E6800000000BCA8E100FFFFFFFF66433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D656E752E6300000000066D656E752E63000000009CC1B600FFFFFFFF69433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F756172742E6300000000096D6B5F756172742E6300000000F7B88600FFFFFFFF67433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F696F2E6300000000076D6B5F696F2E6300000000D9ADC200FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F63616C69622E63000000000A6D6B5F63616C69622E6300000000A5C2D700FFFFFFFF7E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C646576696365735C4D4B383030585C536F757263655C737461727475705F4D4B383030582E630000000010737461727475705F4D4B383030582E6300000000B3A6BE00FFFFFFFF5E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C637573746F6D626F6F742E736374000000000E637573746F6D626F6F742E73637400000000EAD6A300FFFFFFFF70433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F736C6565705F74696D65722E6300000000106D6B5F736C6565705F74696D65722E6300000000F6FA7D00FFFFFFFF69433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F6770696F2E6300000000096D6B5F6770696F2E6300000000B5E99D00FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F72657365742E63000000000A6D6B5F72657365742E63000000005FC3CF00FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F636C6F636B2E63000000000A6D6B5F636C6F636B2E6300000000C1838300FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F666C6173682E63000000000A6D6B5F666C6173682E6300000000CACAD500FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F666C6173682E68000000000A6D6B5F666C6173682E6800000000C5D4F200FFFFFFFF5E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C7365636F6E64626F6F745C7365636F6E64626F6F742E736374000000000E7365636F6E64626F6F742E73637400000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000130B0000660000008011000038030000</Data> + <Len>2659</Len> + <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000013000000120000000100000068433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C796D6F64656D2E630000000008796D6F64656D2E6300000000C5D4F200FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C7372635C637573746F6D626F6F745C637573746F6D626F6F742E63000000000C637573746F6D626F6F742E6300000000FFDC7800FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C7372635C637573746F6D626F6F745C70696E5F636F6E6669672E63000000000C70696E5F636F6E6669672E6300000000BECEA100FFFFFFFF67433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F696F2E6800000000076D6B5F696F2E6800000000F0A0A100FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C417070436F6E6669672E68000000000B417070436F6E6669672E6800000000BCA8E100FFFFFFFF66433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D656E752E6300000000066D656E752E63000000009CC1B600FFFFFFFF69433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F756172742E6300000000096D6B5F756172742E6300000000F7B88600FFFFFFFF67433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F696F2E6300000000076D6B5F696F2E6300000000D9ADC200FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F63616C69622E63000000000A6D6B5F63616C69622E6300000000A5C2D700FFFFFFFF7E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C646576696365735C4D4B383030585C536F757263655C737461727475705F4D4B383030582E630000000010737461727475705F4D4B383030582E6300000000B3A6BE00FFFFFFFF5E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C637573746F6D626F6F742E736374000000000E637573746F6D626F6F742E73637400000000EAD6A300FFFFFFFF70433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F736C6565705F74696D65722E6300000000106D6B5F736C6565705F74696D65722E6300000000F6FA7D00FFFFFFFF69433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F6770696F2E6300000000096D6B5F6770696F2E6300000000B5E99D00FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F72657365742E63000000000A6D6B5F72657365742E63000000005FC3CF00FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F636C6F636B2E63000000000A6D6B5F636C6F636B2E6300000000C1838300FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F666C6173682E63000000000A6D6B5F666C6173682E6300000000CACAD500FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F666C6173682E68000000000A6D6B5F666C6173682E6800000000C5D4F200FFFFFFFF5E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C7365636F6E64626F6F745C7365636F6E64626F6F742E736374000000000E7365636F6E64626F6F742E73637400000000FFDC7800FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C7372635C7365636F6E64626F6F745C7365636F6E64626F6F742E63000000000C7365636F6E64626F6F742E6300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000130B0000660000008011000038030000</Data> </MDITabState> </MDIClientArea> <ViewEx> @@ -1871,11 +1871,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>720500004F0000008007000007030000</Data> + <Data>AE0500004F0000008007000019030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>720F000066000000801100001E030000</Data> + <Data>AE0F0000660000008011000030030000</Data> </RectRecentFloat> </Window> <Window> @@ -1891,7 +1891,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000FF000000EE020000</Data> + <Data>0300000066000000FF00000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1911,7 +1911,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000FF000000EE020000</Data> + <Data>0300000066000000FF00000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1927,11 +1927,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>16384</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>75050000660000007D070000EE020000</Data> + <Data>B1050000660000007D07000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1941,17 +1941,17 @@ <Window> <RegID>1466</RegID> <PaneID>1466</PaneID> - <IsVisible>0</IsVisible> + <IsVisible>1</IsVisible> <IsFloating>0</IsFloating> <IsTabbed>0</IsTabbed> <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>16384</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>75050000660000007D070000EE020000</Data> + <Data>B1050000660000007D07000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1967,11 +1967,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>16384</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>75050000660000007D070000EE020000</Data> + <Data>B1050000660000007D07000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1987,11 +1987,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>16384</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>75050000660000007D070000EE020000</Data> + <Data>B1050000660000007D07000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2047,11 +2047,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>16384</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>75050000660000007D070000EE020000</Data> + <Data>B1050000660000007D07000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2067,11 +2067,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>16384</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>75050000660000007D070000EE020000</Data> + <Data>B1050000660000007D07000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2087,11 +2087,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>16384</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>75050000660000007D070000EE020000</Data> + <Data>B1050000660000007D07000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2107,11 +2107,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>16384</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>75050000660000007D070000EE020000</Data> + <Data>B1050000660000007D07000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2127,11 +2127,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>16384</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>75050000660000007D070000EE020000</Data> + <Data>B1050000660000007D07000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2147,11 +2147,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>16384</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>75050000660000007D070000EE020000</Data> + <Data>B1050000660000007D07000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2167,11 +2167,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>16384</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>75050000660000007D070000EE020000</Data> + <Data>B1050000660000007D07000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2191,7 +2191,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000FF000000EE020000</Data> + <Data>0300000066000000FF00000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2211,7 +2211,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000FF000000EE020000</Data> + <Data>0300000066000000FF00000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2231,7 +2231,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000220300007D070000CD030000</Data> + <Data>03000000340300007D070000CD030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2271,7 +2271,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000220300007D070000CD030000</Data> + <Data>03000000340300007D070000CD030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2367,11 +2367,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>16384</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>75050000660000007D070000EE020000</Data> + <Data>B1050000660000007D07000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2891,7 +2891,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000FF000000EE020000</Data> + <Data>0300000066000000FF00000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2911,7 +2911,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000220300007D070000CD030000</Data> + <Data>03000000340300007D070000CD030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2931,7 +2931,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000220300007D070000CD030000</Data> + <Data>03000000340300007D070000CD030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2947,11 +2947,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>16384</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>75050000660000007D070000EE020000</Data> + <Data>B1050000660000007D07000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2967,11 +2967,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>16384</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>75050000660000007D070000EE020000</Data> + <Data>B1050000660000007D07000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2991,7 +2991,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000220300007D070000CD030000</Data> + <Data>03000000340300007D070000CD030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3011,7 +3011,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000220300007D070000CD030000</Data> + <Data>03000000340300007D070000CD030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3451,7 +3451,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0100000000000000D20300001C000000</Data> + <Data>0000000000000000D10300001C000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3527,11 +3527,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>16384</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>75050000660000007D070000EE020000</Data> + <Data>B1050000660000007D07000000030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3540,14 +3540,14 @@ </Window> <DockMan> <Len>3415</Len> - <Data>000000000C000000000000000040000001000000FFFFFFFFFFFFFFFF6E0500004F00000072050000070300000100000002000010040000000100000081FBFFFFF001000000000000000000000000000001000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000FFFF02000B004354616262656450616E650040000001000000720F000066000000801100001E030000720500004F000000800700000703000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF0500000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F070000000000000020000000000000FFFFFFFFFFFFFFFF7D010000DD000000AB060000E1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000018000200000000000007D0B000066000000AB100000F40000007D0100004F000000AB060000DD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFD20500004F000000D60500001D020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000D60F000066000000AB10000034020000D60500004F000000AB0600001D02000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF020100004F00000006010000070300000100000002000010040000000100000089FEFFFF29050000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000000A000066000000020B00001E030000000000004F00000002010000070300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000069020000800700006D02000000000000010000000400000001000000000000000000000000000000000000000000000001000000C60000000000000001000000000000000000000001000000FFFFFFFFC003000044030000C4030000E603000000000000020000000400000000000000000000000000000000000000000000000000000001000000C600000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000007030000800700000B03000001000000010000100400000001000000BEFDFFFF4A010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000A00002203000080110000FD030000000000000B03000080070000E60300000000000040820056060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365010000007794000001000000FFFFFFFFFFFFFFFF01000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data> + <Data>000000000C000000000000000040000001000000FFFFFFFFFFFFFFFFAA0500004F000000AE05000019030000010000000200001004000000010000009DFBFFFF0C02000000000000000000000000000001000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000FFFF02000B004354616262656450616E650040000001000000AE0F0000660000008011000030030000AE0500004F000000800700001903000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203201000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF0B00000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F070000000000000020000000000000FFFFFFFFFFFFFFFF7D010000DD000000AB060000E1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000018000200000000000007D0B000066000000AB100000F40000007D0100004F000000AB060000DD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFD20500004F000000D60500001D020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000D60F000066000000AB10000034020000D60500004F000000AB0600001D02000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF020100004F00000006010000190300000100000002000010040000000100000089FEFFFF29050000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000000A000066000000020B000030030000000000004F00000002010000190300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000069020000800700006D02000000000000010000000400000001000000000000000000000000000000000000000000000001000000C60000000000000001000000000000000000000001000000FFFFFFFFC003000044030000C4030000E603000000000000020000000400000000000000000000000000000000000000000000000000000001000000C600000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000019030000800700001D03000001000000010000100400000001000000BEFDFFFF4A010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000A00003403000080110000FD030000000000001D03000080070000E60300000000000040820056060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365010000007794000001000000FFFFFFFFFFFFFFFF01000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data> </DockMan> <ToolBar> <RegID>59392</RegID> <Name>File</Name> <Buttons> - <Len>2859</Len> - <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000841542B435245473F960000000000000014000841542B435245473F0013414952373830455F52657365745F7573617274046E766963032369660C41542B504F5745524D4F44451241542B504F5745524D4F44453D2250524F22043936303015556172745F5265436F6E6669674261756452617465063131353230300B536F636B65745F53656E6411486578546F417363696953656E645544500D73656E64206275662066756C6C0138114765745072657373416E644865696768740C494943325F5344415F4F5554126D69723364615F526561644F6E65427974650E494943325F53656E645F4279746509726561645F6279746507426172496E69740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> + <Len>2924</Len> + <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000F4F544146696C65446F776E6C6F6164960000000000000014000A5454535F454E41424C450328293B085350495F43535F480F4F544146696C65446F776E6C6F61640B444154415F4348414E4745106C5F7533324F544146696C6553697A65134F54415F4765744D757369635061636B4E756D0A4765745061636B4E756D0B415050325F4144524553531B4150505F434F4E4649475F4150504C49434154494F4E5F53495A45104D41585F524551554553545F53495A4504B2E2BEE00A4750494F5F50494E5F380B436D644170705F506F6C6C0C64696E677765695F666C61670B6465766963655F6E616D6522626C655F6466755F627574746F6E6C6573735F6173796E635F737663695F696E69740D73657276696365735F696E697412626C655F6466755F627574746F6E6C6573730D636C6F73655F756369756172740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> </Buttons> <OriginalItems> <Len>1423</Len> @@ -3579,7 +3579,7 @@ <Name>Debug</Name> <Buttons> <Len>2362</Len> - <Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020000002D0000000000000000000000000000000001000000010000000180F07F0000020000002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data> + <Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020000002D0000000000000000000000000000000001000000010000000180F07F0000020000002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data> </Buttons> <OriginalItems> <Len>898</Len> diff --git a/dualboots_Gai_youhua/keil/customboot/customboot.uvoptx b/dualboots_Gai_youhua/keil/customboot/customboot.uvoptx index ec8b8a3..c2686a9 100644 --- a/dualboots_Gai_youhua/keil/customboot/customboot.uvoptx +++ b/dualboots_Gai_youhua/keil/customboot/customboot.uvoptx @@ -148,24 +148,7 @@ <Name></Name> </SetRegEntry> </TargetDriverDllRegistry> - <Breakpoint> - <Bp> - <Number>0</Number> - <Type>0</Type> - <LineNumber>250</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>8882</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>1</BreakIfRCount> - <Filename>C:\git-mk8000\ChinaUWBProject - 4G瀹搞儱宕盉OOT\dualboots_Gai_youhua\src\customboot\customboot.c</Filename> - <ExecCommand></ExecCommand> - <Expression>\\customboot\../../src/customboot/customboot.c\250</Expression> - </Bp> - </Breakpoint> + <Breakpoint/> <WatchWindow1> <Ww> <count>0</count> diff --git a/dualboots_Gai_youhua/keil/dualboots.uvmpw.uvgui.WXK b/dualboots_Gai_youhua/keil/dualboots.uvmpw.uvgui.WXK index e9f1e69..fcaa5d4 100644 --- a/dualboots_Gai_youhua/keil/dualboots.uvmpw.uvgui.WXK +++ b/dualboots_Gai_youhua/keil/dualboots.uvmpw.uvgui.WXK @@ -20,17 +20,17 @@ <yPos>-1</yPos> </MaxPosition> <NormalPosition> - <Top>240</Top> - <Left>2660</Left> - <Right>4377</Right> - <Bottom>1169</Bottom> + <Top>377</Top> + <Left>2931</Left> + <Right>4648</Right> + <Bottom>1308</Bottom> </NormalPosition> </WindowPosition> <MDIClientArea> <RegID>0</RegID> <MDITabState> - <Len>2538</Len> - <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000012000000000000000100000068433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C796D6F64656D2E630000000008796D6F64656D2E6300000000C5D4F200FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C7372635C637573746F6D626F6F745C637573746F6D626F6F742E63000000000C637573746F6D626F6F742E6300000000FFDC7800FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C7372635C637573746F6D626F6F745C70696E5F636F6E6669672E63000000000C70696E5F636F6E6669672E6300000000BECEA100FFFFFFFF67433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F696F2E6800000000076D6B5F696F2E6800000000F0A0A100FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C417070436F6E6669672E68000000000B417070436F6E6669672E6800000000BCA8E100FFFFFFFF66433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D656E752E6300000000066D656E752E63000000009CC1B600FFFFFFFF69433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F756172742E6300000000096D6B5F756172742E6300000000F7B88600FFFFFFFF67433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F696F2E6300000000076D6B5F696F2E6300000000D9ADC200FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F63616C69622E63000000000A6D6B5F63616C69622E6300000000A5C2D700FFFFFFFF7E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C646576696365735C4D4B383030585C536F757263655C737461727475705F4D4B383030582E630000000010737461727475705F4D4B383030582E6300000000B3A6BE00FFFFFFFF5E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C637573746F6D626F6F742E736374000000000E637573746F6D626F6F742E73637400000000EAD6A300FFFFFFFF70433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F736C6565705F74696D65722E6300000000106D6B5F736C6565705F74696D65722E6300000000F6FA7D00FFFFFFFF69433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F6770696F2E6300000000096D6B5F6770696F2E6300000000B5E99D00FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F72657365742E63000000000A6D6B5F72657365742E63000000005FC3CF00FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F636C6F636B2E63000000000A6D6B5F636C6F636B2E6300000000C1838300FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F666C6173682E63000000000A6D6B5F666C6173682E6300000000CACAD500FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F666C6173682E68000000000A6D6B5F666C6173682E6800000000C5D4F200FFFFFFFF5E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C7365636F6E64626F6F745C7365636F6E64626F6F742E736374000000000E7365636F6E64626F6F742E73637400000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000130B0000660000008011000038030000</Data> + <Len>2659</Len> + <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000013000000120000000100000068433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C796D6F64656D2E630000000008796D6F64656D2E6300000000C5D4F200FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C7372635C637573746F6D626F6F745C637573746F6D626F6F742E63000000000C637573746F6D626F6F742E6300000000FFDC7800FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C7372635C637573746F6D626F6F745C70696E5F636F6E6669672E63000000000C70696E5F636F6E6669672E6300000000BECEA100FFFFFFFF67433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F696F2E6800000000076D6B5F696F2E6800000000F0A0A100FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C417070436F6E6669672E68000000000B417070436F6E6669672E6800000000BCA8E100FFFFFFFF66433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D656E752E6300000000066D656E752E63000000009CC1B600FFFFFFFF69433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F756172742E6300000000096D6B5F756172742E6300000000F7B88600FFFFFFFF67433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F696F2E6300000000076D6B5F696F2E6300000000D9ADC200FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F63616C69622E63000000000A6D6B5F63616C69622E6300000000A5C2D700FFFFFFFF7E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C646576696365735C4D4B383030585C536F757263655C737461727475705F4D4B383030582E630000000010737461727475705F4D4B383030582E6300000000B3A6BE00FFFFFFFF5E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C637573746F6D626F6F742E736374000000000E637573746F6D626F6F742E73637400000000EAD6A300FFFFFFFF70433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F736C6565705F74696D65722E6300000000106D6B5F736C6565705F74696D65722E6300000000F6FA7D00FFFFFFFF69433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F6770696F2E6300000000096D6B5F6770696F2E6300000000B5E99D00FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F72657365742E63000000000A6D6B5F72657365742E63000000005FC3CF00FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F636C6F636B2E63000000000A6D6B5F636C6F636B2E6300000000C1838300FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F666C6173682E63000000000A6D6B5F666C6173682E6300000000CACAD500FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F666C6173682E68000000000A6D6B5F666C6173682E6800000000C5D4F200FFFFFFFF5E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C7365636F6E64626F6F745C7365636F6E64626F6F742E736374000000000E7365636F6E64626F6F742E73637400000000FFDC7800FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C7372635C7365636F6E64626F6F745C7365636F6E64626F6F742E63000000000C7365636F6E64626F6F742E6300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000130B0000660000008011000038030000</Data> </MDITabState> </MDIClientArea> <ViewEx> @@ -1069,7 +1069,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000000C01000008030000</Data> + <Data>03000000660000000C01000090020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1089,7 +1089,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000003C0300007D070000CD030000</Data> + <Data>030000003C030000A8060000CD030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1109,7 +1109,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000003C0300007D070000CD030000</Data> + <Data>030000003C030000A8060000CD030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1169,7 +1169,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000003C0300007D070000CD030000</Data> + <Data>030000003C030000A8060000CD030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1189,7 +1189,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000003C0300007D070000CD030000</Data> + <Data>030000003C030000A8060000CD030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1718,14 +1718,14 @@ </Window> <DockMan> <Len>3312</Len> - <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFD9000000DD00000090050000E1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000D90A000066000000900F0000F4000000D90000004F00000090050000DD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFB70400004F000000BB04000023020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000BB0E000066000000900F00003A020000BB0400004F000000900500002302000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF0F0100004F0000001301000021030000010000000200001004000000010000002DFFFFFFA2060000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000000A0000660000000F0B000038030000000000004F0000000F010000210300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000000F020000900500001302000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000A00002A020000900F0000CC020000000000001302000090050000B502000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000013020000CC020000B502000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000210300008007000025030000010000000100001004000000010000000DFEFFFF21010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000A00003C03000080110000FD030000000000002503000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data> + <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFD9000000DD00000090050000E1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000D90A000066000000900F0000F4000000D90000004F00000090050000DD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFB70400004F000000BB04000023020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000BB0E000066000000900F00003A020000BB0400004F000000900500002302000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF0F0100004F0000001301000021030000010000000200001004000000010000002DFFFFFFA2060000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000000A0000660000000F0B0000C0020000000000004F0000000F010000210300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000000F020000900500001302000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000A00002A020000900F0000CC020000000000001302000090050000B502000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000013020000CC020000B502000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000210300008007000025030000010000000100001004000000010000000DFEFFFF21010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000A0000C4020000AB10000085030000000000002503000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data> </DockMan> <ToolBar> <RegID>59392</RegID> <Name>File</Name> <Buttons> - <Len>2615</Len> - <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000B415050325F41445245535396000000000000000400184150505F434F4E4649475F4941505F504152414D5F4D4150084150505F53495A450B415050325F414452455353043936303000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> + <Len>2909</Len> + <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A6C5F654442474D6F6465960000000000000014000A6C5F654442474D6F64650B6465766963655F6E616D650C434F4D5F494E54455256414C10534337413232485F6765745F5065646F10534C5F534337413232485F436865636B0B6D69723364615F696E697412416363656C65726F6D657465725F496E697412544350436C69656E745F4461746150726F630B5754353838455F504C41590A5350495F4D4F53495F48125350495F5754353838455F434F4D4D414E44085350495F43535F480A494F5F50554C4C5F5550085350495F43535F4C106770696F5F70696E5F7365745F6469720E5754353838453032425F496E697411626F6172645F70696E735F636F6E6669670C4750494F5F4449525F4F55540A4750494F5F4449525F54105754353838453032425F4465496E69740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> </Buttons> <OriginalItems> <Len>1423</Len> @@ -1781,21 +1781,21 @@ <ActiveMDIGroup>0</ActiveMDIGroup> <MDIGroup> <Size>100</Size> - <ActiveTab>0</ActiveTab> + <ActiveTab>18</ActiveTab> <Doc> <Name><2>.\include\drivers\ymodem.c</Name> - <ColumnNumber>37</ColumnNumber> - <TopLine>445</TopLine> - <CurrentLine>470</CurrentLine> + <ColumnNumber>0</ColumnNumber> + <TopLine>407</TopLine> + <CurrentLine>408</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> </Doc> <Doc> <Name><2>..\..\src\customboot\customboot.c</Name> - <ColumnNumber>86</ColumnNumber> - <TopLine>293</TopLine> - <CurrentLine>310</CurrentLine> + <ColumnNumber>7</ColumnNumber> + <TopLine>233</TopLine> + <CurrentLine>248</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> @@ -1820,16 +1820,16 @@ </Doc> <Doc> <Name><2>..\customboot\AppConfig.h</Name> - <ColumnNumber>22</ColumnNumber> - <TopLine>11</TopLine> - <CurrentLine>21</CurrentLine> + <ColumnNumber>35</ColumnNumber> + <TopLine>39</TopLine> + <CurrentLine>54</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> </Doc> <Doc> <Name><2>.\include\drivers\menu.c</Name> - <ColumnNumber>30</ColumnNumber> + <ColumnNumber>44</ColumnNumber> <TopLine>200</TopLine> <CurrentLine>209</CurrentLine> <Folding>1</Folding> @@ -1944,6 +1944,15 @@ <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> </Doc> + <Doc> + <Name><1>..\..\src\secondboot\secondboot.c</Name> + <ColumnNumber>23</ColumnNumber> + <TopLine>1</TopLine> + <CurrentLine>19</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> </MDIGroup> </MDIGroups> diff --git a/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.axf b/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.axf index 8391494..5109e70 100644 --- a/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.axf +++ b/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.axf Binary files differ diff --git a/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.build_log.htm b/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.build_log.htm index fdc6b88..d3836c9 100644 --- a/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.build_log.htm +++ b/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.build_log.htm @@ -26,12 +26,17 @@ <h2>Output:</h2> *** Using Compiler 'V6.14', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin' -Build Project 'secondboot' - Target 'MK8000 Release' +Rebuild Project 'secondboot' - Target 'MK8000 Release' Before Build - User command #1: C:\git-mk8000\ChinaUWBProject - 4G工卡BOOT\dualboots_Gai_youhua\keil\secondboot\..\..\tools\build_customboot.bat C:\Keil_v5\UV4\UV4.EXE ..\customboot\customboot.uvprojx ..\customboot\Output\customboot.bin ERRORLEVEL = 1 Before Build - User command #2: python ..\..\tools\secondboot_prebuild.py Binary file '../customboot/Output/customboot.bin' converted to C array in '../../src/secondboot/_customboot_image.c' with array name '_customboot_image' Extracted customboot __Vectors address: 0x0202a000 +compiling system_MK800X.c... +compiling mk_clock.c... +compiling startup_MK800X.c... +compiling mk_reset.c... +compiling mk_wdt.c... compiling secondboot.c... linking... Program Size: Code=376 RO-data=13792 RW-data=20 ZI-data=1024 @@ -51,7 +56,7 @@ C:\Keil_v5\ARM\PACK\MKSEMI\MK800X_DFP\1.0.3\Device\Include <h2>Collection of Component Files used:</h2> -Build Time Elapsed: 00:00:05 +Build Time Elapsed: 00:00:06 </pre> </body> </html> diff --git a/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.hex b/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.hex index 8a21cc1..f105d5e 100644 --- a/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.hex +++ b/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.hex @@ -622,7 +622,7 @@ :1026C0009FF90298FEF7B8FEFEF7F8FBC5C50202B7 :1026D000CC0C000010E802028CEA02024D4B3830AC :1026E00030302D426F6F744C6F616465722D5631BE -:1026F0002E31C6F4B6AF0D0A0000000000A00004A1 +:1026F0002E32C6F4B6AF0D0A0000000000A00004A0 :1027000000D00204CCCC0000BBBB0000AAAA000091 :10271000BDF8C8EB4F54412CC9FDBCB6C6F4B6AFEA :102720000D0A0000004005044F5441CDEAB3C92C06 @@ -871,7 +871,7 @@ :10365000000000000000000078D40202000000001A :103660000A56656E646F72093A204D4B53454D49B9 :103670000A43686970093A204D4B383030300A44AB -:10368000617465093A204D6179203233203230323D +:10368000617465093A204A756C202034203230324A :10369000350A56657273696F6E093A2056302E36B8 :1036A0002E320000000000000000000000000000BA :1036B000C036000000800002140000001802000064 @@ -884,8 +884,8 @@ :1037100000000000000000000000000000000000A9 :1037200078370000000000000A56656E646F720969 :103730003A204D4B53454D490A43686970093A2078 -:103740004D4B383030300A44617465093A2041707D -:103750007220313720323032350A56657273696F04 +:103740004D4B383030300A44617465093A204A756F +:103750006C20203420323032350A56657273696F1E :103760006E093A2056302E362E320000000000003E :08377000000000000000000051 :04000005000000C136 diff --git a/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.htm b/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.htm index 8948030..75ca1b4 100644 --- a/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.htm +++ b/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot.htm @@ -3,7 +3,7 @@ <title>Static Call Graph - [.\Objects\secondboot.axf]</title></head> <body><HR> <H1>Static Call Graph for image .\Objects\secondboot.axf</H1><HR> -<BR><P>#<CALLGRAPH># ARM Linker, 6140002: Last Updated: Fri May 23 10:12:55 2025 +<BR><P>#<CALLGRAPH># ARM Linker, 6140002: Last Updated: Fri Jul 4 09:25:07 2025 <BR><P> <H3>Maximum Stack Usage = 32 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3> Call chain for Maximum Stack Depth:</H3> diff --git a/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot_MK8000 Release.dep b/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot_MK8000 Release.dep index a792343..dade1a2 100644 --- a/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot_MK8000 Release.dep +++ b/dualboots_Gai_youhua/keil/secondboot/Objects/secondboot_MK8000 Release.dep @@ -78,7 +78,7 @@ I (include\drivers\mk_uart.h)(0x67E26686) I (include\drivers\mk_dma.h)(0x67E26686) I (C:\Keil_v5\ARM\ARMCLANG\include\stdarg.h)(0x5DDFFD72) -F (..\..\src\secondboot\_customboot_image.c)(0x682FD9A6)() +F (..\..\src\secondboot\_customboot_image.c)(0x68672D72)() F (..\..\src\secondboot\secondboot.c)(0x67E26686)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__MICROLIB -gdwarf-3 -O2 -ffunction-sections -Weverything -Wno-packed -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I .. -I ../../.. -I ./include/CMSIS/Include -I ./include/devices/MK800X/Include -I ./include/components/libc -I ./include/drivers -I ../../src/secondboot -I ../customboot -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter -I./RTE/_MK8000_Release -IC:/Keil_v5/ARM/PACK/MKSEMI/MK800X_DFP/1.0.3/Device/Include -IC:/Keil_v5/ARM/CMSIS/Include -D__UVISION_VERSION="530" -D_RTE_ -DSTD_LIBC -o ./objects/secondboot.o -MD) I (include\drivers\mk_wdt.h)(0x67E26686) I (include\drivers\mk_common.h)(0x67E26686) @@ -95,4 +95,4 @@ I (C:\Keil_v5\ARM\ARMCLANG\include\arm_acle.h)(0x5E0CC318) I (include\devices\MK800X\Include\system_MK800X.h)(0x67E26686) I (..\..\src\secondboot\user_config.h)(0x67E26686) -I (..\..\src\secondboot\_customboot_image.c)(0x682FD9A6) +I (..\..\src\secondboot\_customboot_image.c)(0x68672D72) diff --git a/dualboots_Gai_youhua/keil/secondboot/Output/secondboot.bin b/dualboots_Gai_youhua/keil/secondboot/Output/secondboot.bin index 683d619..39def5f 100644 --- a/dualboots_Gai_youhua/keil/secondboot/Output/secondboot.bin +++ b/dualboots_Gai_youhua/keil/secondboot/Output/secondboot.bin Binary files differ diff --git a/dualboots_Gai_youhua/keil/secondboot/secondboot.uvguix.WXK b/dualboots_Gai_youhua/keil/secondboot/secondboot.uvguix.WXK index 75b004d..ea11fb6 100644 --- a/dualboots_Gai_youhua/keil/secondboot/secondboot.uvguix.WXK +++ b/dualboots_Gai_youhua/keil/secondboot/secondboot.uvguix.WXK @@ -101,17 +101,17 @@ <yPos>-1</yPos> </MaxPosition> <NormalPosition> - <Top>240</Top> - <Left>2660</Left> - <Right>4377</Right> - <Bottom>1169</Bottom> + <Top>377</Top> + <Left>2931</Left> + <Right>4648</Right> + <Bottom>1308</Bottom> </NormalPosition> </WindowPosition> <MDIClientArea> <RegID>0</RegID> <MDITabState> - <Len>2538</Len> - <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000012000000000000000100000068433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C796D6F64656D2E630000000008796D6F64656D2E6300000000C5D4F200FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C7372635C637573746F6D626F6F745C637573746F6D626F6F742E63000000000C637573746F6D626F6F742E6300000000FFDC7800FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C7372635C637573746F6D626F6F745C70696E5F636F6E6669672E63000000000C70696E5F636F6E6669672E6300000000BECEA100FFFFFFFF67433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F696F2E6800000000076D6B5F696F2E6800000000F0A0A100FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C417070436F6E6669672E68000000000B417070436F6E6669672E6800000000BCA8E100FFFFFFFF66433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D656E752E6300000000066D656E752E63000000009CC1B600FFFFFFFF69433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F756172742E6300000000096D6B5F756172742E6300000000F7B88600FFFFFFFF67433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F696F2E6300000000076D6B5F696F2E6300000000D9ADC200FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F63616C69622E63000000000A6D6B5F63616C69622E6300000000A5C2D700FFFFFFFF7E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C646576696365735C4D4B383030585C536F757263655C737461727475705F4D4B383030582E630000000010737461727475705F4D4B383030582E6300000000B3A6BE00FFFFFFFF5E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C637573746F6D626F6F742E736374000000000E637573746F6D626F6F742E73637400000000EAD6A300FFFFFFFF70433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F736C6565705F74696D65722E6300000000106D6B5F736C6565705F74696D65722E6300000000F6FA7D00FFFFFFFF69433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F6770696F2E6300000000096D6B5F6770696F2E6300000000B5E99D00FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F72657365742E63000000000A6D6B5F72657365742E63000000005FC3CF00FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F636C6F636B2E63000000000A6D6B5F636C6F636B2E6300000000C1838300FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F666C6173682E63000000000A6D6B5F666C6173682E6300000000CACAD500FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F666C6173682E68000000000A6D6B5F666C6173682E6800000000C5D4F200FFFFFFFF5E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C7365636F6E64626F6F745C7365636F6E64626F6F742E736374000000000E7365636F6E64626F6F742E73637400000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000130B0000660000008011000038030000</Data> + <Len>2659</Len> + <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000013000000120000000100000068433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C796D6F64656D2E630000000008796D6F64656D2E6300000000C5D4F200FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C7372635C637573746F6D626F6F745C637573746F6D626F6F742E63000000000C637573746F6D626F6F742E6300000000FFDC7800FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C7372635C637573746F6D626F6F745C70696E5F636F6E6669672E63000000000C70696E5F636F6E6669672E6300000000BECEA100FFFFFFFF67433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F696F2E6800000000076D6B5F696F2E6800000000F0A0A100FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C417070436F6E6669672E68000000000B417070436F6E6669672E6800000000BCA8E100FFFFFFFF66433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D656E752E6300000000066D656E752E63000000009CC1B600FFFFFFFF69433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F756172742E6300000000096D6B5F756172742E6300000000F7B88600FFFFFFFF67433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F696F2E6300000000076D6B5F696F2E6300000000D9ADC200FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F63616C69622E63000000000A6D6B5F63616C69622E6300000000A5C2D700FFFFFFFF7E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C646576696365735C4D4B383030585C536F757263655C737461727475705F4D4B383030582E630000000010737461727475705F4D4B383030582E6300000000B3A6BE00FFFFFFFF5E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C637573746F6D626F6F742E736374000000000E637573746F6D626F6F742E73637400000000EAD6A300FFFFFFFF70433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F736C6565705F74696D65722E6300000000106D6B5F736C6565705F74696D65722E6300000000F6FA7D00FFFFFFFF69433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F6770696F2E6300000000096D6B5F6770696F2E6300000000B5E99D00FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F72657365742E63000000000A6D6B5F72657365742E63000000005FC3CF00FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F636C6F636B2E63000000000A6D6B5F636C6F636B2E6300000000C1838300FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F666C6173682E63000000000A6D6B5F666C6173682E6300000000CACAD500FFFFFFFF6A433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C637573746F6D626F6F745C696E636C7564655C647269766572735C6D6B5F666C6173682E68000000000A6D6B5F666C6173682E6800000000C5D4F200FFFFFFFF5E433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C6B65696C5C7365636F6E64626F6F745C7365636F6E64626F6F742E736374000000000E7365636F6E64626F6F742E73637400000000FFDC7800FFFFFFFF5B433A5C6769742D6D6B383030305C4368696E6155574250726F6A656374202D203447B9A4BFA8424F4F545C6475616C626F6F74735F4761695F796F756875615C7372635C7365636F6E64626F6F745C7365636F6E64626F6F742E63000000000C7365636F6E64626F6F742E6300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000130B0000660000008011000038030000</Data> </MDITabState> </MDIClientArea> <ViewEx> diff --git a/dualboots_Gai_youhua/src/customboot/customboot.c b/dualboots_Gai_youhua/src/customboot/customboot.c index c2625bc..98f8fbf 100644 --- a/dualboots_Gai_youhua/src/customboot/customboot.c +++ b/dualboots_Gai_youhua/src/customboot/customboot.c @@ -247,7 +247,7 @@ // uart_open(UART_ID1, &test_uart_cfg); // } - SerialPutString("MK8000-BootLoader-V1.1启动\r\n"); + SerialPutString("MK8000-BootLoader-V1.2启动\r\n"); while(1) { wdt_ping(WDT_ID0);//喂狗 diff --git a/dualboots_Gai_youhua/src/secondboot/_customboot_image.c b/dualboots_Gai_youhua/src/secondboot/_customboot_image.c index 811731b..1dd7f3f 100644 --- a/dualboots_Gai_youhua/src/secondboot/_customboot_image.c +++ b/dualboots_Gai_youhua/src/secondboot/_customboot_image.c @@ -586,7 +586,7 @@ 0xFE, 0xF7, 0xBE, 0xFE, 0x2A, 0xA0, 0xFE, 0xF7, 0x9F, 0xF9, 0x02, 0x98, 0xFE, 0xF7, 0xB8, 0xFE, 0xFE, 0xF7, 0xF8, 0xFB, 0xC5, 0xC5, 0x02, 0x02, 0xCC, 0x0C, 0x00, 0x00, 0x10, 0xE8, 0x02, 0x02, 0x8C, 0xEA, 0x02, 0x02, 0x4D, 0x4B, 0x38, 0x30, 0x30, 0x30, 0x2D, 0x42, 0x6F, 0x6F, 0x74, 0x4C, - 0x6F, 0x61, 0x64, 0x65, 0x72, 0x2D, 0x56, 0x31, 0x2E, 0x31, 0xC6, 0xF4, 0xB6, 0xAF, 0x0D, 0x0A, + 0x6F, 0x61, 0x64, 0x65, 0x72, 0x2D, 0x56, 0x31, 0x2E, 0x32, 0xC6, 0xF4, 0xB6, 0xAF, 0x0D, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0x04, 0x00, 0xD0, 0x02, 0x04, 0xCC, 0xCC, 0x00, 0x00, 0xBB, 0xBB, 0x00, 0x00, 0xAA, 0xAA, 0x00, 0x00, 0xBD, 0xF8, 0xC8, 0xEB, 0x4F, 0x54, 0x41, 0x2C, 0xC9, 0xFD, 0xBC, 0xB6, 0xC6, 0xF4, 0xB6, 0xAF, 0x0D, 0x0A, 0x00, 0x00, 0x00, 0x40, 0x05, 0x04, @@ -835,8 +835,8 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD4, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x56, 0x65, 0x6E, 0x64, 0x6F, 0x72, 0x09, 0x3A, 0x20, 0x4D, 0x4B, 0x53, 0x45, 0x4D, 0x49, 0x0A, 0x43, 0x68, 0x69, 0x70, 0x09, 0x3A, 0x20, - 0x4D, 0x4B, 0x38, 0x30, 0x30, 0x30, 0x0A, 0x44, 0x61, 0x74, 0x65, 0x09, 0x3A, 0x20, 0x4D, 0x61, - 0x79, 0x20, 0x32, 0x33, 0x20, 0x32, 0x30, 0x32, 0x35, 0x0A, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6F, + 0x4D, 0x4B, 0x38, 0x30, 0x30, 0x30, 0x0A, 0x44, 0x61, 0x74, 0x65, 0x09, 0x3A, 0x20, 0x4A, 0x75, + 0x6C, 0x20, 0x20, 0x34, 0x20, 0x32, 0x30, 0x32, 0x35, 0x0A, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6F, 0x6E, 0x09, 0x3A, 0x20, 0x56, 0x30, 0x2E, 0x36, 0x2E, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -- Gitblit v1.9.3