diff --git a/.vscode/settings.json b/.vscode/settings.json index e96c9d7..79c592e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -18,6 +18,8 @@ "msp_eeprom.h": "c", "app_weight.h": "c", "bsp_msa300.h": "c", - "c_lib.h": "c" + "c_lib.h": "c", + "task_weight_keep.h": "c", + "c_type51.h": "c" } } \ No newline at end of file diff --git a/keilp/stcTTSS2_W5.uvguix.Administrator b/keilp/stcTTSS2_W5.uvguix.Administrator index e5d5c39..b4f5208 100644 --- a/keilp/stcTTSS2_W5.uvguix.Administrator +++ b/keilp/stcTTSS2_W5.uvguix.Administrator @@ -11,7 +11,7 @@ 38003 Registers - 115 275 + 115 163 346 @@ -93,7 +93,7 @@ 0 665 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000007000000000000000100000028453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F626564616C61726D2E68000000000F7461736B5F626564616C61726D2E6800000000D9ADC200FFFFFFFF2A453A5C5765696768742D464C545C736F757263655C6170705C6170705F73637265656E5F736176652E6800000000116170705F73637265656E5F736176652E6800000000F7B88600FFFFFFFF1F453A5C5765696768742D464C545C736F757263655C6170705C6D61696E2E6300000000066D61696E2E63000000009CC1B600FFFFFFFF26453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F73637265656E2E63000000000D7461736B5F73637265656E2E6300000000BECEA100FFFFFFFF2A453A5C5765696768742D464C545C736F757263655C6170705C6170705F73637265656E5F736176652E6300000000116170705F73637265656E5F736176652E6300000000FFDC7800FFFFFFFF28453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F626564616C61726D2E63000000000F7461736B5F626564616C61726D2E6300000000F0A0A100FFFFFFFF26453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F73637265656E2E68000000000D7461736B5F73637265656E2E6800000000BCA8E100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000024010000660000008007000069030000 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000007000000020000000100000028453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F626564616C61726D2E68000000000F7461736B5F626564616C61726D2E6800000000D9ADC200FFFFFFFF2A453A5C5765696768742D464C545C736F757263655C6170705C6170705F73637265656E5F736176652E6800000000116170705F73637265656E5F736176652E6800000000F7B88600FFFFFFFF1F453A5C5765696768742D464C545C736F757263655C6170705C6D61696E2E6300000000066D61696E2E63000000009CC1B600FFFFFFFF26453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F73637265656E2E63000000000D7461736B5F73637265656E2E6300000000BCA8E100FFFFFFFF2A453A5C5765696768742D464C545C736F757263655C6170705C6170705F73637265656E5F736176652E6300000000116170705F73637265656E5F736176652E6300000000F0A0A100FFFFFFFF28453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F626564616C61726D2E63000000000F7461736B5F626564616C61726D2E6300000000BECEA100FFFFFFFF26453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F73637265656E2E68000000000D7461736B5F73637265656E2E6800000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000024010000660000008007000069030000 @@ -116,7 +116,7 @@ 16 - 8A000000A10000005203000031010000 + 940100006600000090050000F6000000 @@ -172,7 +172,7 @@ 0 16 - 000000002D02000090050000BD020000 + 03000000300200008D050000A4020000 16 @@ -192,7 +192,7 @@ 0 16 - 03000000300200008D05000090020000 + 03000000300200008D050000A4020000 16 @@ -212,7 +212,7 @@ 0 16 - 03000000300200008D05000090020000 + 03000000300200008D050000A4020000 16 @@ -232,7 +232,7 @@ 0 16 - 03000000300200008D05000090020000 + 03000000300200008D050000A4020000 16 @@ -252,7 +252,7 @@ 0 16 - 03040000660000008D050000C6010000 + 03040000660000008D05000010020000 16 @@ -272,7 +272,7 @@ 0 16 - 940100006300000090050000DF000000 + 97010000660000008D050000C6000000 16 @@ -312,7 +312,7 @@ 0 16 - 03000000300200008D05000090020000 + 03000000300200008D050000A4020000 16 @@ -332,7 +332,7 @@ 0 16 - 03000000300200008D05000090020000 + 03000000300200008D050000A4020000 16 @@ -352,7 +352,7 @@ 0 16 - 03000000300200008D05000090020000 + 03000000300200008D050000A4020000 16 @@ -372,7 +372,7 @@ 0 16 - 03000000300200008D05000090020000 + 03000000300200008D050000A4020000 16 @@ -392,7 +392,7 @@ 0 16 - 03000000300200008D05000090020000 + 03000000300200008D050000A4020000 16 @@ -412,7 +412,7 @@ 0 16 - 03000000300200008D05000090020000 + 03000000300200008D050000A4020000 16 @@ -512,7 +512,7 @@ 0 16 - 030000006D0300008D050000CD030000 + 030000006D0300007D070000CD030000 16 @@ -532,7 +532,7 @@ 0 16 - 940100006300000090050000DF000000 + 97010000660000008D050000C6000000 16 @@ -592,7 +592,7 @@ 0 16 - 00040000630000009005000029020000 + 03040000660000008D05000010020000 16 @@ -612,7 +612,7 @@ 0 16 - 000000002D02000090050000A9020000 + 03000000300200008D050000A4020000 16 @@ -692,7 +692,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -712,7 +712,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -732,7 +732,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -752,7 +752,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -772,7 +772,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -792,7 +792,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -812,7 +812,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -832,7 +832,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -852,7 +852,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -872,7 +872,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -892,7 +892,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -912,7 +912,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -932,7 +932,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -952,7 +952,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -972,7 +972,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -992,7 +992,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -1012,7 +1012,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -1032,7 +1032,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -1052,7 +1052,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -1072,7 +1072,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -1092,7 +1092,7 @@ 0 16 - 03040000660000008D0500007C010000 + 03040000660000008D05000010020000 16 @@ -1112,7 +1112,7 @@ 0 16 - 03000000660000008D010000A4020000 + 03000000660000001D01000039030000 16 @@ -1132,7 +1132,7 @@ 0 16 - 000000006A03000090050000E6030000 + 030000006D0300007D070000CD030000 16 @@ -1152,7 +1152,7 @@ 0 16 - 030000006D0300008D050000CD030000 + 030000006D0300007D070000CD030000 16 @@ -1172,7 +1172,7 @@ 0 16 - 03000000300200008D05000090020000 + 03000000300200008D050000A4020000 16 @@ -1192,7 +1192,7 @@ 0 16 - 03000000300200008D05000090020000 + 03000000300200008D050000A4020000 16 @@ -1206,7 +1206,7 @@ 0 0 0 - 32767 + 940 0 8192 0 @@ -1246,7 +1246,7 @@ 0 0 0 - 32767 + 463 0 8192 1 @@ -1266,7 +1266,7 @@ 0 0 0 - 32767 + 612 0 8192 2 @@ -1281,14 +1281,14 @@ 2619 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFF94010000DF00000090050000E3000000000000000100001004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E6500200000000000008A000000A10000005203000031010000940100004F00000090050000DF0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFFC0300004F0000000004000029020000000000000200001004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C0000018000400000000000008A000000A10000001A02000031020000000400004F00000090050000290200000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF200100004F00000024010000520300000100000002000010040000000100000072FEFFFFE7050000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000008A000000A10000001A02000031020000000000004F00000020010000520300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB090000018000800000000000008A000000A10000001A02000031020000000000001902000090050000BD02000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000520300008007000056030000010000000100001004000000010000000000000000000000FFFFFFFF04000000C5000000C7000000B401000077940000018000800000010000008A000000A10000005203000031010000000000005603000080070000E60300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFF94010000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000000000000940100006600000090050000F6000000940100004F00000090050000DF0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFFC0300004F0000000004000029020000000000000200000004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C00000180004000000000000000040000660000009005000040020000000400004F00000090050000290200000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF200100004F00000024010000520300000100000002000010040000000100000072FEFFFFE7050000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000000000000660000002001000069030000000000004F00000020010000520300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000003002000090050000D4020000000000001902000090050000BD02000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000520300008007000056030000010000000100001004000000010000000000000000000000FFFFFFFF04000000C5000000C7000000B40100007794000001800080000001000000000000006D03000080070000FD030000000000005603000080070000E60300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File 2357 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000077072696E74663196000000000000001400077072696E7466310C4C335F7461736B5F735F676F0C6273705F626C65645F736574024C3004656C73650EE58FAFE58F98E6B3A2E789B9E78E0FE58FAFE58F98E6B3A2E789B9E78E3F094C305F74696D6572300764656275676F6B0D445F7379735F4A69666669657311545950455F4A4946464945535F32354D5309636D64206572726F7218E5AE9AE4B989E68EA5E694B6E5A484E79086E58D8FE8AEAE1AE5AE9AE4B989E68EA5E694B6E5A484E79086E58D8FE8AEAE466604636D642004307833351B74735F557265635B445F55415254315D2E6F76657274696D655F741574735F557265635B445F55415254315D2E69646C651374735F557265635B445F55415254315D2E6F6B0270640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F50726F6A6563742057696E646F7773000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000077072696E74663196000000000000001400077072696E7466310C4C335F7461736B5F735F676F0C6273705F626C65645F736574024C3004656C73650EE58FAFE58F98E6B3A2E789B9E78E0FE58FAFE58F98E6B3A2E789B9E78E3F094C305F74696D6572300764656275676F6B0D445F7379735F4A69666669657311545950455F4A4946464945535F32354D5309636D64206572726F7218E5AE9AE4B989E68EA5E694B6E5A484E79086E58D8FE8AEAE1AE5AE9AE4B989E68EA5E694B6E5A484E79086E58D8FE8AEAE466604636D642004307833351B74735F557265635B445F55415254315D2E6F76657274696D655F741574735F557265635B445F55415254315D2E69646C651374735F557265635B445F55415254315D2E6F6B0270640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F50726F6A6563742057696E646F7773000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000 1423 @@ -1304,7 +1304,7 @@ Build 684 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E00000000000000000000000000000000010000000100000001809E8A0000000000001F0000000000000000000000000000000001000000010000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000B5354433848334B36345332960000000000000001000B5354433848334B36345332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64FF7F0000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E00000000000000000000000000000000010000000100000001809E8A0000000000001F0000000000000000000000000000000001000000010000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000B5354433848334B36345332960000000000000001000B5354433848334B36345332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64CF010000 583 @@ -1320,7 +1320,7 @@ Debug 2220 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000002001380D88B000000000000310000000757617463682031000000000000000000000000010000000100000000000000000000000100000000001380D98B0000000000003100000007576174636820320000000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000084D656D6F72792031000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000084D656D6F72792032000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000084D656D6F72792033000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000084D656D6F727920340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000755415254202331000000000000000000000000010000000100000000000000000000000100000000001380940700000000000033000000075541525420233200000000000000000000000001000000010000000000000000000000010000000000138095070000000000003300000007554152542023330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000000E49544D2F525441205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380658A000000000000340000000E4C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E00000014506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000D436F646520436F76657261676500000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000000000000100000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138001890000000000003600000007546F6F6C626F7800000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000000000000100000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000000000000100000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F720100000000000000000000000100000001000000000000000000000001000000000000000000054465627567FF7F0000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000002001380D88B000000000000310000000757617463682031000000000000000000000000010000000100000000000000000000000100000000001380D98B0000000000003100000007576174636820320000000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000084D656D6F72792031000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000084D656D6F72792032000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000084D656D6F72792033000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000084D656D6F727920340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000755415254202331000000000000000000000000010000000100000000000000000000000100000000001380940700000000000033000000075541525420233200000000000000000000000001000000010000000000000000000000010000000000138095070000000000003300000007554152542023330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000000E49544D2F525441205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380658A000000000000340000000E4C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E00000014506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000D436F646520436F76657261676500000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138001890000000000003600000007546F6F6C626F7800000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -1344,11 +1344,11 @@ 0 100 - 0 + 2 ..\source\app\task_bedalarm.h 0 - 1 + 2 19 1 @@ -1366,7 +1366,7 @@ ..\source\app\main.c 0 - 58 + 26 27 1 @@ -1375,7 +1375,7 @@ ..\source\app\task_screen.c 0 - 107 + 115 127 1 @@ -1392,16 +1392,16 @@ ..\source\app\task_bedalarm.c - 0 - 55 - 69 + 24 + 71 + 89 1 0 ..\source\app\task_screen.h - 30 + 44 85 96 1 diff --git a/source/app/app_config.c b/source/app/app_config.c index 55a90d6..6f6c156 100644 --- a/source/app/app_config.c +++ b/source/app/app_config.c @@ -56,6 +56,11 @@ void L3_reg_reset(void) //校准体重 R.calib_kg_x100 = 0; + + //称重保持 + //上电为保持状态 + R.weight_keep_flag = 1; + R.weight_keep_kgx10 = 0; } diff --git a/source/app/app_config.h b/source/app/app_config.h index 14a838b..b1f113d 100644 --- a/source/app/app_config.h +++ b/source/app/app_config.h @@ -247,6 +247,10 @@ typedef struct global_register // 校准重量 U16 calib_kg_x100; + //称重保持 + U8 weight_keep_flag; + U16 weight_keep_kgx10; + } GlobalRegister; extern GlobalRegister R; diff --git a/source/app/app_weight.c b/source/app/app_weight.c index f96f47a..bc392ec 100644 --- a/source/app/app_weight.c +++ b/source/app/app_weight.c @@ -200,6 +200,9 @@ void L3_task_weight_handler(TS_TASK_weight_ *s) s->kgx10_out = 0 ; } R.weight.kgx10_out = s->kgx10_out; + // L0_uart1_str("s->kgx10_out "); + // L0_uart1_ushex(s->kgx10_out); + // L0_uart1_0d0a(); //// D_LED1_REV(); L4_weight_out(); D_LED1_REV(); diff --git a/source/app/app_weight.h b/source/app/app_weight.h index cd012ae..db9e6bc 100644 --- a/source/app/app_weight.h +++ b/source/app/app_weight.h @@ -231,7 +231,7 @@ extern void L4_weight_out(void); extern void L4_WPoint_out(void); extern void L4_kgx10zero_out(void); -#define D_get_weight() tst_weight.kgx10 +#define D_get_weight() tst_weight.kgx10 //计算出的重量值 diff --git a/source/app/main.c b/source/app/main.c index 1aa2c46..ac2a550 100644 --- a/source/app/main.c +++ b/source/app/main.c @@ -96,7 +96,7 @@ void L0_main_init(void) printf1("\r\nD_sys_MainFre %ld",D_sys_MainFre); //上电时控制蜂鸣器响一声 - L1_uart1_Array((U8 *)&scrBeepPowOnPkg, sizeof(scrBeepPowOnPkg)); + // L1_uart1_Array((U8 *)&scrBeepPowOnPkg, sizeof(scrBeepPowOnPkg)); r = L3_S_init(); printf1("\r\nL3_S_init %d",r); @@ -116,6 +116,7 @@ void main(void) L3_task_weight_init(); L3_task_screen_init(); L3_task_bed_alarm_init(); + L3_task_weight_keep_init(); TTSS_run_every_init(s_nos_tick.stamp,10); @@ -148,6 +149,8 @@ void main(void) L3_task_bed_alarm_handler(&_s_task_bed_alarm); + L3_task_weight_keep_handler(&_s_task_weight_keep); + } } diff --git a/source/app/main.h b/source/app/main.h index e78958a..d00b9a6 100644 --- a/source/app/main.h +++ b/source/app/main.h @@ -94,6 +94,7 @@ #include "task_screen.h" #include "app_screen_save.h" #include "task_bedalarm.h" +#include "task_weight_keep.h" #include "app_config.h" diff --git a/source/app/task_bedalarm.c b/source/app/task_bedalarm.c index 5972f4e..6affaaa 100644 --- a/source/app/task_bedalarm.c +++ b/source/app/task_bedalarm.c @@ -24,7 +24,6 @@ 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_JUDGE 0x50 @@ -37,10 +36,11 @@ void L3_task_bed_alarm_handler(S_TASK_Bed_ALARM *s) L2_task_go(D_task_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) { + // R.weight.differ = R.Weight_Ref - D_get_weight(); + R.weight.differ = R.Weight_Ref - R.weight.kgx10_out; //只用输出值来判断 // 检测到体重变化超10kg if( R.weight.differ > 50) // 50 5kg 100 10kg { @@ -91,7 +91,8 @@ void L3_task_bed_alarm_handler(S_TASK_Bed_ALARM *s) // 而上一刻的是关闭，说明是手动打开了模式 if (_s_task_bed_alarm.mode_flag == LeaveForbid_OFF) { - R.Weight_Ref = tst_weight.kgx10;//记录下参考重量 + // R.Weight_Ref = D_get_weight();//记录下参考重量（计算出的实际重量值） + R.Weight_Ref = R.weight.kgx10_out;//记录下参考重量（计算出的实际重量值） L0_uart1_str("LeaveForbid_OPEN!!!"); L0_uart1_0d0a(); } diff --git a/source/app/task_screen.c b/source/app/task_screen.c index cf6ad2c..fe0842c 100644 --- a/source/app/task_screen.c +++ b/source/app/task_screen.c @@ -222,18 +222,26 @@ void L3_task_screen_handler(S_TASK_SCREEN *s) void constructor_scr_pkg() { U16 CRC = 0; - // L0_uart1_str("R.weight.kgx10_out: "); - // L0_uart1_us(R.weight.kgx10_out); - // L0_uart1_0d0a(); + U16 weight_kgx100 = 0; + L0_uart1_str("R.weight.kgx10_out: "); + L0_uart1_ushex(R.weight.kgx10_out); + L0_uart1_0d0a(); + + weight_kgx100 = R.weight_keep_flag == 0? (R.weight.kgx10_out * 10) : (R.weight_keep_kgx10 * 10); + if(R.danwei == KG) { - scrSetValPkg.weight_kgx100[0] = (R.weight.kgx10_out * 10) >> 8 & 0xFF; - scrSetValPkg.weight_kgx100[1] = (R.weight.kgx10_out * 10) >> 0 & 0xFF; + // scrSetValPkg.weight_kgx100[0] = (R.weight.kgx10_out * 10) >> 8 & 0xFF; + // scrSetValPkg.weight_kgx100[1] = (R.weight.kgx10_out * 10) >> 0 & 0xFF; + scrSetValPkg.weight_kgx100[0] = weight_kgx100 >> 8 & 0xFF; + scrSetValPkg.weight_kgx100[1] = weight_kgx100 >> 0 & 0xFF; } else if(R.danwei == lb) //1kg = 2.20462262磅 { - scrSetValPkg.weight_kgx100[0] = (R.weight.kgx10_out * 22) >> 8 & 0xFF; - scrSetValPkg.weight_kgx100[1] = (R.weight.kgx10_out * 22) >> 0 & 0xFF; + // scrSetValPkg.weight_kgx100[0] = (R.weight.kgx10_out * 22) >> 8 & 0xFF; + // scrSetValPkg.weight_kgx100[1] = (R.weight.kgx10_out * 22) >> 0 & 0xFF; + scrSetValPkg.weight_kgx100[0] = weight_kgx100 >> 8 & 0xFF; + scrSetValPkg.weight_kgx100[1] = weight_kgx100 >> 0 & 0xFF; } CRC = CRC_16(((U8 *)&scrSetValPkg) + 3, 5); @@ -438,7 +446,7 @@ U16 CRC_16(U8 *pMsg, U16 Len) void ScreenPingOff_judge() { U32 Nowtime = D_sys_now; - if( Nowtime - R.ScrTouch_time > D_COUNT_JIFFIES(60000)) //180000 180秒 30000 30秒 60000 60秒 + if( Nowtime - R.ScrTouch_time > D_COUNT_JIFFIES(180000)) //180000 180秒 30000 30秒 60000 60秒 { R.ScrTouch_flag = 0; R.power_mode = POWER_LOW; diff --git a/source/app/task_weight_keep.c b/source/app/task_weight_keep.c new file mode 100644 index 0000000..83cd746 --- /dev/null +++ b/source/app/task_weight_keep.c @@ -0,0 +1,133 @@ + +#include "task_weight_keep.h" +#include "app_config.h" +#include "../bsp/TTSSbsp/bsp_config.h" +#include "../msp/uart/msp_uart1.h" +#include "../clib/c_type51.h" + +S_TASK_WEIGHT_KEEP _s_task_weight_keep; + +//============================================= +void L3_task_weight_keep_init(void) +{ + L1_task_init(&_s_task_weight_keep.task); + L3_task_s_go(_s_task_weight_keep,D_task_init); +} + +#define D_task_WEIGHT_KEEP_1 0x50 +#define D_task_WEIGHT_KEEP_LEAVE_JUDGE 0x51 +#define D_task_WEIGHT_KEEP_ENTER_JUDGE 0x52 +#define D_task_WEIGHT_KEEP_4 0x53 + +void L3_task_weight_keep_handler(S_TASK_WEIGHT_KEEP *s) +{ + U16 weight_keep_kgx10 = 0; + U16 weight_real_kgx10 = 0; + + TTSS_Task_init(): + L2_task_go(D_task_WEIGHT_KEEP_1); + + TTSS_Task_step(D_task_WEIGHT_KEEP_1): + if(R.weight_keep_flag == 1) + { +// LED0 = LED0_OFF; + L0_uart1_str("keep status "); + L0_uart1_0d0a(); + //当前处于保持状态 + //判定是否打破 + //连续1s，100ms检测一次，判断实际重量相比保持重量，超过3kg，取消保持 + s->levelJudgeTimes = 10; + //3kg + s->levelWeightThresholdKgx10 = 30; + // s->levelTimesThreshold = 10; + s->levelTimes = 8; + s->levelTimes = 0; + L2_task_go_Tdelay(D_task_WEIGHT_KEEP_LEAVE_JUDGE, 0); + } + else + { +// LED0 = LED0_ON; + L0_uart1_str("not keep status "); + L0_uart1_0d0a(); + //当前处于非保持状态 + //判定是否进入保持状态 + //保持判定：连续2s，100ms检测一次，检测实际称重变化小于0.5kg，则设定保持标志为1，weight_keep_kgx10取3s均值 + s->enterJudgeTimes = 20; + s->enterTimes = s->enterJudgeTimes; + //0.5kg + s->enterWeightThresholdKgx10 = 5; //10 1kg 5 0.5kg + s->enterMaxWeight = 0; + s->enterMinWeight = R.weight.kgx10_out; + s->enterSumWeight = 0; + L2_task_go_Tdelay(D_task_WEIGHT_KEEP_ENTER_JUDGE, 0); + } + + TTSS_Task_step(D_task_WEIGHT_KEEP_LEAVE_JUDGE): + weight_keep_kgx10 = R.weight_keep_kgx10; + weight_real_kgx10 = R.weight.kgx10_out; + if(Lc_abs(weight_keep_kgx10, weight_real_kgx10) > s->levelWeightThresholdKgx10) + { + s->levelTimes++; + // L0_uart1_str("i get here here!! s->levelJudgeTimes = "); + // L0_uart1_uchex(s->levelJudgeTimes); + // L0_uart1_0d0a(); + // L0_uart1_str("s->levelTimes = "); + // L0_uart1_uchex(s->levelTimes); + // L0_uart1_0d0a(); + } + if(--s->levelJudgeTimes > 0) + { + L2_task_go_Tdelay(D_task_WEIGHT_KEEP_LEAVE_JUDGE, D_Tdelay_100ms); + } + else + { + if(s->levelTimes >= s->levelTimesThreshold) + { + + R.weight_keep_flag = 0; + + L0_uart1_str("s->levelTimesThreshold = "); + L0_uart1_uchex(s->levelTimesThreshold); + L0_uart1_0d0a(); + } + L2_task_go_Tdelay(D_task_WEIGHT_KEEP_1, 0); + } + + TTSS_Task_step(D_task_WEIGHT_KEEP_ENTER_JUDGE): + weight_real_kgx10 = R.weight.kgx10_out; + s->enterSumWeight += weight_real_kgx10; + if(weight_real_kgx10 < s->enterMinWeight) + { + s->enterMinWeight = weight_real_kgx10; + } + if(weight_real_kgx10 > s->enterMaxWeight) + { + s->enterMaxWeight = weight_real_kgx10; + } + if(-- s->enterTimes > 0) + { + L0_uart1_str("s->enterTimes = "); + L0_uart1_uchex(s->enterTimes); + L0_uart1_0d0a(); + L2_task_go_Tdelay(D_task_WEIGHT_KEEP_ENTER_JUDGE, D_Tdelay_100ms); + } + else + { + if(Lc_abs(s->enterMaxWeight, s->enterMinWeight) < s->enterWeightThresholdKgx10) + { + R.weight_keep_flag = 1; + R.weight_keep_kgx10 = (U16)(s->enterSumWeight / s->enterJudgeTimes); + + // L0_uart1_str("i get final !!!!!!!!!!! "); + // L0_uart1_str("R.weight_keep_kgx10: "); + // L0_uart1_ushex(R.weight_keep_kgx10); + } + L2_task_go_Tdelay(D_task_WEIGHT_KEEP_1, 0); + } + + TTSS_Task_end(); +} + + + + diff --git a/source/app/task_weight_keep.h b/source/app/task_weight_keep.h new file mode 100644 index 0000000..d2838b9 --- /dev/null +++ b/source/app/task_weight_keep.h @@ -0,0 +1,57 @@ +//////////////////////////////////////////////////////////////////////////// +///@copyright Copyright (c) 2018, 传控科技 All rights reserved. +///------------------------------------------------------------------------- +/// @file bsp_drv.h +/// @brief bsp @ driver config +///------------------------------------------------------------------------- +/// @version 1.0 +/// @author CC +/// @date 20180331 +/// @note cc_AS_stc02 + +////////////////////////////////////////////////////////////////////////////// + +#ifndef _APP_TASK_WEIGHT_KEEP_H +#define _APP_TASK_WEIGHT_KEEP_H + +#include "../ctask/TTSS_task.h" +#include "../clib/c_lib.h" +#include "../clib/c_type51.h" + + + + +typedef struct _s_task_weight_keep +{ + TS_task task; + //100ms一次，离开保持状态判定的次数 + U8 levelJudgeTimes; + //离开保持重量阈值 + U16 levelWeightThresholdKgx10; + //阈值 + U8 levelTimesThreshold; + //单位时间呢，超过阈值的次数 + U8 levelTimes; + + //100ms一次，进入保持状态判定的次数 + U8 enterJudgeTimes; + //单位时间，超过阈值的次数 + U8 enterTimes; + //进入保持重量阈值 + U16 enterWeightThresholdKgx10; + //最大值 + U16 enterMaxWeight; + //最小值 + U16 enterMinWeight; + //求和 + U32 enterSumWeight; +}S_TASK_WEIGHT_KEEP; + +extern S_TASK_WEIGHT_KEEP _s_task_weight_keep; + +extern void L3_task_weight_keep_init(void); +extern void L3_task_weight_keep_handler(S_TASK_WEIGHT_KEEP *s); + + +#endif // #ifndef _APP_TASK_WEIGHT_KEEP_H +