diff --git a/.vscode/settings.json b/.vscode/settings.json index fa8341b..04a88ab 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -16,6 +16,7 @@ "task_screen_save.h": "c", "app_screen_save.h": "c", "msp_eeprom.h": "c", - "app_weight.h": "c" + "app_weight.h": "c", + "bsp_msa300.h": "c" } } \ No newline at end of file diff --git a/keilp/stcTTSS2_W5.uvguix.Administrator b/keilp/stcTTSS2_W5.uvguix.Administrator index 0228628..d79c8aa 100644 --- a/keilp/stcTTSS2_W5.uvguix.Administrator +++ b/keilp/stcTTSS2_W5.uvguix.Administrator @@ -73,7 +73,7 @@ 44 2 - 2 + 3 -32000 -32000 @@ -93,7 +93,7 @@ 0 921 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000B00000002000000010000001F453A5C5765696768742D464C545C736F757263655C6170705C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF25453A5C5765696768742D464C545C736F757263655C6170705C6170705F7765696768742E68000000000C6170705F7765696768742E6800000000F6FA7D00FFFFFFFF26453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F73637265656E2E63000000000D7461736B5F73637265656E2E6300000000BECEA100FFFFFFFF25453A5C5765696768742D464C545C736F757263655C6170705C6170705F7765696768742E63000000000C6170705F7765696768742E6300000000B3A6BE00FFFFFFFF25453A5C5765696768742D464C545C736F757263655C6170705C6170705F636F6E6669672E63000000000C6170705F636F6E6669672E6300000000EAD6A300FFFFFFFF26453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F73637265656E2E68000000000D7461736B5F73637265656E2E6800000000F0A0A100FFFFFFFF28453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F626564616C61726D2E63000000000F7461736B5F626564616C61726D2E6300000000BCA8E100FFFFFFFF28453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F626564616C61726D2E68000000000F7461736B5F626564616C61726D2E68000000009CC1B600FFFFFFFF2D453A5C5765696768742D464C545C736F757263655C6273705C545453536273705C6273705F636F6E6669672E68000000000C6273705F636F6E6669672E6800000000F7B88600FFFFFFFF25453A5C5765696768742D464C545C736F757263655C6170705C6170705F636F6E6669672E68000000000C6170705F636F6E6669672E6800000000D9ADC200FFFFFFFF26453A5C5765696768742D464C545C736F757263655C64656275675C64656275675F6472762E68000000000B64656275675F6472762E6800000000A5C2D700FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000001D84FFFF4F83FFFF808AFFFF5286FFFF + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000B00000002000000010000001F453A5C5765696768742D464C545C736F757263655C6170705C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF25453A5C5765696768742D464C545C736F757263655C6170705C6170705F7765696768742E68000000000C6170705F7765696768742E6800000000FFDC7800FFFFFFFF26453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F73637265656E2E63000000000D7461736B5F73637265656E2E6300000000BECEA100FFFFFFFF25453A5C5765696768742D464C545C736F757263655C6170705C6170705F7765696768742E63000000000C6170705F7765696768742E6300000000F0A0A100FFFFFFFF25453A5C5765696768742D464C545C736F757263655C6170705C6170705F636F6E6669672E63000000000C6170705F636F6E6669672E6300000000BCA8E100FFFFFFFF26453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F73637265656E2E68000000000D7461736B5F73637265656E2E68000000009CC1B600FFFFFFFF28453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F626564616C61726D2E63000000000F7461736B5F626564616C61726D2E6300000000F7B88600FFFFFFFF28453A5C5765696768742D464C545C736F757263655C6170705C7461736B5F626564616C61726D2E68000000000F7461736B5F626564616C61726D2E6800000000D9ADC200FFFFFFFF2D453A5C5765696768742D464C545C736F757263655C6273705C545453536273705C6273705F636F6E6669672E68000000000C6273705F636F6E6669672E6800000000A5C2D700FFFFFFFF25453A5C5765696768742D464C545C736F757263655C6170705C6170705F636F6E6669672E68000000000C6170705F636F6E6669672E6800000000B3A6BE00FFFFFFFF26453A5C5765696768742D464C545C736F757263655C64656275675C64656275675F6472762E68000000000B64656275675F6472762E6800000000EAD6A300FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000001D010000660000008007000069030000 @@ -116,7 +116,7 @@ 16 - 940100006600000090050000F6000000 + D4020000C5000000D006000055010000 @@ -1281,7 +1281,7 @@ 2619 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFF94010000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000000000000940100006600000090050000F6000000940100004F00000090050000DF0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFFC0300004F0000000004000029020000000000000200000004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C00000180004000000000000000040000660000009005000040020000000400004F00000090050000290200000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF190100004F0000001D010000520300000100000002000010040000000100000005FFFFFF7A060000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000000000000660000001901000069030000000000004F00000019010000520300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000003002000090050000D4020000000000001902000090050000BD02000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000520300008007000056030000010000000100001004000000010000000000000000000000FFFFFFFF04000000C5000000C7000000B40100007794000001800080000001000000000000006D03000080070000FD030000000000005603000080070000E60300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFF94010000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000000000000D4020000C5000000D006000055010000940100004F00000090050000DF0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFFC0300004F0000000004000029020000000000000200000004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C00000180004000000000000040050000C5000000D00600009F020000000400004F00000090050000290200000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF190100004F0000001D010000520300000100000002000010040000000100000005FFFFFF7A060000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000040010000C500000059020000C8030000000000004F00000019010000520300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB09000001800080000000000000400100008F020000D006000033030000000000001902000090050000BD02000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000520300008007000056030000010000000100001004000000010000000000000000000000FFFFFFFF04000000C5000000C7000000B4010000779400000180008000000100000040010000CC030000C00800005C040000000000005603000080070000E60300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 @@ -1320,7 +1320,7 @@ Debug 2220 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000002001380D88B000000000000310000000757617463682031000000000000000000000000010000000100000000000000000000000100000000001380D98B0000000000003100000007576174636820320000000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000084D656D6F72792031000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000084D656D6F72792032000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000084D656D6F72792033000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000084D656D6F727920340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000755415254202331000000000000000000000000010000000100000000000000000000000100000000001380940700000000000033000000075541525420233200000000000000000000000001000000010000000000000000000000010000000000138095070000000000003300000007554152542023330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000000E49544D2F525441205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380658A000000000000340000000E4C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E00000014506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000D436F646520436F76657261676500000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138001890000000000003600000007546F6F6C626F7800000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000002001380D88B000000000000310000000757617463682031000000000000000000000000010000000100000000000000000000000100000000001380D98B0000000000003100000007576174636820320000000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000084D656D6F72792031000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000084D656D6F72792032000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000084D656D6F72792033000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000084D656D6F727920340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000755415254202331000000000000000000000000010000000100000000000000000000000100000000001380940700000000000033000000075541525420233200000000000000000000000001000000010000000000000000000000010000000000138095070000000000003300000007554152542023330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000000E49544D2F525441205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380658A000000000000340000000E4C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E00000014506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000D436F646520436F76657261676500000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138001890000000000003600000007546F6F6C626F7800000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -1348,8 +1348,8 @@ ..\source\app\main.c 0 - 23 - 24 + 70 + 104 1 0 @@ -1357,7 +1357,7 @@ ..\source\app\app_weight.h 21 - 138 + 140 161 1 @@ -1365,9 +1365,9 @@ ..\source\app\task_screen.c - 0 - 160 - 186 + 46 + 127 + 148 1 0 @@ -1375,7 +1375,7 @@ ..\source\app\app_weight.c 0 - 497 + 511 532 1 @@ -1384,7 +1384,7 @@ ..\source\app\app_config.c 0 - 152 + 157 166 1 @@ -1393,7 +1393,7 @@ ..\source\app\task_screen.h 0 - 25 + 33 52 1 @@ -1402,7 +1402,7 @@ ..\source\app\task_bedalarm.c 0 - 7 + 14 15 1 @@ -1420,7 +1420,7 @@ ..\source\bsp\TTSSbsp\bsp_config.h 17 - 33 + 37 58 1 @@ -1429,7 +1429,7 @@ ..\source\app\app_config.h 0 - 263 + 272 291 1 @@ -1438,7 +1438,7 @@ ..\source\debug\debug_drv.h 0 - 89 + 104 125 1 diff --git a/source/app/app_screen_save.c b/source/app/app_screen_save.c index 5b65c81..6512a33 100644 --- a/source/app/app_screen_save.c +++ b/source/app/app_screen_save.c @@ -1,11 +1,8 @@ #include "app_screen_save.h" #include "../msp/msp_eeprom.h" +#include "../msp/uart/msp_uart1.h" +#include "../app/app_config.h" -//定义所使用内存的起始和结尾标志 -#define HEAD0 0xa3 -#define HEAD1 0xa4 -#define TAIL0 0xa5 -#define TAIL1 0xa6 SCREEN_SAVE screen_save_arr[SCREEN_SAVE_LEN] = {0}; @@ -17,13 +14,13 @@ void screen_save_init() { screen_save_arr[i].head[0] = HEAD0; screen_save_arr[i].head[1] = HEAD1; - screen_save_arr[i].available = 0; - screen_save_arr[i].kgx10_out = 0; + screen_save_arr[i].available = 1; + screen_save_arr[i].kgx100_out = 0; screen_save_arr[i].tail[0] = TAIL0; screen_save_arr[i].tail[1] = TAIL1; } } -//存放重量数据到eeprom中 +//存放重量数据到eeprom中:1.从eeprom中取出数组 2.遍历寻找空位 3.把数组放回(写入)eeprom中 void screen_save_push(U16 weight) { int i = 0; @@ -55,7 +52,11 @@ void screen_save_push(U16 weight) } // 放到free位置 screen_save_arr[free].available = 0; - screen_save_arr[free].kgx10_out = weight; - // 把数组放回eeprom中 + screen_save_arr[free].kgx100_out = weight; + // 把数组放回(写入)eeprom中 L0_Iap_Program_array(EEPROM_WEIGHT_ADDR, screen_save_arr,sizeof(screen_save_arr)); -} + // L0_uart1_str("L0_Iap_Program_array OK!!!!! "); + // L0_uart1_0d0a(); + // L0_uart1_us(weight); + // L0_uart1_0d0a(); +} diff --git a/source/app/app_screen_save.h b/source/app/app_screen_save.h index 63abaab..e4708a9 100644 --- a/source/app/app_screen_save.h +++ b/source/app/app_screen_save.h @@ -3,16 +3,22 @@ #include "../bsp/TTSSbsp/bsp_config.h" +//定义所使用内存的起始和结尾标志 +#define HEAD0 0xa3 +#define HEAD1 0xa4 +#define TAIL0 0xa5 +#define TAIL1 0xa6 + #define SCREEN_SAVE_LEN 10 //寄存器需要存放的最大数量为10组 -#define EEPROM_WEIGHT_ADDR 0x100 //定义一个起始地址为0x100的寄存器 +#define EEPROM_WEIGHT_ADDR 0x200 //定义一个起始地址为0x200的寄存器 //用来存储重量数据的结构体(数组) typedef struct { U8 head[2]; U8 available; - U16 kgx10_out; + U16 kgx100_out; U8 tail[2]; }SCREEN_SAVE; diff --git a/source/app/main.h b/source/app/main.h index 7a68b0e..e78958a 100644 --- a/source/app/main.h +++ b/source/app/main.h @@ -92,6 +92,7 @@ #include "bsp_pt100x.h" #include "app_weight.h" #include "task_screen.h" +#include "app_screen_save.h" #include "task_bedalarm.h" #include "app_config.h" diff --git a/source/app/task_screen.c b/source/app/task_screen.c index efd02cd..7bb6c7d 100644 --- a/source/app/task_screen.c +++ b/source/app/task_screen.c @@ -1,32 +1,14 @@ #include "task_screen.h" -#include "../app/app_config.h" +#include "app_config.h" #include "../msp/uart/msp_uart1.h" -#include "msp_uart1.h" +#include "../msp_uart1.h" #include "debug_drv.h" #include "../msp/msp_eeprom.h" -#include "app_screen_save.h" - +#include "../msp/uart/msp_uart1.h" S_TASK_SCREEN _s_task_screen; -// SCRSetValPkg scrSetValPkg = -// { -// 0xA5, 0x5A, //帧头 -// 0x1C, //长度 -// 0x82, //指令 -// 0x02, 0xA1, //起始地址 -// 0x00, 0x00, //体重 -// 0x00, 0x00, //电量 -// 0x00, 0x00, //网络状态 -// 0x00, 0x00, //单位标志 -// 0x00, 0x00, //语言标志 -// 0x00, 0x00, //蜂鸣器状态 -// 0x00, 0x00, // -// 0x00, 0x00, //离床报警标志 -// 0x00, 0x00, // -// 0x1C, 0x78, //CRC -// }; - +// 实时重量 SCRSetValPkg scrSetValPkg = { 0xA5, 0x5A, //帧头 @@ -37,6 +19,36 @@ SCRSetValPkg scrSetValPkg = 0x1C, 0x78, //CRC }; +// 历史重量 +SCRSaveValPkg scrSaveValPkg = +{ + 0xA5, 0x5A, //帧头 + 0x2D, //长度 + 0x82, //指令 + 0x02, 0xB1, //起始地址 + 0x00, 0x01, //序号1 + 0x00, 0x01, //历史重量1 + 0x00, 0x02, //序号2 + 0x00, 0x02, //历史重量2 + 0x00, 0x03, //序号3 + 0x00, 0x03, //历史重量3 + 0x00, 0x04, //序号4 + 0x00, 0x00, //历史重量4 + 0x00, 0x05, //序号5 + 0x00, 0x00, //历史重量5 + 0x00, 0x06, //序号6 + 0x00, 0x00, //历史重量6 + 0x00, 0x07, //序号7 + 0x00, 0x00, //历史重量7 + 0x00, 0x08, //序号8 + 0x00, 0x00, //历史重量8 + 0x00, 0x09, //序号9 + 0x00, 0x00, //历史重量9 + 0x00, 0x0A, //序号10 + 0x00, 0x00, //历史重量10 + 0x97, 0xCE, //CRC +}; + //息屏指令 SCRControlPkg scrPingOffPkg = { 0xA5, 0x5A, @@ -55,20 +67,23 @@ SCRControlPkg scrPingOnPkg = { 0x71, 0xAC, // CRC }; +//蜂鸣器指令A5 5A 05 80 02 C8 70 DE +SCRControlPkg scrBeepOnPkg = { + 0xA5, 0x5A, + 0x05, //长度 + 0x80, //指令 + 0x02, 0xC8, //数据 + 0x70, 0xDE, // CRC +}; + //============================================= void L3_task_screen_init(void) { L1_task_init(&_s_task_screen.task); _s_task_screen.power_mode = R.power_mode; L3_task_s_go(_s_task_screen, D_task_init); - - } -// #define D_TASK_SCREEN_SEND_CONTROL 0x50 -// #define D_TASK_SCREEN_SEND_VAL 0x51 -// #define D_task_RFID_SET 0x52 - #define D_task_RS485_SEND_BEFORE 0x50 #define D_task_RS485_SEND 0x51 #define D_task_RS485_SEND_AFTER 0x52 @@ -92,6 +107,7 @@ void L3_task_screen_handler(S_TASK_SCREEN *s) // L0_uart1_uchex(s->power_mode ); // L0_uart1_0d0a(); + //检测到模式转变 if(s->power_mode != R.power_mode) { s->power_mode = R.power_mode; @@ -106,10 +122,15 @@ void L3_task_screen_handler(S_TASK_SCREEN *s) L1_uart1_Array((U8 *)&scrPingOnPkg, sizeof(scrPingOnPkg)); } } + if (R.beep == beep_on) + { + //发送蜂鸣器指令 + L1_uart1_Array((U8 *)&scrBeepOnPkg, sizeof(scrBeepOnPkg)); + } L2_task_go_Tdelay(D_task_RS485_SEND, D_Tdelay_400ms); //发送 TTSS_Task_step(D_task_RS485_SEND): - if (R.power_mode == POWER_NORMAL) + if(R.power_mode == POWER_NORMAL) { //构造pkg constructor_scr_pkg(); @@ -118,10 +139,10 @@ void L3_task_screen_handler(S_TASK_SCREEN *s) } L2_task_go_Tdelay(D_task_RS485_SEND_BEFORE, D_Tdelay_400ms); //发送后 - TTSS_Task_step(D_task_RS485_SEND_AFTER): - L2_task_go_Tdelay(D_task_RS485_SEND, D_Tdelay_100ms); + // TTSS_Task_step(D_task_RS485_SEND_AFTER): + // L2_task_go_Tdelay(D_task_RS485_SEND, D_Tdelay_100ms); - TTSS_Task_end(); + TTSS_Task_end(); } //构造屏幕协议包 @@ -164,6 +185,23 @@ void constructor_scr_pkg() scrSetValPkg.crc[0] = CRC >> 8; } +//构造历史重量数据协议包 +void constructor_weightsave_pkg() +{ + U16 CRC = 0; + U8 i = 0; + + for (i = 0; i < SCREEN_SAVE_LEN; i++) + { + scrSaveValPkg.weight_save[i].save_val[0] = (screen_save_arr[i].kgx100_out ) >> 8; + scrSaveValPkg.weight_save[i].save_val[1] = screen_save_arr[i].kgx100_out; + } + + CRC = CRC_16(((U8 *)&scrSaveValPkg) + 3, 43); + scrSaveValPkg.crc[1] = CRC; + scrSaveValPkg.crc[0] = CRC >> 8; +} + // 屏幕回传协议解析 A5 5A 07 83 00 01 02 22 00 00 void parse_screen_pkg() { @@ -174,8 +212,6 @@ void parse_screen_pkg() { if(p->cmd == 0x83) { - //L0_uart1_str("Enter1->:"); - // L0_uart1_0d0a(); R.ScrTouch_flag = 1; R.power_mode = POWER_NORMAL; R.ScrTouch_time = D_sys_now; //2024.9.13 15:04:59 @@ -210,11 +246,19 @@ void parse_screen_pkg() R.danwei = p->Data[1]; break; case 0xD8://查看历史数据 - L0_Iap_Read_array(EEPROM_WEIGHT_ADDR, screen_save_arr,sizeof(screen_save_arr));//1先从eeprom中读出数组 - // 判断头尾 - - // 2推送到屏幕 - + // 1.从eeprom中读出数组 + L0_Iap_Read_array(EEPROM_WEIGHT_ADDR, screen_save_arr,sizeof(screen_save_arr)); + // 2.判断头尾 + if(screen_save_arr[0].head[0] != HEAD0 || screen_save_arr[0].head[1] != HEAD1 + || screen_save_arr[0].tail[0] != TAIL0 || screen_save_arr[0].tail[1] != TAIL1) + { + screen_save_init(); + } + // 3.推送到屏幕 + // 构造pkg + constructor_weightsave_pkg(); + // 发送pkg + L1_uart1_Array((U8 *)&scrSaveValPkg, sizeof(scrSaveValPkg)); break; case 0xD9://校准确认 buf[index] 放入寄存器,写入eeprom // ts_weight_SPara.ts_WPoint[pd485->buf[0]].kg = D_2uc_u16(pd485->buf[1],pd485->buf[2]); @@ -230,7 +274,7 @@ void parse_screen_pkg() } } // 数据录入(确认键) - if(p->start_addr[0] == 0x07) + else if(p->start_addr[0] == 0x07) { switch (p->start_addr[1]) { @@ -245,6 +289,13 @@ void parse_screen_pkg() } } } + // 亮屏时回传A5 5A 06 81 01 01 40 79 B8 + if(p->cmd == 0x81 && p->num_word == 0x40 ) + { + R.ScrTouch_flag = 1; + R.power_mode = POWER_NORMAL; + R.ScrTouch_time = D_sys_now; + } } } @@ -266,10 +317,10 @@ U16 CRC_16(U8 *pMsg, U16 Len) } // 180s无操作 判定函数 -void ScreenPingOff_judge(void) +void ScreenPingOff_judge() { U32 Nowtime = D_sys_now; - if( Nowtime - R.ScrTouch_time > D_COUNT_JIFFIES(5000)) //180000 180秒 + if( Nowtime - R.ScrTouch_time > D_COUNT_JIFFIES(30000)) //180000 180秒 { R.ScrTouch_flag = 0; R.power_mode = POWER_LOW; diff --git a/source/app/task_screen.h b/source/app/task_screen.h index dc90166..bf3818a 100644 --- a/source/app/task_screen.h +++ b/source/app/task_screen.h @@ -3,6 +3,7 @@ #include "TTSS_task.h" #include "c_lib.h" +#include "app_screen_save.h" typedef struct _s_task_screen { @@ -22,6 +23,24 @@ typedef struct U8 crc[2]; } SCRSetValPkg; +typedef struct +{ + U8 num[2]; + U8 save_val[2]; +} WEIGHT_SAVE; + +typedef struct +{ + U8 head[2]; + U8 num; + U8 cmd; + U8 start_addr[2]; + WEIGHT_SAVE weight_save[SCREEN_SAVE_LEN]; + U8 crc[2]; +} SCRSaveValPkg; + +// WEIGHT_SAVE weight_save[SCREEN_SAVE_LEN] = {0}; + // typedef struct // { // U8 head[2]; @@ -53,6 +72,7 @@ typedef struct // } SCRSetValPkg; // A5 5A 08 83 00 00 01 02 22 00 00 +// A5 5A 06 81 01 01 40 79 B8 typedef struct { U8 head[2]; //A5 5A:帧头 @@ -88,6 +108,7 @@ extern S_TASK_SCREEN _s_task_screen; extern void L3_task_screen_init(void); extern void L3_task_screen_handler(S_TASK_SCREEN *s); extern void constructor_scr_pkg(); +extern void constructor_weightsave_pkg(); extern void parse_screen_pkg(); extern void ScreenPingOff_judge(); diff --git a/source/bsp/TTSSbsp/bsp_config.h b/source/bsp/TTSSbsp/bsp_config.h index d518c6d..7a45847 100644 --- a/source/bsp/TTSSbsp/bsp_config.h +++ b/source/bsp/TTSSbsp/bsp_config.h @@ -48,7 +48,7 @@ /// #define D_sys_MainFre MainFre_44M////STC8A8K64D4 z最大45M #define D_sys_Jiffies TYPE_JIFFIES_12MS -#warning "MainFre_22M" +//#warning "MainFre_22M" #define D_MCU_NAME "STC8A8K64U4" #define D_str_version "\r\n stcTTSS2NB2_"