diff --git a/.vscode/settings.json b/.vscode/settings.json index 0fd492b..959fbf1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -13,6 +13,8 @@ "task_bedalarm.h": "c", "asp_lowpower.h": "c", "debug_drv.h": "c", - "task_screen_save.h": "c" + "task_screen_save.h": "c", + "app_screen_save.h": "c", + "msp_eeprom.h": "c" } } \ No newline at end of file diff --git a/keilp/stcTTSS2_W5.uvguix.Administrator b/keilp/stcTTSS2_W5.uvguix.Administrator index b5d7bf4..4b062ef 100644 --- a/keilp/stcTTSS2_W5.uvguix.Administrator +++ b/keilp/stcTTSS2_W5.uvguix.Administrator @@ -1,7 +1,7 @@ - -5.1 + -6.1
### uVision Project, (C) Keil Software
@@ -11,17 +11,17 @@ 38003 Registers - 115 275 + 115 67 346 Code Coverage - 850 160 + 770 160 204 Performance Analyzer - 1010 + 930 @@ -30,25 +30,25 @@ 1506 Symbols - 133 133 133 + 64 64 64 1936 Watch 1 - 133 133 133 + 200 133 133 1937 Watch 2 - 133 133 133 + 200 133 133 1935 Call Stack + Locals - 133 133 133 + 200 133 133 2506 @@ -56,8 +56,16 @@ 75 135 130 95 70 230 200 150 + + 466 + Source Browser + 500 + 300 + + + 1 @@ -83,17 +91,17 @@ -1 - 87 - 312 - 1752 - 874 + 0 + 395 + 1547 + 593 0 - 296 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000002000000000000000100000026453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F73637265656E2E63000000000D7461736B5F73637265656E2E6300000000BECEA100FFFFFFFF1F453A5C5765696768742D464C545C736F757263655C6170705C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F7000000660000008007000069030000 + 562 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000400000002000000010000003B433A5C55736572735C41646D696E6973747261746F725C4465736B746F705C5765696768742D464C545C736F757263655C6170705C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF42433A5C55736572735C41646D696E6973747261746F725C4465736B746F705C5765696768742D464C545C736F757263655C6170705C7461736B5F73637265656E2E63000000000D7461736B5F73637265656E2E6300000000FFDC7800FFFFFFFF46433A5C55736572735C41646D696E6973747261746F725C4465736B746F705C5765696768742D464C545C736F757263655C6170705C6170705F73637265656E5F736176652E6300000000116170705F73637265656E5F736176652E6300000000BECEA100FFFFFFFF46433A5C55736572735C41646D696E6973747261746F725C4465736B746F705C5765696768742D464C545C736F757263655C6170705C6170705F73637265656E5F736176652E6800000000116170705F73637265656E5F736176652E6800000000F0A0A100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000001D01000066000000000600007B020000 @@ -112,11 +120,11 @@ 0 16 - 940100004F00000090050000DF000000 + C40000004F00000070040000BD000000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -132,11 +140,11 @@ 0 16 - 0300000066000000F000000039030000 + 0300000066000000160100004B020000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -152,11 +160,11 @@ 0 16 - 0300000066000000F000000039030000 + 0300000066000000160100004B020000 16 - F2000000090100000E02000049030000 + A4000000BB0000008701000077020000 @@ -172,11 +180,11 @@ 0 16 - 000000002D02000090050000BD020000 + 00000000A90100007004000017020000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -192,11 +200,11 @@ 0 16 - 03000000300200008D05000090020000 + 03000000AC0100006D040000EA010000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -212,11 +220,11 @@ 0 16 - 03000000300200008D05000090020000 + 03000000AC0100006D040000EA010000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -232,11 +240,11 @@ 0 16 - 03000000300200008D05000090020000 + 03000000AC0100006D040000EA010000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -252,11 +260,11 @@ 0 16 - 03040000660000008D050000C6010000 + B3030000660000006D040000D6000000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -272,11 +280,11 @@ 0 16 - 940100006300000090050000DF000000 + C7000000660000006D040000A4000000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -292,11 +300,11 @@ 0 16 - 03000000300200008D050000A4020000 + 03000000AC0100006D040000FE010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -312,11 +320,11 @@ 0 16 - 03000000300200008D05000090020000 + 03000000AC0100006D040000EA010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -332,11 +340,11 @@ 0 16 - 03000000300200008D05000090020000 + 03000000AC0100006D040000EA010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -352,11 +360,11 @@ 0 16 - 03000000300200008D05000090020000 + 03000000AC0100006D040000EA010000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -372,11 +380,11 @@ 0 16 - 03000000300200008D05000090020000 + 03000000AC0100006D040000EA010000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -392,11 +400,11 @@ 0 16 - 03000000300200008D05000090020000 + 03000000AC0100006D040000EA010000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -412,11 +420,11 @@ 0 16 - 03000000300200008D05000090020000 + 03000000AC0100006D040000EA010000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -432,11 +440,11 @@ 0 16 - 0300000066000000F000000039030000 + 0300000066000000160100004B020000 16 - F2000000090100000E02000049030000 + A4000000BB0000008701000077020000 @@ -452,11 +460,11 @@ 0 16 - 0300000066000000F000000039030000 + 0300000066000000160100004B020000 16 - F2000000090100000E02000049030000 + A4000000BB0000008701000077020000 @@ -472,11 +480,11 @@ 0 16 - 000000006A03000080070000E6030000 + 000000007C020000000600000E030000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -492,11 +500,11 @@ 0 16 - 000000001902000090050000BD020000 + 00000000950100007004000017020000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -512,11 +520,11 @@ 0 16 - 030000006D0300008D050000CD030000 + 030000007F0200006D040000BD020000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -532,11 +540,11 @@ 0 16 - 940100006300000090050000DF000000 + C40000006300000070040000BD000000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -552,11 +560,11 @@ 0 16 - 97010000660000008D050000C6000000 + C7000000660000006D040000A4000000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -592,11 +600,11 @@ 0 16 - 00040000630000009005000029020000 + B00300006300000070040000A5010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -612,11 +620,11 @@ 0 16 - 000000002D02000090050000A9020000 + 00000000A90100007004000003020000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -632,11 +640,11 @@ 0 16 - 97010000660000008D050000C6000000 + C7000000660000006D040000A4000000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -652,11 +660,31 @@ 0 16 - 97010000660000008D050000C6000000 + C7000000660000006D040000A4000000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 + + + + 35141 + 35141 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + C40000006300000070040000BD000000 + + + 16 + A4000000BB000000640100005B010000 @@ -672,11 +700,11 @@ 0 16 - 97010000660000008D050000C6000000 + C7000000660000006D040000A4000000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -692,11 +720,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -712,11 +740,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -732,11 +760,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -752,11 +780,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -772,11 +800,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -792,11 +820,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -812,11 +840,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -832,11 +860,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -852,11 +880,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -872,11 +900,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -892,11 +920,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -912,11 +940,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -932,11 +960,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -952,11 +980,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -972,11 +1000,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -992,11 +1020,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -1012,11 +1040,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -1032,11 +1060,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -1052,11 +1080,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -1072,11 +1100,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -1092,11 +1120,11 @@ 0 16 - 03040000660000008D0500007C010000 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -1112,11 +1140,11 @@ 0 16 - 03000000660000008D010000A4020000 + 0300000066000000BD000000FE010000 16 - F2000000090100000E02000049030000 + A4000000BB0000008701000077020000 @@ -1132,11 +1160,11 @@ 0 16 - 000000006A03000090050000E6030000 + 000000007C02000070040000D6020000 16 - F200000009010000BA03000099010000 + A4000000BB000000DC02000029010000 @@ -1152,11 +1180,11 @@ 0 16 - 030000006D0300008D050000CD030000 + 030000007F0200006D040000BD020000 16 - F2000000090100000E02000049030000 + A4000000BB0000008701000077020000 @@ -1172,11 +1200,11 @@ 0 16 - 03000000300200008D05000090020000 + 03000000AC0100006D040000EA010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 @@ -1192,11 +1220,471 @@ 0 16 - 03000000300200008D05000090020000 + 03000000AC0100006D040000EA010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 463 + 463 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 030000007F0200006D040000BD020000 + + + 16 + A4000000BB0000008701000077020000 + + + + 466 + 466 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 030000007F0200006D040000BD020000 + + + 16 + A4000000BB0000008701000077020000 + + + + 470 + 470 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + C7000000660000006D040000A4000000 + + + 16 + A4000000BB000000DC02000029010000 + + + + 50000 + 50000 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50001 + 50001 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50002 + 50002 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50003 + 50003 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50004 + 50004 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50005 + 50005 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50006 + 50006 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50007 + 50007 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50008 + 50008 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 16 - F2000000090100008202000099020000 + A4000000BB000000640100005B010000 + + + + 50009 + 50009 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50010 + 50010 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50011 + 50011 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50012 + 50012 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50013 + 50013 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50014 + 50014 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50015 + 50015 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50016 + 50016 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50017 + 50017 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50018 + 50018 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 + + + + 50019 + 50019 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + B3030000660000006D0400001A010000 + + + 16 + A4000000BB000000640100005B010000 @@ -1212,7 +1700,7 @@ 0 16 - 0000000000000000B70300001C000000 + 0000000000000000C40300001C000000 16 @@ -1232,7 +1720,7 @@ 0 16 - 00000000E603000080070000F9030000 + 000000000E0300000006000021030000 16 @@ -1246,13 +1734,13 @@ 0 0 0 - 32767 + 476 0 8192 - 1 + 2 16 - 000000001C000000DA01000038000000 + 000000001C000000E701000038000000 16 @@ -1269,26 +1757,46 @@ 32767 0 8192 - 2 + 1 16 - 00000000380000006F02000054000000 + 000000001C0000006F02000038000000 16 0A0000000A0000006E0000006E000000 + + 824 + 824 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 03000000AC0100006D040000EA010000 + + + 16 + A4000000BB000000640100005B010000 + + - 2619 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFF94010000DF00000090050000E3000000000000000100001004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000000000000F200000009010000BA03000099010000940100004F00000090050000DF0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFFC0300004F0000000004000029020000000000000200001004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000001800040000000000000F2000000090100008202000099020000000400004F00000090050000290200000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF30000004F000000F7000000520300000100000002000010040000000100000072FEFFFFE7050000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000F2000000090100008202000099020000000000004F000000F3000000520300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB09000001800080000000000000F2000000090100008202000099020000000000001902000090050000BD02000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000520300008007000056030000010000000100001004000000010000000000000000000000FFFFFFFF04000000C5000000C7000000B40100007794000001800080000001000000F200000009010000BA03000099010000000000005603000080070000E60300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 3317 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BD00000070040000C1000000000000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000A4000000BB000000DC02000029010000C40000004F00000070040000BD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200001004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A4000000BB000000640100005B010000B00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF190100004F0000001D010000640200000100000002000010040000000100000042FFFFFF37050000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000A4000000BB000000640100005B010000000000004F00000019010000640200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000091010000700400009501000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000A4000000BB000000640100005B0100000000000095010000700400001702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000950100003C0200001702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000064020000000600006802000001000000010000100400000001000000B8FDFFFF6C000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000A4000000BB000000DC020000290100000000000068020000000600000E0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF1346696E6420416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2357 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000077072696E74663196000000000000001400077072696E7466310C4C335F7461736B5F735F676F0C6273705F626C65645F736574024C3004656C73650EE58FAFE58F98E6B3A2E789B9E78E0FE58FAFE58F98E6B3A2E789B9E78E3F094C305F74696D6572300764656275676F6B0D445F7379735F4A69666669657311545950455F4A4946464945535F32354D5309636D64206572726F7218E5AE9AE4B989E68EA5E694B6E5A484E79086E58D8FE8AEAE1AE5AE9AE4B989E68EA5E694B6E5A484E79086E58D8FE8AEAE466604636D642004307833351B74735F557265635B445F55415254315D2E6F76657274696D655F741574735F557265635B445F55415254315D2E69646C651374735F557265635B445F55415254315D2E6F6B0270640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F50726F6A6563742057696E646F7773000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000 + 2271 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A6C65645F737461747573960000000000000004000A6C65645F7374617475730652585F436E7407425F52585F4F4B05707562773200000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000 1423 @@ -1303,8 +1811,8 @@ 59399 Build - 684 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E00000000000000000000000000000000010000000100000001809E8A0000000000001F0000000000000000000000000000000001000000010000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000B5354433848334B36345332960000000000000001000B5354433848334B36345332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64FF7F0000 + 982 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000B5354433848334B36345332960000000000000001000B5354433848334B36345332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1319,8 +1827,8 @@ 59400 Debug - 2220 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000002001380D88B000000000000310000000757617463682031000000000000000000000000010000000100000000000000000000000100000000001380D98B0000000000003100000007576174636820320000000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000084D656D6F72792031000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000084D656D6F72792032000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000084D656D6F72792033000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000084D656D6F727920340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000755415254202331000000000000000000000000010000000100000000000000000000000100000000001380940700000000000033000000075541525420233200000000000000000000000001000000010000000000000000000000010000000000138095070000000000003300000007554152542023330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000000E49544D2F525441205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380658A000000000000340000000E4C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E00000014506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000D436F646520436F76657261676500000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000000000000100000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138001890000000000003600000007546F6F6C626F7800000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000000000000100000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000000000000100000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F720100000000000000000000000100000001000000000000000000000001000000000000000000054465627567FF7F0000 + 2373 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000000000000100000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000000000000100000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000000000000100000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F720100000000000000000000000100000001000000000000000000000001000000000000000000054465627567FF7F0000 898 @@ -1333,8 +1841,8 @@ 0 - 1920 - 1080 + 1536 + 864 @@ -1344,21 +1852,39 @@ 0 100 - 0 + 2 + + ..\source\app\main.c + 0 + 1 + 1 + 1 + + 0 + ..\source\app\task_screen.c - 72 - 130 - 146 + 0 + 162 + 187 1 0 - ..\source\app\main.c + ..\source\app\app_screen_save.c 0 - 3 - 22 + 1 + 10 + 1 + + 0 + + + ..\source\app\app_screen_save.h + 2 + 1 + 20 1 0 diff --git a/keilp/stcTTSS2_W5.uvoptx b/keilp/stcTTSS2_W5.uvoptx index f7fb5db..46bc5b2 100644 --- a/keilp/stcTTSS2_W5.uvoptx +++ b/keilp/stcTTSS2_W5.uvoptx @@ -100,6 +100,9 @@ 1 0 0 + 1 + 0 + 0 -1 @@ -146,6 +149,16 @@ 0 + 0 + 0 + + + + + + + + @@ -160,7 +173,6 @@ 1 1 0 - 1 0 0 ..\source\app\app_weight.c @@ -173,7 +185,6 @@ 2 1 0 - 1 0 0 ..\source\app\main.c @@ -186,7 +197,6 @@ 3 1 0 - 1 0 0 ..\source\app\app_config.c @@ -199,7 +209,6 @@ 4 1 0 - 1 0 0 ..\source\app\task_screen.c @@ -207,6 +216,30 @@ 0 0 + + 1 + 5 + 1 + 1 + 0 + 0 + ..\source\app\app_screen_save.c + app_screen_save.c + 0 + 0 + + + 1 + 6 + 1 + 0 + 0 + 0 + ..\source\app\task_bedalarm.c + task_bedalarm.c + 0 + 0 + @@ -217,10 +250,9 @@ 0 2 - 5 + 7 1 0 - 1 0 0 ..\source\asp\asp_schain.c @@ -230,10 +262,9 @@ 2 - 6 + 8 1 0 - 1 0 0 ..\source\asp\asp_lowpower.c @@ -251,10 +282,9 @@ 0 3 - 7 + 9 2 0 - 1 0 0 ..\source\cpu\STARTUP.A51 @@ -264,10 +294,9 @@ 3 - 8 + 10 1 0 - 1 0 0 ..\source\cpu\stc_8_delay.c @@ -285,10 +314,9 @@ 0 4 - 9 + 11 1 0 - 1 0 0 ..\source\msp\uart\msp_uartN.c @@ -298,10 +326,9 @@ 4 - 10 + 12 1 0 - 1 0 0 ..\source\msp\msp_time2.c @@ -311,10 +338,9 @@ 4 - 11 + 13 1 0 - 1 0 0 ..\source\msp\uart\msp_uart1.c @@ -324,10 +350,9 @@ 4 - 12 + 14 1 0 - 1 0 0 ..\source\msp\msp_iicMx.c @@ -337,10 +362,9 @@ 4 - 13 + 15 1 0 - 1 0 0 ..\source\msp\msp_eeprom.c @@ -350,10 +374,9 @@ 4 - 14 + 16 1 0 - 1 0 0 ..\source\msp\msp_adc.c @@ -371,10 +394,9 @@ 0 5 - 15 + 17 1 0 - 1 0 0 ..\source\bsp\TTSSbsp\bsp_config.c @@ -384,10 +406,9 @@ 5 - 16 + 18 1 0 - 1 0 0 ..\source\bsp\bsp_led.c @@ -397,10 +418,9 @@ 5 - 17 + 19 1 0 - 1 0 0 ..\source\bsp\bsp_cs1232.c @@ -418,10 +438,9 @@ 0 6 - 18 + 20 1 1 - 1 0 0 ..\source\ctask\TTSS_task.c @@ -431,10 +450,9 @@ 6 - 19 + 21 1 0 - 1 0 0 ..\source\ctask\TTSS_tick.c @@ -444,10 +462,9 @@ 6 - 20 + 22 1 0 - 1 0 0 ..\source\ctask\TTSS_time_stc.c @@ -465,10 +482,9 @@ 0 7 - 21 + 23 1 0 - 1 0 0 ..\source\tpc\tpc_road.c @@ -486,10 +502,9 @@ 0 8 - 22 + 24 1 1 - 1 0 0 ..\source\clib\c_lib.c @@ -499,10 +514,9 @@ 8 - 23 + 25 1 0 - 1 0 0 ..\source\clib\c_delay.c @@ -520,10 +534,9 @@ 0 9 - 24 + 26 5 0 - 1 0 0 ..\source\debug\cc_as_stc01_main.ini @@ -533,10 +546,9 @@ 9 - 25 + 27 1 0 - 1 0 0 ..\source\debug\debug_drv.c diff --git a/keilp/stcTTSS2_W5.uvprojx b/keilp/stcTTSS2_W5.uvprojx index bd67878..7412291 100644 --- a/keilp/stcTTSS2_W5.uvprojx +++ b/keilp/stcTTSS2_W5.uvprojx @@ -10,6 +10,7 @@ STC8H3K64S2 0x0 MCS-51 + 0 STC8H3K64S4 Series @@ -123,47 +124,6 @@ 0 16 - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 1 - - - 0 - 1 - 0 - 1 - 1 - 1 - 0 - 1 - 1 - 1 - - 0 - -1 - - - - - - - - - - - - - - - @@ -217,12 +177,14 @@ 0 0 0 + 0 0 0 0 0 0 0 + 0 0 0 0 @@ -292,6 +254,16 @@ 0x0 0x0 + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + @@ -383,6 +355,16 @@ 1 ..\source\app\task_screen.c + + app_screen_save.c + 1 + ..\source\app\app_screen_save.c + + + task_bedalarm.c + 1 + ..\source\app\task_bedalarm.c + diff --git a/source/app/app_config.h b/source/app/app_config.h index f3f2787..ffaec6c 100644 --- a/source/app/app_config.h +++ b/source/app/app_config.h @@ -224,6 +224,9 @@ typedef struct global_register //离床报警手动解除标志 U8 ForbidDelate_flag; + + //离床报警参考重量 + U16 Weight_Ref; //功耗模式 U8 power_mode; diff --git a/source/app/task_screen_save.c b/source/app/app_screen_save.c similarity index 74% rename from source/app/task_screen_save.c rename to source/app/app_screen_save.c index 6af0834..5b65c81 100644 --- a/source/app/task_screen_save.c +++ b/source/app/app_screen_save.c @@ -1,31 +1,29 @@ -#include "task_screen_save.h" - - -#define SCREEN_SAVE_LEN 10 - -#define EEPROM_WEIGHT_ADDR 0x100 +#include "app_screen_save.h" +#include "../msp/msp_eeprom.h" +//定义所使用内存的起始和结尾标志 #define HEAD0 0xa3 #define HEAD1 0xa4 #define TAIL0 0xa5 #define TAIL1 0xa6 +SCREEN_SAVE screen_save_arr[SCREEN_SAVE_LEN] = {0}; -SCREEN_SAVE screen_save_arr[SCREEN_SAVE_LEN]; - +//初始化存放重量数据的结构体数组screen_save_arr void screen_save_init() { + int i = 0; for(i = 0;i < SCREEN_SAVE_LEN; i++) { screen_save_arr[i].head[0] = HEAD0; screen_save_arr[i].head[1] = HEAD1; - screen_save_arr[i].kgx10_out = 0; screen_save_arr[i].available = 0; + screen_save_arr[i].kgx10_out = 0; screen_save_arr[i].tail[0] = TAIL0; screen_save_arr[i].tail[1] = TAIL1; } } - +//存放重量数据到eeprom中 void screen_save_push(U16 weight) { int i = 0; @@ -40,7 +38,7 @@ void screen_save_push(U16 weight) // 遍历寻找空位 for(i = 0;i < SCREEN_SAVE_LEN; i++) { - if(screen_save_arr[i].available =! 1) + if(screen_save_arr[i].available != 0) { free = i; break; @@ -49,14 +47,14 @@ void screen_save_push(U16 weight) // 当都有数据时 if(i == SCREEN_SAVE_LEN) { - for(i = 0; i < SCREEN_SAVE_LEN-1; i++ ) + for(i = 0; i < SCREEN_SAVE_LEN - 1; i++) { screen_save_arr[i] = screen_save_arr[i+1]; } free = SCREEN_SAVE_LEN-1; } // 放到free位置 - screen_save_arr[free].available = 1; + screen_save_arr[free].available = 0; screen_save_arr[free].kgx10_out = weight; // 把数组放回eeprom中 L0_Iap_Program_array(EEPROM_WEIGHT_ADDR, screen_save_arr,sizeof(screen_save_arr)); diff --git a/source/app/app_screen_save.h b/source/app/app_screen_save.h new file mode 100644 index 0000000..63abaab --- /dev/null +++ b/source/app/app_screen_save.h @@ -0,0 +1,26 @@ +#ifndef _APP_SCREEN_SAVE_H +#define _APP_SCREEN_SAVE_H + +#include "../bsp/TTSSbsp/bsp_config.h" + +#define SCREEN_SAVE_LEN 10 //寄存器需要存放的最大数量为10组 + +#define EEPROM_WEIGHT_ADDR 0x100 //定义一个起始地址为0x100的寄存器 + +//用来存储重量数据的结构体（数组） +typedef struct +{ + U8 head[2]; + U8 available; + U16 kgx10_out; + U8 tail[2]; + +}SCREEN_SAVE; + +extern SCREEN_SAVE screen_save_arr[SCREEN_SAVE_LEN]; + + +extern void screen_save_init(void); +extern void screen_save_push(U16 weight); + +#endif \ No newline at end of file diff --git a/source/app/task_bedalarm.c b/source/app/task_bedalarm.c index 18dd1fd..6a553aa 100644 --- a/source/app/task_bedalarm.c +++ b/source/app/task_bedalarm.c @@ -23,25 +23,22 @@ void L3_task_bed_alarm_init(void) L3_task_s_go(_s_task_bed_alarm,D_task_init); } -#define D_task_STATUS_READ 0x50 -#define D_task_WEIGHT_READ_AGAIN 0x51 -#define D_task_ALARM_DELETE 0x52 - +#define D_task_ALARM_JUDGE 0x50 +#define D_task_ALARM_DELETE 0x51 void L3_task_bed_alarm_handler(S_TASK_Bed_ALARM *s) { TTSS_Task_init(): - L2_task_go(D_task_STATUS_READ); + L2_task_go(D_task_ALARM_JUDGE); //判定是否开启离床报警 - TTSS_Task_step(D_task_STATUS_READ): // if(R.LeaveForbid_flag == LeaveForbid_OPEN) // { - // R.weight.last = R.weight.kgx10_out * 10; 应该在 按键按下时，就置标志位R.LeaveForbid_flag == LeaveForbid_OPEN和获取参考点位的重量。 + // R.weight.last = R.weight.kgx10_out * 10; //////应该在 按键按下时，就置标志位R.LeaveForbid_flag == LeaveForbid_OPEN和获取参考点位的重量。 // L2_task_go_Tdelay(D_task_WEIGHT_READ_AGAIN, D_Tdelay_100ms); // } //判定是否触发报警 - TTSS_Task_step(D_task_WEIGHT_READ_AGAIN): - R.weight.differ = R.weight.last - R.weight.kgx10_out * 10; + TTSS_Task_step(D_task_ALARM_JUDGE): + R.weight.differ = R.Weight_Ref - R.weight.kgx10_out * 10; //触发报警 //放在该task的第二步 if(R.weight.differ >= 100) { @@ -50,13 +47,10 @@ void L3_task_bed_alarm_handler(S_TASK_Bed_ALARM *s) L2_task_go_Tdelay(D_task_ALARM_DELETE, 0); } //未触发报警 - else - { - R.weight.last = R.weight.kgx10_out * 10; - L2_task_go_Tdelay(D_task_WEIGHT_READ_AGAIN, 0); - } + L2_task_go_Tdelay(D_task_ALARM_JUDGE, 0); + //判定是否解除报警 - TTSS_Task_step(D_task_ALARM_DELETE): + TTSS_Task_step(D_task_ALARM_DELETE): //手动解除 // if(R.ForbidDelate_flag == 1) // { @@ -65,13 +59,13 @@ void L3_task_bed_alarm_handler(S_TASK_Bed_ALARM *s) // R.LeaveForbid_flag = LeaveForbid_OFF; 应在按键按下时，操作beep还和置位R.LeaveForbid_flag = LeaveForbid_OFF // } //超时解除 //放在该task的第一步 - else if(D_sys_now - R.beep_startime > D_COUNT_JIFFIES(30000)) + if(D_sys_now - R.beep_startime > D_COUNT_JIFFIES(30000)) { - R.beep = beep_on; + R.beep = beep_off; R.beep_startime = 0; R.LeaveForbid_flag = LeaveForbid_OFF; } - L2_task_go_Tdelay(D_task_STATUS_READ, 0); + L2_task_go_Tdelay(D_task_ALARM_JUDGE, 0); TTSS_Task_end(); } diff --git a/source/app/task_screen.c b/source/app/task_screen.c index c9a4e9e..8c97db4 100644 --- a/source/app/task_screen.c +++ b/source/app/task_screen.c @@ -1,9 +1,11 @@ -#include "../app/task_screen.h" +#include "task_screen.h" #include "../app/app_config.h" #include "../msp/uart/msp_uart1.h" #include "msp_uart1.h" #include "debug_drv.h" #include "../msp/msp_eeprom.h" +#include "app_screen_save.h" + S_TASK_SCREEN _s_task_screen; @@ -137,9 +139,6 @@ void constructor_scr_pkg() scrSetValPkg.buf.LeaveForbid_flag[0] = R.LeaveForbid_flag >> 8 & 0xFF; scrSetValPkg.buf.LeaveForbid_flag[1] = R.LeaveForbid_flag >> 0 & 0xFF; - scrSetValPkg.buf.WeightKeep_flag[0] = R.WeightKeep_flag >> 8 & 0xFF; - scrSetValPkg.buf.WeightKeep_flag[1] = R.WeightKeep_flag >> 0 & 0xFF; - CRC = CRC_16(((U8 *)&scrSetValPkg) + 3, 21); scrSetValPkg.crc[1] = CRC; scrSetValPkg.crc[0] = CRC >> 8; @@ -169,12 +168,11 @@ void parse_screen_pkg() tst_weight.kgx10_zero = tst_weight.kgx10; break; case 0xD3://离床报警 - R.LeaveForbid_flag = LeaveForbid_OPEN; - // 并获取到参考重量 weight_ref = 当前重量 - + R.LeaveForbid_flag = LeaveForbid_OPEN;//按键按下时，就置标志位R.LeaveForbid_flag == LeaveForbid_OPEN和获取参考点位的重量。 + R.Weight_Ref = tst_weight.kgx10; // 参考重量 weight_ref = 当前重量 break; case 0xD4://保存 - // register1 = tst_weight.kgx10; + screen_save_push(tst_weight.kgx10);// register1 = tst_weight.kgx10; break; case 0xD5://校准菜单按钮 scrSetValPkg.buf.ui[1] = p->Data[1]; @@ -186,6 +184,8 @@ void parse_screen_pkg() R.danwei = p->Data[1]; break; case 0xD8://查看历史数据 + L0_Iap_Read_array(EEPROM_WEIGHT_ADDR, screen_save_arr,sizeof(screen_save_arr));//1先从eeprom中读出数组 + // 2推送到屏幕 break; case 0xD9://校准确认 ts_weight_SPara.ts_WPoint[pd485->buf[0]].kg = D_2uc_u16(pd485->buf[1],pd485->buf[2]); diff --git a/source/app/task_screen_save.h b/source/app/task_screen_save.h deleted file mode 100644 index 14beae7..0000000 --- a/source/app/task_screen_save.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef _APP_TASK_SCREEN_SAVE_H -#define _APP_TASK_SCREEN_SAVE_H - -#include "../bsp/TTSSbsp/bsp_config.h" - -typedef struct -{ - U8 head[2]; - U8 available; - U16 kgx10_out; - U8 tail[2]; - -}SCREEN_SAVE; - - -typedef struct _s_task_screen_save -{ - TS_task task; -}S_TASK_SCREEN_SAVE; - -extern S_TASK_SCREEN_SAVE _s_task_screen_save; - -extern void L3_task_screen_save_init(void); -extern void L3_task_screen_save_handler(S_TASK_Bed_ALARM *s); - - -void screen_save_push(U16 weight); - - -#endif \ No newline at end of file