diff --git a/Project/JLinkSettings.ini b/Project/JLinkSettings.ini new file mode 100644 index 0000000..39b6d05 --- /dev/null +++ b/Project/JLinkSettings.ini @@ -0,0 +1,39 @@ +[BREAKPOINTS] +ForceImpTypeAny = 0 +ShowInfoWin = 1 +EnableFlashBP = 2 +BPDuringExecution = 0 +[CFI] +CFISize = 0x00 +CFIAddr = 0x00 +[CPU] +MonModeVTableAddr = 0xFFFFFFFF +MonModeDebug = 0 +MaxNumAPs = 0 +LowPowerHandlingMode = 0 +OverrideMemMap = 0 +AllowSimulation = 1 +ScriptFile="" +[FLASH] +CacheExcludeSize = 0x00 +CacheExcludeAddr = 0x00 +MinNumBytesFlashDL = 0 +SkipProgOnCRCMatch = 1 +VerifyDownload = 1 +AllowCaching = 1 +EnableFlashDL = 2 +Override = 0 +Device="ARM7" +[GENERAL] +WorkRAMSize = 0x00 +WorkRAMAddr = 0x00 +RAMUsageLimit = 0x00 +[SWO] +SWOLogFile="" +[MEM] +RdOverrideOrMask = 0x00 +RdOverrideAndMask = 0xFFFFFFFF +RdOverrideAddr = 0xFFFFFFFF +WrOverrideOrMask = 0x00 +WrOverrideAndMask = 0xFFFFFFFF +WrOverrideAddr = 0xFFFFFFFF diff --git a/Project/Last Loaded SY4.pdsbak b/Project/Last Loaded SY4.pdsbak index 0f8974e..7464c96 100644 Binary files a/Project/Last Loaded SY4.pdsbak and b/Project/Last Loaded SY4.pdsbak differ diff --git a/Project/SY4.pdsprj b/Project/SY4.pdsprj index 0b1dccc..c5ef37f 100644 Binary files a/Project/SY4.pdsprj and b/Project/SY4.pdsprj differ diff --git a/Project/SY4.pdsprj.MY-DELL-PC.dell.workspace b/Project/SY4.pdsprj.MY-DELL-PC.dell.workspace index 252ca1f..68276c9 100644 --- a/Project/SY4.pdsprj.MY-DELL-PC.dell.workspace +++ b/Project/SY4.pdsprj.MY-DELL-PC.dell.workspace @@ -35,7 +35,7 @@ - + @@ -372,12 +372,18 @@ 0 - + - + + + + 0 + 0 + + diff --git a/Project/SY4.uvguix.dell b/Project/SY4.uvguix.dell index 02ad551..8023c97 100644 --- a/Project/SY4.uvguix.dell +++ b/Project/SY4.uvguix.dell @@ -11,7 +11,7 @@ 38003 Registers - 115 67 + 115 143 346 @@ -85,17 +85,17 @@ -1 - 150 - 478 - 1119 - 778 + 33 + 614 + 1255 + 661 0 - 563 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000003000000010000000100000069643A5C55736572735C64656C6C5C4465736B746F705CD1A7CFB0C4DAC8DD5CB1BED1A7C6DAC4DAC8DD5CC7B6C8EBCABDCAB5D1E95CCAB5D1E9355CCAB5D1E935B1C8BDCFB1EAD7BCB5C4B9A4B3CCA3ACB4F8474954B0E6B1BEBFD8D6C65C555345525C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF6C643A5C55736572735C64656C6C5C4465736B746F705CD1A7CFB0C4DAC8DD5CB1BED1A7C6DAC4DAC8DD5CC7B6C8EBCABDCAB5D1E95CCAB5D1E9355CCAB5D1E935B1C8BDCFB1EAD7BCB5C4B9A4B3CCA3ACB4F8474954B0E6B1BEBFD8D6C65C555345525C54696D5C54696D2E63000000000554696D2E6300000000BECEA100FFFFFFFF6C643A5C55736572735C64656C6C5C4465736B746F705CD1A7CFB0C4DAC8DD5CB1BED1A7C6DAC4DAC8DD5CC7B6C8EBCABDCAB5D1E95CCAB5D1E9355CCAB5D1E935B1C8BDCFB1EAD7BCB5C4B9A4B3CCA3ACB4F8474954B0E6B1BEBFD8D6C65C555345525C4B65795C4B65792E6300000000054B65792E6300000000F0A0A100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000C40000006600000000060000B3020000 + 678 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000500000003000000010000004D443A5C55736572735C64656C6C5C4465736B746F705CD1A7CFB0C4DAC8DD5CB1BED1A7C6DAC4DAC8DD5CC7B6C8EBCABDCAB5D1E95CCAB5D1E9365C5359365C555345525C4B65795C4B65792E6300000000054B65792E6300000000FFDC7800FFFFFFFF4D443A5C55736572735C64656C6C5C4465736B746F705CD1A7CFB0C4DAC8DD5CB1BED1A7C6DAC4DAC8DD5CC7B6C8EBCABDCAB5D1E95CCAB5D1E9365C5359365C555345525C54696D5C54696D2E63000000000554696D2E6300000000BECEA100FFFFFFFF4D443A5C55736572735C64656C6C5C4465736B746F705CD1A7CFB0C4DAC8DD5CB1BED1A7C6DAC4DAC8DD5CC7B6C8EBCABDCAB5D1E95CCAB5D1E9365C5359365C555345525C4C65645C4C65642E6800000000054C65642E6800000000BCA8E100FFFFFFFF4A443A5C55736572735C64656C6C5C4465736B746F705CD1A7CFB0C4DAC8DD5CB1BED1A7C6DAC4DAC8DD5CC7B6C8EBCABDCAB5D1E95CCAB5D1E9365C5359365C555345525C6D61696E2E6300000000066D61696E2E6300000000F0A0A100FFFFFFFF51443A5C55736572735C64656C6C5C4465736B746F705CD1A7CFB0C4DAC8DD5CB1BED1A7C6DAC4DAC8DD5CC7B6C8EBCABDCAB5D1E95CCAB5D1E9365C5359365C555345525C6164635C6273705F6164632E6300000000096273705F6164632E6300000000BCA8E100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000100100006600000000060000B3020000 @@ -118,7 +118,7 @@ 16 - 560000006D0000008E020000DB000000 + 320300008F000000DE060000FD000000 @@ -134,7 +134,7 @@ 0 16 - 0300000066000000BD00000083020000 + 03000000660000000901000083020000 16 @@ -154,7 +154,7 @@ 0 16 - 0300000066000000BD00000083020000 + 03000000660000000901000083020000 16 @@ -174,7 +174,7 @@ 0 16 - 00000000A90100007004000017020000 + 03000000AC0100006D040000FE010000 16 @@ -194,7 +194,7 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000AC0100006D040000FE010000 16 @@ -214,7 +214,7 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000AC0100006D040000FE010000 16 @@ -234,7 +234,7 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000AC0100006D040000FE010000 16 @@ -254,7 +254,7 @@ 0 16 - B3030000660000006D040000D6000000 + B3030000660000006D0400008C010000 16 @@ -274,7 +274,7 @@ 0 16 - C40000006300000070040000BD000000 + C7000000660000006D040000A4000000 16 @@ -314,7 +314,7 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000AC0100006D040000FE010000 16 @@ -334,7 +334,7 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000AC0100006D040000FE010000 16 @@ -354,7 +354,7 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000AC0100006D040000FE010000 16 @@ -374,7 +374,7 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000AC0100006D040000FE010000 16 @@ -394,7 +394,7 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000AC0100006D040000FE010000 16 @@ -414,7 +414,7 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000AC0100006D040000FE010000 16 @@ -434,7 +434,7 @@ 0 16 - 0300000066000000BD00000083020000 + 03000000660000000901000083020000 16 @@ -454,7 +454,7 @@ 0 16 - 0300000066000000BD00000083020000 + 03000000660000000901000083020000 16 @@ -514,7 +514,7 @@ 0 16 - 03000000B70200006D040000F5020000 + 03000000B7020000FD050000F5020000 16 @@ -534,7 +534,7 @@ 0 16 - C40000006300000070040000BD000000 + C7000000660000006D040000A4000000 16 @@ -594,7 +594,7 @@ 0 16 - B00300006300000070040000A5010000 + B3030000660000006D0400008C010000 16 @@ -614,7 +614,7 @@ 0 16 - 00000000A90100007004000003020000 + 03000000AC0100006D040000FE010000 16 @@ -694,7 +694,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -714,7 +714,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -734,7 +734,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -754,7 +754,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -774,7 +774,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -794,7 +794,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -814,7 +814,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -834,7 +834,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -854,7 +854,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -874,7 +874,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -894,7 +894,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -914,7 +914,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -934,7 +934,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -954,7 +954,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -974,7 +974,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -994,7 +994,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1014,7 +1014,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1034,7 +1034,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1054,7 +1054,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1074,7 +1074,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1094,7 +1094,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1114,7 +1114,7 @@ 0 16 - 0300000066000000BD000000FE010000 + 03000000660000000901000083020000 16 @@ -1134,7 +1134,7 @@ 0 16 - 00000000B4020000700400000E030000 + 03000000B7020000FD050000F5020000 16 @@ -1154,7 +1154,7 @@ 0 16 - 03000000B70200006D040000F5020000 + 03000000B7020000FD050000F5020000 16 @@ -1174,7 +1174,7 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000AC0100006D040000FE010000 16 @@ -1194,7 +1194,7 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000AC0100006D040000FE010000 16 @@ -1214,7 +1214,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1234,7 +1234,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1254,7 +1254,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1274,7 +1274,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1294,7 +1294,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1314,7 +1314,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1334,7 +1334,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1354,7 +1354,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1374,7 +1374,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1394,7 +1394,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1414,7 +1414,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1434,7 +1434,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1454,7 +1454,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1474,7 +1474,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1494,7 +1494,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1514,7 +1514,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1534,7 +1534,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1554,7 +1554,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1574,7 +1574,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1594,7 +1594,7 @@ 0 16 - B3030000660000006D0400001A010000 + B3030000660000006D0400008C010000 16 @@ -1608,7 +1608,7 @@ 0 0 0 - 32767 + 940 0 8192 0 @@ -1648,7 +1648,7 @@ 0 0 0 - 32767 + 463 0 8192 1 @@ -1668,7 +1668,7 @@ 0 0 0 - 32767 + 612 0 8192 2 @@ -1683,14 +1683,14 @@ 3119 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BD00000070040000C1000000000000000100001004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000000000000560000006D0000008E020000DB000000C40000004F00000070040000BD0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200001004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000560000006D000000160100000D010000B00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFC00000004F000000C40000009C020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000560000006D000000160100000D010000000000004F000000C00000009C0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000091010000700400009501000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB09000001800080000000000000560000006D000000160100000D0100000000000095010000700400001702000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000950100003C0200001702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000009C02000000060000A0020000010000000100001004000000010000000000000000000000FFFFFFFF04000000C5000000C7000000B40100007794000001800080000001000000560000006D0000008E020000DB00000000000000A0020000000600000E0300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BD00000070040000C1000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000000000000320300008F000000DE060000FD000000C40000004F00000070040000BD0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000001E0600008F000000DE060000E5010000B00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF0C0100004F000000100100009C0200000100000002000010040000000100000074FEFFFF69040000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000006E0200008F0000007A030000DC020000000000004F0000000C0100009C0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000091010000700400009501000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB090000018000800000000000006E020000D5010000DE060000570200000000000095010000700400001702000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000950100003C0200001702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000009C02000000060000A0020000010000000100001004000000010000000000000000000000FFFFFFFF04000000C5000000C7000000B401000077940000018000800000010000006E020000E00200006E0800004E03000000000000A0020000000600000E0300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File 2230 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000454494D33960000000000000013000454494D33077538206461746104646174610673697A656F660B4644435F5245414428312902A3AC054750494F4210332C342C352C362C372C382C392C3130054750494F410E4144435F444154415B6A5D5B695D0454494D340A444546554C545F54494D0ECAB9C4DC444546554C545F54494D043130323403636832026368036368330952585F427566666572067072696E746600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000454494D33960000000000000013000454494D33077538206461746104646174610673697A656F660B4644435F5245414428312902A3AC054750494F4210332C342C352C362C372C382C392C3130054750494F410E4144435F444154415B6A5D5B695D0454494D340A444546554C545F54494D0ECAB9C4DC444546554C545F54494D043130323403636832026368036368330952585F427566666572067072696E746600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000 1423 @@ -1706,7 +1706,7 @@ Build 680 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E00000000000000000000000000000000010000000100000001809E8A0000000000001F0000000000000000000000000000000001000000010000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205000000000093137313439323130359600000000000000010009313731343932313035000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64FF7F0000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E00000000000000000000000000000000010000000100000001809E8A0000000000001F0000000000000000000000000000000001000000010000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205000000000093137313439323130359600000000000000010009313731343932313035000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64CF010000 583 @@ -1722,7 +1722,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000000000000100000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000000000000100000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000000000000100000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F720100000000000000000000000100000001000000000000000000000001000000000000000000054465627567FF7F0000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -1746,12 +1746,12 @@ 0 100 - 1 + 3 - ..\USER\main.c - 17 - 30 - 38 + ..\USER\Key\Key.c + 15 + 74 + 85 1 0 @@ -1759,17 +1759,35 @@ ..\USER\Tim\Tim.c 9 - 106 + 46 12 1 0 - ..\USER\Key\Key.c - 15 - 72 - 85 + ..\USER\Led\Led.h + 0 + 1 + 5 + 1 + + 0 + + + ..\USER\main.c + 27 + 35 + 42 + 1 + + 0 + + + ..\USER\adc\bsp_adc.c + 32 + 1 + 3 1 0 diff --git a/Project/SY4.uvoptx b/Project/SY4.uvoptx index cd6b1cd..b1cf978 100644 --- a/Project/SY4.uvoptx +++ b/Project/SY4.uvoptx @@ -28,7 +28,7 @@ 12000000 - 0 + 1 1 0 1 @@ -77,7 +77,7 @@ 0 1 - 0 + 18 0 @@ -269,90 +269,6 @@ 0 0 0 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c - stm32f10x_adc.c - 0 - 0 - - - 3 - 6 - 1 - 0 - 0 - 0 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c - stm32f10x_bkp.c - 0 - 0 - - - 3 - 7 - 1 - 0 - 0 - 0 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c - stm32f10x_can.c - 0 - 0 - - - 3 - 8 - 1 - 0 - 0 - 0 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c - stm32f10x_cec.c - 0 - 0 - - - 3 - 9 - 1 - 0 - 0 - 0 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c - stm32f10x_crc.c - 0 - 0 - - - 3 - 10 - 1 - 0 - 0 - 0 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c - stm32f10x_dac.c - 0 - 0 - - - 3 - 11 - 1 - 0 - 0 - 0 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dbgmcu.c - stm32f10x_dbgmcu.c - 0 - 0 - - - 3 - 12 - 1 - 0 - 0 - 0 ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c stm32f10x_dma.c 0 @@ -360,7 +276,7 @@ 3 - 13 + 6 1 0 0 @@ -372,31 +288,7 @@ 3 - 14 - 1 - 0 - 0 - 0 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c - stm32f10x_flash.c - 0 - 0 - - - 3 - 15 - 1 - 0 - 0 - 0 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_fsmc.c - stm32f10x_fsmc.c - 0 - 0 - - - 3 - 16 + 7 1 0 0 @@ -408,43 +300,7 @@ 3 - 17 - 1 - 0 - 0 - 0 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_i2c.c - stm32f10x_i2c.c - 0 - 0 - - - 3 - 18 - 1 - 0 - 0 - 0 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_iwdg.c - stm32f10x_iwdg.c - 0 - 0 - - - 3 - 19 - 1 - 0 - 0 - 0 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_pwr.c - stm32f10x_pwr.c - 0 - 0 - - - 3 - 20 + 8 1 0 0 @@ -456,7 +312,7 @@ 3 - 21 + 9 1 0 0 @@ -466,6 +322,150 @@ 0 0 + + 3 + 10 + 1 + 0 + 0 + 0 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c + stm32f10x_usart.c + 0 + 0 + + + 3 + 11 + 1 + 0 + 0 + 0 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c + stm32f10x_adc.c + 0 + 0 + + + 3 + 12 + 1 + 0 + 0 + 0 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c + stm32f10x_bkp.c + 0 + 0 + + + 3 + 13 + 1 + 0 + 0 + 0 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c + stm32f10x_can.c + 0 + 0 + + + 3 + 14 + 1 + 0 + 0 + 0 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c + stm32f10x_cec.c + 0 + 0 + + + 3 + 15 + 1 + 0 + 0 + 0 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c + stm32f10x_crc.c + 0 + 0 + + + 3 + 16 + 1 + 0 + 0 + 0 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c + stm32f10x_dac.c + 0 + 0 + + + 3 + 17 + 1 + 0 + 0 + 0 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dbgmcu.c + stm32f10x_dbgmcu.c + 0 + 0 + + + 3 + 18 + 1 + 0 + 0 + 0 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c + stm32f10x_flash.c + 0 + 0 + + + 3 + 19 + 1 + 0 + 0 + 0 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_fsmc.c + stm32f10x_fsmc.c + 0 + 0 + + + 3 + 20 + 1 + 0 + 0 + 0 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_i2c.c + stm32f10x_i2c.c + 0 + 0 + + + 3 + 21 + 1 + 0 + 0 + 0 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_iwdg.c + stm32f10x_iwdg.c + 0 + 0 + 3 22 @@ -473,6 +473,18 @@ 0 0 0 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_pwr.c + stm32f10x_pwr.c + 0 + 0 + + + 3 + 23 + 1 + 0 + 0 + 0 ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rtc.c stm32f10x_rtc.c 0 @@ -480,7 +492,7 @@ 3 - 23 + 24 1 0 0 @@ -492,7 +504,7 @@ 3 - 24 + 25 1 0 0 @@ -502,18 +514,6 @@ 0 0 - - 3 - 25 - 1 - 0 - 0 - 0 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c - stm32f10x_usart.c - 0 - 0 - 3 26 @@ -630,6 +630,18 @@ 0 0 + + 4 + 35 + 1 + 0 + 0 + 0 + ..\USER\adc\bsp_adc.c + bsp_adc.c + 0 + 0 + diff --git a/Project/SY4.uvprojx b/Project/SY4.uvprojx index 685753e..bcb27d2 100644 --- a/Project/SY4.uvprojx +++ b/Project/SY4.uvprojx @@ -335,7 +335,7 @@ USE_STDPERIPH_DRIVER,STM32F10X_LD - ..\Project;..\USER;..\Libraries\STM32F10x_StdPeriph_Driver\inc;..\Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x;..\Libraries\CMSIS\CM3\CoreSupport;..\USER\Delay;..\USER\Key;..\USER\Led;..\USER\Tim;..\USER\Usart;..\USER\Sys + ..\Project;..\USER;..\Libraries\STM32F10x_StdPeriph_Driver\inc;..\Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x;..\Libraries\CMSIS\CM3\CoreSupport;..\USER\Delay;..\USER\Key;..\USER\Led;..\USER\Tim;..\USER\Usart;..\USER\Sys;..\USER\adc @@ -409,6 +409,36 @@ 1 ..\Libraries\STM32F10x_StdPeriph_Driver\src\misc.c + + stm32f10x_dma.c + 1 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c + + + stm32f10x_exti.c + 1 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c + + + stm32f10x_gpio.c + 1 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c + + + stm32f10x_rcc.c + 1 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c + + + stm32f10x_tim.c + 1 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c + + + stm32f10x_usart.c + 1 + ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c + stm32f10x_adc.c 1 @@ -444,16 +474,6 @@ 1 ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dbgmcu.c - - stm32f10x_dma.c - 1 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c - - - stm32f10x_exti.c - 1 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c - stm32f10x_flash.c 1 @@ -464,11 +484,6 @@ 1 ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_fsmc.c - - stm32f10x_gpio.c - 1 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c - stm32f10x_i2c.c 1 @@ -484,16 +499,6 @@ 1 ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_pwr.c - - stm32f10x_rcc.c - 1 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c - - - stm32f10x_tim.c - 1 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c - stm32f10x_rtc.c 1 @@ -509,11 +514,6 @@ 1 ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c - - stm32f10x_usart.c - 1 - ..\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c - stm32f10x_wwdg.c 1 @@ -564,6 +564,11 @@ 1 ..\USER\Sys\Sys.c + + bsp_adc.c + 1 + ..\USER\adc\bsp_adc.c + diff --git a/USER/adc/bsp_adc.c b/USER/adc/bsp_adc.c new file mode 100644 index 0000000..9abed75 --- /dev/null +++ b/USER/adc/bsp_adc.c @@ -0,0 +1,121 @@ +#include "bsp_adc.h" + +__IO uint16_t ADC_ConvertedValue; + +static void ADCx_GPIO_Config(void) +{ + GPIO_InitTypeDef GPIO_InitStructure; + + // 打开 ADC IO端口时钟 + ADC_GPIO_APBxClock_FUN ( ADC_GPIO_CLK, ENABLE ); + + // 配置 ADC IO 引脚模式 + // 必须为模拟输入 + GPIO_InitStructure.GPIO_Pin = ADC_PIN; + GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AIN; + + // 初始化 ADC IO + GPIO_Init(ADC_PORT, &GPIO_InitStructure); +} + +// ANSI C标准，C89 标准 +// C99 +// C11 2011 + +static void ADCx_Mode_Config(void) +{ + DMA_InitTypeDef DMA_InitStructure; + //开启ADC_DMA时钟 + RCC_AHBPeriphClockCmd(ADC_DMA_CLK, ENABLE); + //初始化ADC_DMA通道 + DMA_DeInit(ADC_DMA_CHANNEL); + // 源数据地址 （ADC寄存器） + DMA_InitStructure.DMA_PeripheralBaseAddr = ( uint32_t ) ( & ( ADC_x->DR ) ); + // 目标地址 （内存中） + DMA_InitStructure.DMA_MemoryBaseAddr = (uint32_t)&ADC_ConvertedValue; + // 方向：外设到存储器 + DMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralSRC; + // 传输大小 + DMA_InitStructure.DMA_BufferSize = 1; + // 外设（内部的FLASH）地址递增 + DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable; + // 内存地址递增 + DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Disable; + // 外设数据单位 + DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_HalfWord; + // 内存数据单位 + DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_HalfWord; + // DMA模式，一次或者循环模式 + DMA_InitStructure.DMA_Mode = DMA_Mode_Circular; + //DMA_InitStructure.DMA_Mode = DMA_Mode_Circular; + // 优先级：高 + DMA_InitStructure.DMA_Priority = DMA_Priority_High; + // 使能内存到内存的传输 （否） + DMA_InitStructure.DMA_M2M = DMA_M2M_Disable; + // 配置DMA通道 + DMA_Init(ADC_DMA_CHANNEL, &DMA_InitStructure); + // 使能DMA + DMA_Cmd(ADC_DMA_CHANNEL , ENABLE); +/*----------------------------------------------------------------------*/ + + ADC_InitTypeDef ADC_InitStruct; + // 打开ADC时钟 + ADC_APBxClock_FUN ( ADC_CLK, ENABLE ); + // ADC 模式配置 + // 只使用一个ADC，属于独立模式 + ADC_InitStruct.ADC_Mode = ADC_Mode_Independent; + // 禁止扫描模式，多通道才要，单通道不需要 + ADC_InitStruct.ADC_ScanConvMode = DISABLE; + // 连续转换模式 + ADC_InitStruct.ADC_ContinuousConvMode = ENABLE; + // 不用外部触发转换，软件开启即可 + ADC_InitStruct.ADC_ExternalTrigConv = ADC_ExternalTrigConv_None; + // 转换结果右对齐 + ADC_InitStruct.ADC_DataAlign = ADC_DataAlign_Right; + // 转换通道1个 + ADC_InitStruct.ADC_NbrOfChannel = 1; + // 初始化ADC + ADC_Init(ADC_x, &ADC_InitStruct); + // 配置ADC时钟为PCLK2的8分频，即9MHz + RCC_ADCCLKConfig(RCC_PCLK2_Div8); + // 配置 ADC 通道转换顺序和采样时间 + ADC_RegularChannelConfig(ADC_x, ADC_CHANNEL, 1, ADC_SampleTime_55Cycles5); + + // 使能ADC DMA 请求 + ADC_DMACmd(ADC_x, ENABLE); + // 开启ADC ，并开始转换 + ADC_Cmd(ADC_x, ENABLE); + // ADC开始校准 + ADC_StartCalibration(ADC_x); + // 等待校准完成 + while(ADC_GetCalibrationStatus(ADC_x)); + // 由于没有采用外部触发，所以使用软件触发ADC转换 + ADC_SoftwareStartConvCmd(ADC_x, ENABLE); +} + +void ADCx_Init(void) +{ + ADCx_GPIO_Config(); + ADCx_Mode_Config(); +} + +//typedef struct +//{ +// uint32_t DMA_PeripheralBaseAddr; // 外设地址 +// uint32_t DMA_MemoryBaseAddr; // 存储器地址 +// uint32_t DMA_DIR; // 传输方向 +// uint32_t DMA_BufferSize; // 传输数目 +// uint32_t DMA_PeripheralInc; // 外设地址增量模式 +// uint32_t DMA_MemoryInc; // 存储器地址增量模式 +// uint32_t DMA_PeripheralDataSize; // 外设数据宽度 +// uint32_t DMA_MemoryDataSize; // 存储器数据宽度 +// uint32_t DMA_Mode; // 模式选择 +// uint32_t DMA_Priority; // 通道优先级 +// uint32_t DMA_M2M; // 存储器到存储器模式 +//}DMA_InitTypeDef; + + + + + + diff --git a/USER/adc/bsp_adc.h b/USER/adc/bsp_adc.h new file mode 100644 index 0000000..e1fbbbb --- /dev/null +++ b/USER/adc/bsp_adc.h @@ -0,0 +1,32 @@ +#ifndef __BSP_ADC_H +#define __BSP_ADC_H + + +#include "stm32f10x.h" + +// ADC GPIO宏定义 +// 注意：用作ADC采集的IO必须没有复用，否则采集电压会有影响 +#define ADC_GPIO_APBxClock_FUN RCC_APB2PeriphClockCmd +#define ADC_GPIO_CLK RCC_APB2Periph_GPIOC +#define ADC_PORT GPIOC +#define ADC_PIN GPIO_Pin_1 + + +// ADC 编号选择 +// 可以是 ADC1/2，如果使用ADC3，中断相关的要改成ADC3的 +#define ADC_APBxClock_FUN RCC_APB2PeriphClockCmd +#define ADC_x ADC1 +#define ADC_CLK RCC_APB2Periph_ADC1 + +// ADC 通道宏定义 +#define ADC_CHANNEL ADC_Channel_11 + +#define ADC_DMA_CLK RCC_AHBPeriph_DMA1 +#define ADC_DMA_CHANNEL DMA1_Channel1 + +extern __IO uint16_t ADC_ConvertedValue; +void ADCx_Init(void); + +#endif /* __BSP_ADC_H */ + + diff --git a/USER/main.c b/USER/main.c index de0f2b3..5817b61 100644 --- a/USER/main.c +++ b/USER/main.c @@ -16,6 +16,7 @@ #include "Key.h" #include "Sys.h" #include "bsp_usart.h" +#include "bsp_adc.h" /* Private typedef -----------------------------------------------------------*/ /* Private define ------------------------------------------------------------*/ @@ -26,15 +27,15 @@ int main(void) { - u16 led0pwmval=0; RCC_Configuration(); NVIC_PriorityGroupConfig(NVIC_PriorityGroup_2); //设置NVIC中断分组2:2位抢占优先级，2位响应优先级 LED_GPIO_INIT(); KEY_INIT(); TIM2_INIT(499,4999); - TIM3_PWM_INIT(9,499); - USART_Config(9600); + TIM3_PWM_INIT(4096,2); + USART_Config(9600); + ADCx_Init(); printf("\r\n说明：\r\n"); printf("0--关闭流水灯\r\n"); printf("1到4--打开指定灯\r\n"); @@ -43,13 +44,8 @@ int main(void) printf("?--查看说明\r\n"); while (1) { - delay(100000); - - led0pwmval+=1; - - if(led0pwmval>9)led0pwmval=0; - - TIM_SetCompare2(TIM3,led0pwmval); + delay(100000); + TIM_SetCompare2(TIM3,ADC_ConvertedValue); } }