From a3d1b5f13867ad97027e43cd074572b42bb74d36 Mon Sep 17 00:00:00 2001 From: Zhangwen <13970730+mkc46119@user.noreply.gitee.com> Date: Fri, 27 Sep 2024 17:52:08 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E4=BC=98=E5=8C=96=E7=A6=BB?= =?UTF-8?q?=E5=BA=8A=E6=8A=A5=E8=AD=A6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keilp/stcTTSS2_W5.uvguix.Administrator | 837 ++++++------------------- keilp/stcTTSS2_W5.uvoptx | 44 +- keilp/stcTTSS2_W5.uvprojx | 54 +- source/app/app_config.h | 2 +- source/app/task_bedalarm.c | 101 ++- source/app/task_bedalarm.h | 12 + source/app/task_screen.c | 64 +- source/app/task_screen.h | 4 +- 8 files changed, 392 insertions(+), 726 deletions(-) diff --git a/keilp/stcTTSS2_W5.uvguix.Administrator b/keilp/stcTTSS2_W5.uvguix.Administrator index 75cbbf3..e5d5c39 100644 --- a/keilp/stcTTSS2_W5.uvguix.Administrator +++ b/keilp/stcTTSS2_W5.uvguix.Administrator @@ -1,7 +1,7 @@ - -6.1 + -5.1
### uVision Project, (C) Keil Software
@@ -11,17 +11,17 @@ 38003 Registers - 115 67 + 115 275 346 Code Coverage - 770 160 + 850 160 204 Performance Analyzer - 930 + 1010 @@ -30,25 +30,25 @@ 1506 Symbols - 64 64 64 + 133 133 133 1936 Watch 1 - 200 133 133 + 133 133 133 1937 Watch 2 - 200 133 133 + 133 133 133 1935 Call Stack + Locals - 200 133 133 + 133 133 133 2506 @@ -56,16 +56,8 @@ 75 135 130 95 70 230 200 150 - - 466 - Source Browser - 500 - 300 - - - 1 @@ -91,17 +83,17 @@ -1 - 0 - 395 - 1547 - 593 + 87 + 312 + 1752 + 874 0 - 352 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000200000001000000010000003B433A5C55736572735C41646D696E6973747261746F725C4465736B746F705C5765696768742D464C545C736F757263655C6170705C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF42433A5C55736572735C41646D696E6973747261746F725C4465736B746F705C5765696768742D464C545C736F757263655C6170705C7461736B5F73637265656E2E63000000000D7461736B5F73637265656E2E6300000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000C4000000660000000006000069020000 + 665 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000007000000000000000100000028453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F626564616C61726D2E68000000000F7461736B5F626564616C61726D2E6800000000D9ADC200FFFFFFFF2A453A5C5765696768742D464C545C736F757263655C6170705C6170705F73637265656E5F736176652E6800000000116170705F73637265656E5F736176652E6800000000F7B88600FFFFFFFF1F453A5C5765696768742D464C545C736F757263655C6170705C6D61696E2E6300000000066D61696E2E63000000009CC1B600FFFFFFFF26453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F73637265656E2E63000000000D7461736B5F73637265656E2E6300000000BECEA100FFFFFFFF2A453A5C5765696768742D464C545C736F757263655C6170705C6170705F73637265656E5F736176652E6300000000116170705F73637265656E5F736176652E6300000000FFDC7800FFFFFFFF28453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F626564616C61726D2E63000000000F7461736B5F626564616C61726D2E6300000000F0A0A100FFFFFFFF26453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F73637265656E2E68000000000D7461736B5F73637265656E2E6800000000BCA8E100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000024010000660000008007000069030000 @@ -120,11 +112,11 @@ 0 16 - C40000004F00000070040000BD000000 + 940100004F00000090050000DF000000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -140,11 +132,11 @@ 0 16 - 0300000066000000BD00000039020000 + 03000000660000001D01000039030000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -160,11 +152,11 @@ 0 16 - 0300000066000000BD00000039020000 + 03000000660000001D01000039030000 16 - 220000003900000005010000F5010000 + 8A000000A1000000A6010000E1020000 @@ -180,11 +172,11 @@ 0 16 - 00000000A90100007004000017020000 + 000000002D02000090050000BD020000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -200,11 +192,11 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000300200008D05000090020000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -220,11 +212,11 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000300200008D05000090020000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -240,11 +232,11 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000300200008D05000090020000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -260,11 +252,11 @@ 0 16 - B3030000660000006D040000D6000000 + 03040000660000008D050000C6010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -280,11 +272,11 @@ 0 16 - C7000000660000006D040000A4000000 + 940100006300000090050000DF000000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -300,11 +292,11 @@ 0 16 - 03000000AC0100006D040000FE010000 + 03000000300200008D050000A4020000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -320,11 +312,11 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000300200008D05000090020000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -340,11 +332,11 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000300200008D05000090020000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -360,11 +352,11 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000300200008D05000090020000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -380,11 +372,11 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000300200008D05000090020000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -400,11 +392,11 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000300200008D05000090020000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -420,11 +412,11 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000300200008D05000090020000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -440,11 +432,11 @@ 0 16 - 0300000066000000BD00000039020000 + 03000000660000001D01000039030000 16 - 220000003900000005010000F5010000 + 8A000000A1000000A6010000E1020000 @@ -460,11 +452,11 @@ 0 16 - 0300000066000000BD00000039020000 + 03000000660000001D01000039030000 16 - 220000003900000005010000F5010000 + 8A000000A1000000A6010000E1020000 @@ -480,11 +472,11 @@ 0 16 - 000000006A020000000600000E030000 + 000000006A03000080070000E6030000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -500,11 +492,11 @@ 0 16 - 00000000950100007004000017020000 + 000000001902000090050000BD020000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -520,11 +512,11 @@ 0 16 - 030000006D0200006D040000AB020000 + 030000006D0300008D050000CD030000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -540,11 +532,11 @@ 0 16 - C40000006300000070040000BD000000 + 940100006300000090050000DF000000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -560,11 +552,11 @@ 0 16 - C7000000660000006D040000A4000000 + 97010000660000008D050000C6000000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -600,11 +592,11 @@ 0 16 - B00300006300000070040000A5010000 + 00040000630000009005000029020000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -620,11 +612,11 @@ 0 16 - 00000000A90100007004000003020000 + 000000002D02000090050000A9020000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -640,11 +632,11 @@ 0 16 - C7000000660000006D040000A4000000 + 97010000660000008D050000C6000000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -660,31 +652,11 @@ 0 16 - C7000000660000006D040000A4000000 + 97010000660000008D050000C6000000 16 - 22000000390000005A020000A7000000 - - - - 35141 - 35141 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - C40000006300000070040000BD000000 - - - 16 - 2200000039000000E2000000D9000000 + 8A000000A10000005203000031010000 @@ -700,11 +672,11 @@ 0 16 - C7000000660000006D040000A4000000 + 97010000660000008D050000C6000000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -720,11 +692,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -740,11 +712,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -760,11 +732,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -780,11 +752,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -800,11 +772,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -820,11 +792,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -840,11 +812,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -860,11 +832,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -880,11 +852,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -900,11 +872,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -920,11 +892,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -940,11 +912,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -960,11 +932,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -980,11 +952,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -1000,11 +972,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -1020,11 +992,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -1040,11 +1012,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -1060,11 +1032,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -1080,11 +1052,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -1100,11 +1072,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -1120,11 +1092,11 @@ 0 16 - B3030000660000006D0400001A010000 + 03040000660000008D0500007C010000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -1140,11 +1112,11 @@ 0 16 - 0300000066000000BD000000FE010000 + 03000000660000008D010000A4020000 16 - 220000003900000005010000F5010000 + 8A000000A1000000A6010000E1020000 @@ -1160,11 +1132,11 @@ 0 16 - 000000006A02000070040000C4020000 + 000000006A03000090050000E6030000 16 - 22000000390000005A020000A7000000 + 8A000000A10000005203000031010000 @@ -1180,11 +1152,11 @@ 0 16 - 030000006D0200006D040000AB020000 + 030000006D0300008D050000CD030000 16 - 220000003900000005010000F5010000 + 8A000000A1000000A6010000E1020000 @@ -1200,11 +1172,11 @@ 0 16 - 03000000AC0100006D040000EA010000 + 03000000300200008D05000090020000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -1220,471 +1192,11 @@ 0 16 - 03000000AC0100006D040000EA010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 463 - 463 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 030000006D0200006D040000AB020000 - - - 16 - 220000003900000005010000F5010000 - - - - 466 - 466 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 030000006D0200006D040000AB020000 - - - 16 - 220000003900000005010000F5010000 - - - - 470 - 470 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - C7000000660000006D040000A4000000 - - - 16 - 22000000390000005A020000A7000000 - - - - 50000 - 50000 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50001 - 50001 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50002 - 50002 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50003 - 50003 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50004 - 50004 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50005 - 50005 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50006 - 50006 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50007 - 50007 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50008 - 50008 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50009 - 50009 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50010 - 50010 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50011 - 50011 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50012 - 50012 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50013 - 50013 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50014 - 50014 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50015 - 50015 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50016 - 50016 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50017 - 50017 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50018 - 50018 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 - - - 16 - 2200000039000000E2000000D9000000 - - - - 50019 - 50019 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - B3030000660000006D0400001A010000 + 03000000300200008D05000090020000 16 - 2200000039000000E2000000D9000000 + 8A000000A10000001A02000031020000 @@ -1700,7 +1212,7 @@ 0 16 - 0000000000000000C40300001C000000 + 0000000000000000B70300001C000000 16 @@ -1720,7 +1232,7 @@ 0 16 - 000000000E0300000006000021030000 + 00000000E603000080070000F9030000 16 @@ -1740,7 +1252,7 @@ 1 16 - 000000001C000000E701000038000000 + 000000001C000000DA01000038000000 16 @@ -1767,36 +1279,16 @@ 0A0000000A0000006E0000006E000000 - - 824 - 824 - 0 - 0 - 0 - 0 - 32767 - 0 - 4096 - 0 - - 16 - 03000000AC0100006D040000EA010000 - - - 16 - 2200000039000000E2000000D9000000 - - - 3317 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BD00000070040000C1000000000000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E65002000000000000022000000390000005A020000A7000000C40000004F00000070040000BD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200001004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000002200000039000000E2000000D9000000B00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFC00000004F000000C400000052020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000002200000039000000E2000000D9000000000000004F000000C0000000520200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000091010000700400009501000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000002200000039000000E2000000D90000000000000095010000700400001702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000950100003C0200001702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000052020000000600005602000001000000010000100400000001000000B8FDFFFF6C000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000022000000390000005A020000A70000000000000056020000000600000E0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF1346696E6420416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 2619 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFF94010000DF00000090050000E3000000000000000100001004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E6500200000000000008A000000A10000005203000031010000940100004F00000090050000DF0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFFC0300004F0000000004000029020000000000000200001004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C0000018000400000000000008A000000A10000001A02000031020000000400004F00000090050000290200000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF200100004F00000024010000520300000100000002000010040000000100000072FEFFFFE7050000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000008A000000A10000001A02000031020000000000004F00000020010000520300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB090000018000800000000000008A000000A10000001A02000031020000000000001902000090050000BD02000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000520300008007000056030000010000000100001004000000010000000000000000000000FFFFFFFF04000000C5000000C7000000B401000077940000018000800000010000008A000000A10000005203000031010000000000005603000080070000E60300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2271 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A6C65645F737461747573960000000000000004000A6C65645F7374617475730652585F436E7407425F52585F4F4B05707562773200000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000 + 2357 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000077072696E74663196000000000000001400077072696E7466310C4C335F7461736B5F735F676F0C6273705F626C65645F736574024C3004656C73650EE58FAFE58F98E6B3A2E789B9E78E0FE58FAFE58F98E6B3A2E789B9E78E3F094C305F74696D6572300764656275676F6B0D445F7379735F4A69666669657311545950455F4A4946464945535F32354D5309636D64206572726F7218E5AE9AE4B989E68EA5E694B6E5A484E79086E58D8FE8AEAE1AE5AE9AE4B989E68EA5E694B6E5A484E79086E58D8FE8AEAE466604636D642004307833351B74735F557265635B445F55415254315D2E6F76657274696D655F741574735F557265635B445F55415254315D2E69646C651374735F557265635B445F55415254315D2E6F6B0270640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F50726F6A6563742057696E646F7773000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000 1423 @@ -1811,8 +1303,8 @@ 59399 Build - 982 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000B5354433848334B36345332960000000000000001000B5354433848334B36345332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64FF7F0000 + 684 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E00000000000000000000000000000000010000000100000001809E8A0000000000001F0000000000000000000000000000000001000000010000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000B5354433848334B36345332960000000000000001000B5354433848334B36345332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64FF7F0000 583 @@ -1827,8 +1319,8 @@ 59400 Debug - 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000000000000100000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000000000000100000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000000000000100000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F720100000000000000000000000100000001000000000000000000000001000000000000000000054465627567FF7F0000 + 2220 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000002001380D88B000000000000310000000757617463682031000000000000000000000000010000000100000000000000000000000100000000001380D98B0000000000003100000007576174636820320000000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000084D656D6F72792031000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000084D656D6F72792032000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000084D656D6F72792033000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000084D656D6F727920340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000755415254202331000000000000000000000000010000000100000000000000000000000100000000001380940700000000000033000000075541525420233200000000000000000000000001000000010000000000000000000000010000000000138095070000000000003300000007554152542023330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000000E49544D2F525441205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380658A000000000000340000000E4C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E00000014506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000D436F646520436F76657261676500000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000000000000100000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138001890000000000003600000007546F6F6C626F7800000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000000000000100000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000000000000100000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F720100000000000000000000000100000001000000000000000000000001000000000000000000054465627567FF7F0000 898 @@ -1841,8 +1333,8 @@ 0 - 1536 - 864 + 1920 + 1080 @@ -1852,21 +1344,66 @@ 0 100 - 1 + 0 - ..\source\app\main.c - 25 + ..\source\app\task_bedalarm.h + 0 + 1 + 19 + 1 + + 0 + + + ..\source\app\app_screen_save.h + 0 1 - 12 + 1 + 1 + + 0 + + + ..\source\app\main.c + 0 + 58 + 27 1 0 ..\source\app\task_screen.c - 85 - 244 - 266 + 0 + 107 + 127 + 1 + + 0 + + + ..\source\app\app_screen_save.c + 0 + 1 + 1 + 1 + + 0 + + + ..\source\app\task_bedalarm.c + 0 + 55 + 69 + 1 + + 0 + + + ..\source\app\task_screen.h + 30 + 85 + 96 1 0 diff --git a/keilp/stcTTSS2_W5.uvoptx b/keilp/stcTTSS2_W5.uvoptx index 46bc5b2..385bf82 100644 --- a/keilp/stcTTSS2_W5.uvoptx +++ b/keilp/stcTTSS2_W5.uvoptx @@ -100,9 +100,6 @@ 1 0 0 - 1 - 0 - 0 -1 @@ -149,16 +146,6 @@ 0 - 0 - 0 - - - - - - - - @@ -173,6 +160,7 @@ 1 1 0 + 1 0 0 ..\source\app\app_weight.c @@ -185,6 +173,7 @@ 2 1 0 + 1 0 0 ..\source\app\main.c @@ -197,6 +186,7 @@ 3 1 0 + 1 0 0 ..\source\app\app_config.c @@ -209,6 +199,7 @@ 4 1 0 + 1 0 0 ..\source\app\task_screen.c @@ -220,7 +211,8 @@ 1 5 1 - 1 + 0 + 1 0 0 ..\source\app\app_screen_save.c @@ -232,7 +224,8 @@ 1 6 1 - 0 + 1 + 1 0 0 ..\source\app\task_bedalarm.c @@ -253,6 +246,7 @@ 7 1 0 + 1 0 0 ..\source\asp\asp_schain.c @@ -265,6 +259,7 @@ 8 1 0 + 1 0 0 ..\source\asp\asp_lowpower.c @@ -285,6 +280,7 @@ 9 2 0 + 1 0 0 ..\source\cpu\STARTUP.A51 @@ -297,6 +293,7 @@ 10 1 0 + 1 0 0 ..\source\cpu\stc_8_delay.c @@ -317,6 +314,7 @@ 11 1 0 + 1 0 0 ..\source\msp\uart\msp_uartN.c @@ -329,6 +327,7 @@ 12 1 0 + 1 0 0 ..\source\msp\msp_time2.c @@ -341,6 +340,7 @@ 13 1 0 + 1 0 0 ..\source\msp\uart\msp_uart1.c @@ -353,6 +353,7 @@ 14 1 0 + 1 0 0 ..\source\msp\msp_iicMx.c @@ -365,6 +366,7 @@ 15 1 0 + 1 0 0 ..\source\msp\msp_eeprom.c @@ -377,6 +379,7 @@ 16 1 0 + 1 0 0 ..\source\msp\msp_adc.c @@ -397,6 +400,7 @@ 17 1 0 + 1 0 0 ..\source\bsp\TTSSbsp\bsp_config.c @@ -409,6 +413,7 @@ 18 1 0 + 1 0 0 ..\source\bsp\bsp_led.c @@ -421,6 +426,7 @@ 19 1 0 + 1 0 0 ..\source\bsp\bsp_cs1232.c @@ -441,6 +447,7 @@ 20 1 1 + 1 0 0 ..\source\ctask\TTSS_task.c @@ -453,6 +460,7 @@ 21 1 0 + 1 0 0 ..\source\ctask\TTSS_tick.c @@ -465,6 +473,7 @@ 22 1 0 + 1 0 0 ..\source\ctask\TTSS_time_stc.c @@ -485,6 +494,7 @@ 23 1 0 + 1 0 0 ..\source\tpc\tpc_road.c @@ -505,6 +515,7 @@ 24 1 1 + 1 0 0 ..\source\clib\c_lib.c @@ -517,6 +528,7 @@ 25 1 0 + 1 0 0 ..\source\clib\c_delay.c @@ -537,6 +549,7 @@ 26 5 0 + 1 0 0 ..\source\debug\cc_as_stc01_main.ini @@ -549,6 +562,7 @@ 27 1 0 + 1 0 0 ..\source\debug\debug_drv.c diff --git a/keilp/stcTTSS2_W5.uvprojx b/keilp/stcTTSS2_W5.uvprojx index 7412291..e8909f0 100644 --- a/keilp/stcTTSS2_W5.uvprojx +++ b/keilp/stcTTSS2_W5.uvprojx @@ -10,7 +10,6 @@ STC8H3K64S2 0x0 MCS-51 - 0 STC8H3K64S4 Series @@ -124,6 +123,47 @@ 0 16 + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + + + 0 + 1 + 0 + 1 + 1 + 1 + 0 + 1 + 1 + 1 + + 0 + -1 + + + + + + + + + + + + + + + @@ -177,14 +217,12 @@ 0 0 0 - 0 0 0 0 0 0 0 - 0 0 0 0 @@ -254,16 +292,6 @@ 0x0 0x0 - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - diff --git a/source/app/app_config.h b/source/app/app_config.h index 6ac01d6..14a838b 100644 --- a/source/app/app_config.h +++ b/source/app/app_config.h @@ -16,7 +16,7 @@ #define POWER_LOW 1 #define LeaveForbid_OPEN 1 //1 打开，0 不打开 -#define LeaveForbid_OFF 0 +#define LeaveForbid_OFF 0 //1 打开，0 不打开 // #define RFID_FREE_NO 0x00FA diff --git a/source/app/task_bedalarm.c b/source/app/task_bedalarm.c index 102367d..5972f4e 100644 --- a/source/app/task_bedalarm.c +++ b/source/app/task_bedalarm.c @@ -7,28 +7,102 @@ S_TASK_Bed_ALARM _s_task_bed_alarm; +// A5 5A 08 82 06 D3 01 00 00 FF 7D 清除报警图标 +SCRSetPkg scrPkgAlarmClearPkg = { + 0xA5, 0x5A, + 0x08, //指令字节长度（不含帧头） + 0x82, //指令 + 0x06, 0xD3, //变量存储地址 + 0x01, //数据字长度 + 0x00,0x00, // 数据内容 + 0xFF,0x7D, // CRC +}; + //============================================= void L3_task_bed_alarm_init(void) { L1_task_init(&_s_task_bed_alarm.task); + _s_task_bed_alarm.mode_flag = R.LeaveForbid_flag; L3_task_s_go(_s_task_bed_alarm,D_task_init); + R.weight.differ = R.Weight_Ref - R.weight.kgx10_out; } -#define D_task_ALARM_JUDGE 0x50 +#define D_task_JUDGE 0x50 #define D_task_ALARM_DELETE 0x51 - +// _____beep-on_____模式开_____beep-off___ +// 离床作为主体，beep为辅 _____模式关_____/ \____模式关___ void L3_task_bed_alarm_handler(S_TASK_Bed_ALARM *s) { TTSS_Task_init(): - L2_task_go(D_task_ALARM_JUDGE); - //判定是否开启离床报警 - // if(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); - // } + L2_task_go(D_task_JUDGE); //判定是否触发报警 - TTSS_Task_step(D_task_ALARM_JUDGE): + TTSS_Task_step(D_task_JUDGE): + R.weight.differ = R.Weight_Ref - R.weight.kgx10_out; + //模式开启情况下，蜂鸣器不响的时候 + if(R.LeaveForbid_flag == LeaveForbid_OPEN && R.beep == beep_off) + { + // 检测到体重变化超10kg + if( R.weight.differ > 50) // 50 5kg 100 10kg + { + R.beep = beep_on; + L0_uart1_str("Enter Alarm->"); + L0_uart1_0d0a(); + R.beep_startime = D_sys_now; + } + } + //模式开启情况下，蜂鸣器响的时候 + if (R.LeaveForbid_flag == LeaveForbid_OPEN && R.beep == beep_on) + { + // 检测到时间超时 + if (D_sys_now - R.beep_startime > D_COUNT_JIFFIES(30000)) + { + R.beep = beep_off; + L0_uart1_str("Overtime!! Quit Alarm ->"); + L0_uart1_0d0a(); + R.Weight_Ref = 0; + R.beep_startime = 0; + R.LeaveForbid_flag = LeaveForbid_OFF; + //A5 5A 08 83 06 D3 01 00 00 FE AC解除报警时，清除图标 + L1_uart1_Array((U8 *)&scrPkgAlarmClearPkg, sizeof(scrPkgAlarmClearPkg)); + } + } + // 模式标志为关闭 + if (R.LeaveForbid_flag == LeaveForbid_OFF) + { + // 而上一刻的是打开，说明是手动解除报警 + if (_s_task_bed_alarm.mode_flag == LeaveForbid_OPEN) + { + if (R.beep == beep_on) + { + R.beep = beep_off; + L0_uart1_str("Manually dismiss! Quit Alarm ->"); + } + L0_uart1_str("Manually dismiss mode!!"); + L0_uart1_0d0a(); + R.Weight_Ref = 0; + R.beep_startime = 0; + L1_uart1_Array((U8 *)&scrPkgAlarmClearPkg, sizeof(scrPkgAlarmClearPkg)); + } + + } + // 模式标志为打开 + else if (R.LeaveForbid_flag == LeaveForbid_OPEN) + { + // 而上一刻的是关闭，说明是手动打开了模式 + if (_s_task_bed_alarm.mode_flag == LeaveForbid_OFF) + { + R.Weight_Ref = tst_weight.kgx10;//记录下参考重量 + L0_uart1_str("LeaveForbid_OPEN!!!"); + L0_uart1_0d0a(); + } + } + + _s_task_bed_alarm.mode_flag = R.LeaveForbid_flag; + + TTSS_Task_end(); +} + + /* R.weight.differ = R.Weight_Ref - R.weight.kgx10_out; if(R.LeaveForbid_flag == LeaveForbid_OPEN) { //触发报警 //取绝对值abs(); @@ -52,7 +126,9 @@ void L3_task_bed_alarm_handler(S_TASK_Bed_ALARM *s) //未触发报警 } else - L2_task_go_Tdelay(D_task_ALARM_JUDGE, D_Tdelay_200ms); + { + L2_task_go_Tdelay(D_task_ALARM_JUDGE, D_Tdelay_200ms); + } //判定是否解除报警 TTSS_Task_step(D_task_ALARM_DELETE): @@ -83,8 +159,7 @@ void L3_task_bed_alarm_handler(S_TASK_Bed_ALARM *s) } else L2_task_go_Tdelay(D_task_ALARM_DELETE, D_Tdelay_200ms); - TTSS_Task_end(); -} + * */ diff --git a/source/app/task_bedalarm.h b/source/app/task_bedalarm.h index ede280f..173a0b0 100644 --- a/source/app/task_bedalarm.h +++ b/source/app/task_bedalarm.h @@ -18,10 +18,22 @@ #include "../clib/c_lib.h" // #include "task_screen.h" +// A5 5A 08 82 06 D3 01 00 00 FF 7D +typedef struct +{ + U8 head[2]; //A5 5A：帧头 + U8 num; //08：指令字节长度，83 00 00 01 02 22 00 00共 8字节（不含帧头） + U8 cmd; //82：指令 + U8 start_addr[2];//06 D3：变量存储器地址 + U8 num_word; //01：数据字长度，02 22 共 1 字长 + U8 Data[2]; //00 00：数据内容，设置的键值 + U8 crc[2]; //FF 7D: CRC +} SCRSetPkg; typedef struct _s_task_low_power { TS_task task; + U8 mode_flag; }S_TASK_Bed_ALARM; extern S_TASK_Bed_ALARM _s_task_bed_alarm; diff --git a/source/app/task_screen.c b/source/app/task_screen.c index c8bb101..cf6ad2c 100644 --- a/source/app/task_screen.c +++ b/source/app/task_screen.c @@ -75,8 +75,8 @@ SCRControlPkg scrBeepOnPkg = { 0xA5, 0x5A, 0x05, //长度 0x80, //指令 - 0x02, 0xC8, //数据 - 0x70, 0xDE, // CRC + 0x02, 0x32, //数据 + 0xF0, 0x9D, // CRC }; // A5 5A 08 82 07 A0 01 00 00 D8 39 清除图标0 @@ -123,16 +123,16 @@ SCReturnPkg scrPkgIconYClearPkg = { 0xFC,0xA5, // CRC }; -// A5 5A 08 82 06 D3 01 00 00 FF 7D 清除报警图标 -SCReturnPkg scrPkgAlarmClearPkg = { - 0xA5, 0x5A, - 0x08, //指令字节长度（不含帧头） - 0x82, //指令 - 0x06, 0xD3, //变量存储地址 - 0x01, //数据字长度 - 0x00,0x00, // 数据内容 - 0xFF,0x7D, // CRC -}; +// // A5 5A 08 82 06 D3 01 00 00 FF 7D 清除报警图标 +// SCReturnPkg scrPkgAlarmClearPkg = { +// 0xA5, 0x5A, +// 0x08, //指令字节长度（不含帧头） +// 0x82, //指令 +// 0x06, 0xD3, //变量存储地址 +// 0x01, //数据字长度 +// 0x00,0x00, // 数据内容 +// 0xFF,0x7D, // CRC +// }; // A5 5A 08 82 06 D7 01 00 00 FE 4D 切换单位 SCReturnPkg scrPkgUnitSwitchPkg = { @@ -303,28 +303,28 @@ void parse_screen_pkg() tst_weight.kgx10_zero = tst_weight.kgx10; } break; - case 0xD3://离床报警 - if(R.LeaveForbid_flag != LeaveForbid_OPEN) - { - R.LeaveForbid_flag = LeaveForbid_OPEN; //按键按下时，就置标志位R.LeaveForbid_flag == LeaveForbid_OPEN和获取参考点位的重量。 - R.Weight_Ref = tst_weight.kgx10; //参考重量 weight_ref = 当前重量 - L0_uart1_str("LeaveForbid_OPEN!!!"); - L0_uart1_0d0a(); - } - else if (R.LeaveForbid_flag == LeaveForbid_OPEN) - { - R.LeaveForbid_flag = LeaveForbid_OFF; - //A5 5A 08 83 06 D3 01 00 00 FE AC手动解除报警时，清除图标 - L1_uart1_Array((U8 *)&scrPkgAlarmClearPkg, sizeof(scrPkgAlarmClearPkg)); - } + case 0xD3://离床报警 + R.LeaveForbid_flag ^= 1;// R.LeaveForbid_flag = R.LeaveForbid_flag ^ 1; + // if(R.LeaveForbid_flag != LeaveForbid_OPEN) + // { + // R.LeaveForbid_flag = LeaveForbid_OPEN; + // L0_uart1_str("LeaveForbid_OPEN!!!"); + // L0_uart1_0d0a(); + // } + // else if(R.LeaveForbid_flag == LeaveForbid_OPEN) + // { + // R.LeaveForbid_flag = LeaveForbid_OFF; + // L0_uart1_str("LeaveForbid_OFF!!!"); + // L0_uart1_0d0a(); + // } break; case 0xD4://保存 - if(p->Data[1] == 1) - { - // screen_save_push(tst_weight.kgx10); - screen_save_push(tst_weight.kgx10_out); - } - break; + if(p->Data[1] == 1) + { + // screen_save_push(tst_weight.kgx10); + screen_save_push(tst_weight.kgx10_out); + } + break; case 0xD5://校准菜单按钮 // scrSetValPkg.buf.ui[1] = p->Data[1]; break; diff --git a/source/app/task_screen.h b/source/app/task_screen.h index bb72b33..c9ca32b 100644 --- a/source/app/task_screen.h +++ b/source/app/task_screen.h @@ -66,8 +66,8 @@ typedef struct // A5 5A 05 80 02 14 71 47 0.2s extern SCRControlPkg scrBeepPowOnPkg; -// A5 5A 08 82 06 D3 01 00 00 FF 7D 清除报警图标 -extern SCReturnPkg scrPkgAlarmClearPkg; +// // A5 5A 08 82 06 D3 01 00 00 FF 7D 清除报警图标 +// extern SCReturnPkg scrPkgAlarmClearPkg; // typedef struct _tpc_screen_ // {