Skip to content

R
RT_RMR42E
Commit b0cebb4e authored by 李冠华's avatar 李冠华
Browse files
Options

🦄 refactor:将单次工作时长、累计工作时长处理逻辑从显示部分独立出来

parent 8acf7053
Hide whitespace changes
Inline Side-by-side
Showing with 255 additions and 117 deletions
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvguix.Administrator
View file @ b0cebb4e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<Header>### uVision Project, (C) Keil Software</Header> <Header>### uVision Project, (C) Keil Software</Header>
<PrjGuiSettings> <PrjGuiSettings>
<LastAddFilePath>Z:\D工作\code\rt_rmr42e\Firmware\Source\Application\Data_Fuel</LastAddFilePath> <LastAddFilePath>Z:\D工作\code\rt_rmr42e\Firmware\Source\Application\Driving_Information</LastAddFilePath>
</PrjGuiSettings> </PrjGuiSettings>
<ViewPool/> <ViewPool/>
...@@ -110,8 +110,8 @@ ...@@ -110,8 +110,8 @@
<MDIClientArea> <MDIClientArea>
<RegID>0</RegID> <RegID>0</RegID>
<MDITabState> <MDITabState>
<Len>1407</Len> <Len>1519</Len>
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000B0000000000000001000000355A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C53797374656D5C6D61696E2E6300000000066D61696E2E6300000000BECEA100FFFFFFFF4C5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C436F6D706F6E656E745C54656C6C74616C65735C54656C6C74616C65735F757365722E63000000001054656C6C74616C65735F757365722E6300000000F0A0A100FFFFFFFF4D5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C5345475F444953504C41595C5345475F444953504C41592E63000000000D5345475F444953504C41592E63000000009CC1B600FFFFFFFF555A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C436F6D6D6F6E496E746572666163655C436F6D6D6F6E496E746572666163652E630000000011436F6D6D6F6E496E746572666163652E6300000000F7B88600FFFFFFFF3E5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C53797374656D5C5379735F5461736B5F4C6973742E63000000000F5379735F5461736B5F4C6973742E6300000000D9ADC200FFFFFFFF4D5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C4755495F446973706C61795C4755495F446973706C61792E63000000000D4755495F446973706C61792E6300000000F6FA7D00FFFFFFFF5E5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C43414E5F4150505C43414E5F4348305F43414E5F436F6D6D756E69636174696F6E5F4D61747269782E63000000002243414E5F4348305F43414E5F436F6D6D756E69636174696F6E5F4D61747269782E6300000000B5E99D00FFFFFFFF575A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C50726F6A6563745C436D73656D69636F6E5C4241543332413233395C4D444B5F41524D5C4F626A656374735C524D523432452E736374000000000A524D523432452E73637400000000CACAD500FFFFFFFF475A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C446174615F536F635C446174615F536F632E63000000000A446174615F536F632E6300000000FFDC7800FFFFFFFF4A5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C43414E5F557365725C43616E5F52585F557365722E63000000000D43616E5F52585F557365722E6300000000B3A6BE00FFFFFFFF735A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C50726F6A6563745C436D73656D69636F6E5C4241543332413233395C4D444B5F41524D5C5254455C4465766963655C424154333247313339474B363446425C737461727475705F4241543332473133392E730000000013737461727475705F4241543332473133392E7300000000EAD6A300FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000002701000065000000B606000043010000</Data> <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000C0000000500000001000000355A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C53797374656D5C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF4C5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C436F6D706F6E656E745C54656C6C74616C65735C54656C6C74616C65735F757365722E63000000001054656C6C74616C65735F757365722E6300000000FFDC7800FFFFFFFF4D5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C5345475F444953504C41595C5345475F444953504C41592E63000000000D5345475F444953504C41592E6300000000BECEA100FFFFFFFF555A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C436F6D6D6F6E496E746572666163655C436F6D6D6F6E496E746572666163652E630000000011436F6D6D6F6E496E746572666163652E6300000000F0A0A100FFFFFFFF3E5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C53797374656D5C5379735F5461736B5F4C6973742E63000000000F5379735F5461736B5F4C6973742E6300000000BCA8E100FFFFFFFF4D5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C4755495F446973706C61795C4755495F446973706C61792E63000000000D4755495F446973706C61792E63000000009CC1B600FFFFFFFF5E5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C43414E5F4150505C43414E5F4348305F43414E5F436F6D6D756E69636174696F6E5F4D61747269782E63000000002243414E5F4348305F43414E5F436F6D6D756E69636174696F6E5F4D61747269782E6300000000F7B88600FFFFFFFF575A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C50726F6A6563745C436D73656D69636F6E5C4241543332413233395C4D444B5F41524D5C4F626A656374735C524D523432452E736374000000000A524D523432452E73637400000000D9ADC200FFFFFFFF475A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C446174615F536F635C446174615F536F632E63000000000A446174615F536F632E6300000000A5C2D700FFFFFFFF4A5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C43414E5F557365725C43616E5F52585F557365722E63000000000D43616E5F52585F557365722E6300000000B3A6BE00FFFFFFFF735A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C50726F6A6563745C436D73656D69636F6E5C4241543332413233395C4D444B5F41524D5C5254455C4465766963655C424154333247313339474B363446425C737461727475705F4241543332473133392E730000000013737461727475705F4241543332473133392E7300000000EAD6A300FFFFFFFF535A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C44726976696E675F496E666F726D6174696F6E5C446174615F54696D652E63000000000B446174615F54696D652E6300000000F6FA7D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000002701000065000000B606000043010000</Data>
</MDITabState> </MDITabState>
</MDIClientArea> </MDIClientArea>
<ViewEx> <ViewEx>
...@@ -1822,7 +1822,7 @@ ...@@ -1822,7 +1822,7 @@
<Name>Build</Name> <Name>Build</Name>
<Buttons> <Buttons>
<Len>972</Len> <Len>972</Len>
<Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000006524D523432459600000000000000010006524D52343245000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data> <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000006524D523432459600000000000000010006524D52343245000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
</Buttons> </Buttons>
<OriginalItems> <OriginalItems>
<Len>583</Len> <Len>583</Len>
...@@ -3547,7 +3547,7 @@ ...@@ -3547,7 +3547,7 @@
<Name>File</Name> <Name>File</Name>
<Buttons> <Buttons>
<Len>2889</Len> <Len>2889</Len>
<Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001E766F696420426C7565546F6F74685F4B4C33305F496E697428766F69642996000000000000000F001E766F696420426C7565546F6F74685F4B4C33305F496E697428766F6964290C4765745F4E74635F54656D7025446174615F56656869636C655F53706565645F50726F63657373696E675F5365727669636512446174615F436C6F636B5F5365727669636518446174615F4F444F5F4D696C656167655F5365727669636511506F7765725F57616B6575705F496E69740A43616E5F52785F43616B0F434F4D5F4150505F50726F636573730943616E5F57726974651B43616E5F4170705F5365745F427566665F30783041353046464535074132314646453707705458427566660A307830413130464645350B30783041313046464535300D5254455F554152545F496E6974000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001E766F696420426C7565546F6F74685F4B4C33305F496E697428766F69642996000000000000000F001E766F696420426C7565546F6F74685F4B4C33305F496E697428766F6964290C4765745F4E74635F54656D7025446174615F56656869636C655F53706565645F50726F63657373696E675F5365727669636512446174615F436C6F636B5F5365727669636518446174615F4F444F5F4D696C656167655F5365727669636511506F7765725F57616B6575705F496E69740A43616E5F52785F43616B0F434F4D5F4150505F50726F636573730943616E5F57726974651B43616E5F4170705F5365745F427566665F30783041353046464535074132314646453707705458427566660A307830413130464645350B30783041313046464535300D5254455F554152545F496E6974000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
</Buttons> </Buttons>
<OriginalItems> <OriginalItems>
<Len>1423</Len> <Len>1423</Len>
...@@ -3563,7 +3563,7 @@ ...@@ -3563,7 +3563,7 @@
<Name>Build</Name> <Name>Build</Name>
<Buttons> <Buttons>
<Len>955</Len> <Len>955</Len>
<Data>00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data> <Data>00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
</Buttons> </Buttons>
<OriginalItems> <OriginalItems>
<Len>583</Len> <Len>583</Len>
...@@ -3579,7 +3579,7 @@ ...@@ -3579,7 +3579,7 @@
<Name>Debug</Name> <Name>Debug</Name>
<Buttons> <Buttons>
<Len>2362</Len> <Len>2362</Len>
<Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000004002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000004002800000000000000000000000000000000010000000100000001801B80000000000400290000000000000000000000000000000001000000010000000180E57F0000000004002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000004002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020000002D0000000000000000000000000000000001000000010000000180F07F0000020000002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020000002F0000000000000000000000000000000001000000010000000180BB8A00000200000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data> <Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020000002D0000000000000000000000000000000001000000010000000180F07F0000020000002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020000002F0000000000000000000000000000000001000000010000000180BB8A00000200000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
</Buttons> </Buttons>
<OriginalItems> <OriginalItems>
<Len>898</Len> <Len>898</Len>
...@@ -3603,12 +3603,12 @@ ...@@ -3603,12 +3603,12 @@
<ActiveMDIGroup>0</ActiveMDIGroup> <ActiveMDIGroup>0</ActiveMDIGroup>
<MDIGroup> <MDIGroup>
<Size>100</Size> <Size>100</Size>
<ActiveTab>0</ActiveTab> <ActiveTab>5</ActiveTab>
<Doc> <Doc>
<Name>..\..\..\..\Source\System\main.c</Name> <Name>..\..\..\..\Source\System\main.c</Name>
<ColumnNumber>1</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<TopLine>45</TopLine> <TopLine>45</TopLine>
<CurrentLine>50</CurrentLine> <CurrentLine>62</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
<PaneID>0</PaneID> <PaneID>0</PaneID>
...@@ -3625,7 +3625,7 @@ ...@@ -3625,7 +3625,7 @@
<Doc> <Doc>
<Name>..\..\..\..\Source\Application\SEG_DISPLAY\SEG_DISPLAY.c</Name> <Name>..\..\..\..\Source\Application\SEG_DISPLAY\SEG_DISPLAY.c</Name>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<TopLine>2432</TopLine> <TopLine>2445</TopLine>
<CurrentLine>2453</CurrentLine> <CurrentLine>2453</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
...@@ -3643,7 +3643,7 @@ ...@@ -3643,7 +3643,7 @@
<Doc> <Doc>
<Name>..\..\..\..\Source\System\Sys_Task_List.c</Name> <Name>..\..\..\..\Source\System\Sys_Task_List.c</Name>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<TopLine>37</TopLine> <TopLine>56</TopLine>
<CurrentLine>65</CurrentLine> <CurrentLine>65</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
...@@ -3651,9 +3651,9 @@ ...@@ -3651,9 +3651,9 @@
</Doc> </Doc>
<Doc> <Doc>
<Name>..\..\..\..\Source\Application\GUI_Display\GUI_Display.c</Name> <Name>..\..\..\..\Source\Application\GUI_Display\GUI_Display.c</Name>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>52</ColumnNumber>
<TopLine>255</TopLine> <TopLine>136</TopLine>
<CurrentLine>263</CurrentLine> <CurrentLine>142</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
<PaneID>0</PaneID> <PaneID>0</PaneID>
...@@ -3703,6 +3703,15 @@ ...@@ -3703,6 +3703,15 @@
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
<PaneID>0</PaneID> <PaneID>0</PaneID>
</Doc> </Doc>
<Doc>
<Name>..\..\..\..\Source\Application\Driving_Information\Data_Time.c</Name>
<ColumnNumber>34</ColumnNumber>
<TopLine>28</TopLine>
<CurrentLine>40</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
</MDIGroup> </MDIGroup>
</MDIGroups> </MDIGroups>
......
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvprojx
View file @ b0cebb4e
...@@ -498,6 +498,16 @@ ...@@ -498,6 +498,16 @@
<FileType>5</FileType> <FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\Data_Fuel\Data_Fuel.h</FilePath> <FilePath>..\..\..\..\Source\Application\Data_Fuel\Data_Fuel.h</FilePath>
</File> </File>
<File>
<FileName>Data_Time.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Application\Driving_Information\Data_Time.c</FilePath>
</File>
<File>
<FileName>Data_Time.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\Driving_Information\Data_Time.h</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
......
Firmware/Source/Application/Application.h
View file @ b0cebb4e
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "Can_User/Can_RX_User.h" #include "Can_User/Can_RX_User.h"
#include "Data_Soc\Data_Soc.h" #include "Data_Soc\Data_Soc.h"
#include "Data_Fuel\Data_Fuel.h" #include "Data_Fuel\Data_Fuel.h"
#include "Driving_Information\Data_Time.h"
......
Firmware/Source/Application/Driving_Information/Data_Time.c 0 → 100644
View file @ b0cebb4e
#include "Components.h"
#include "Driving_Information\Data_Time.h"
DataTimeStruct_st_t Time;
void Data_Time_KL30_Init(void)
{
Time.SingleHour = 0U;
Time.SingleMin = 0U;
Time.TotalHour = 0U;
Time.SingleValid = 0U;
}
void Data_Time_KL15_Init(void)
{
}
void Data_Time_Single_Working_Hours(void)
{
uint8_t Clock_all = 0;
if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Charge_OFF_Flag == 0) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != PKEY_ON) && (System_Indicator_CANFlag != 1))
{
Clock_all = Get_CAN_Num_MMCU_SingleWorkingHours();
Time.SingleHour = Clock_all / 10U;
Time.SingleMin = (Clock_all % 10U) * 6U;
Time.SingleValid = 1;
}
else
{
Time.SingleValid = 0;
}
}
uint32_t u32Data_read[1] = {0};
uint32_t CumulativeWorkHours_Writeback = 0;
uint32_t CumulativeWorkHours_readDiffer = 0;
uint8_t CumulativeWorkHours_MAX_flag = 0;
void Data_Time_Total_Working_Hours(void)
{
uint32_t u32Data[1] = {0};
eeprom_ReadRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data_read, 4);
if (u32Data_read[0] > 99999)
{
u32Data[0] = 99999;
eeprom_WriteRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data, 4);
CumulativeWorkHours_MAX_flag = 1;
}
else
{
CumulativeWorkHours_MAX_flag = 0;
}
Time.TotalHour = u32Data_read[0];
}
void Data_CumulativeWorkHours_EEPROM_Write(void)
{
uint32_t CurrentData = 0;
uint32_t u32Data[1] = {0};
if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Charge_OFF_Flag == 0) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != PKEY_ON) && (System_Indicator_CANFlag != 1))
{
CurrentData = Get_CAN_Num_MMCU_AccumulatedWorkHours();
if (CumulativeWorkHours_MAX_flag == 0)
{
if (CurrentData > CumulativeWorkHours_Writeback)
{
CumulativeWorkHours_readDiffer = CurrentData - CumulativeWorkHours_Writeback;
eeprom_ReadRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data_read, 4);
u32Data[0] = u32Data_read[0] + CumulativeWorkHours_readDiffer;
eeprom_WriteRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data, 4);
CumulativeWorkHours_Writeback = CurrentData;
}
else if (CurrentData < CumulativeWorkHours_Writeback)
{
CumulativeWorkHours_readDiffer = CumulativeWorkHours_Writeback - CurrentData;
eeprom_ReadRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data_read, 4);
u32Data[0] = u32Data_read[0] - CumulativeWorkHours_readDiffer;
eeprom_WriteRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data, 4);
CumulativeWorkHours_Writeback = CurrentData;
}
}
else
{
if (CumulativeWorkHours_Writeback != 0)
{
if (CurrentData < CumulativeWorkHours_Writeback)
{
CumulativeWorkHours_readDiffer = CumulativeWorkHours_Writeback - CurrentData;
eeprom_ReadRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data_read, 4);
u32Data[0] = u32Data_read[0] - CumulativeWorkHours_readDiffer;
eeprom_WriteRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data, 4);
}
CumulativeWorkHours_Writeback = CurrentData;
}
}
}
}
/******************************************************************************
函数名：Get_SingleHour_Display
功 能：获取单次工作时长小时数函数
参 数：无
返回值：Time.SingleHour x1
******************************************************************************
注 意：该函数必须每 ms被调用一次
******************************************************************************/
uint8_t Get_SingleHour_Display(void)
{
return Time.SingleHour;
}
/******************************************************************************
函数名：Get_SingleMin_Display
功 能：获取单次工作时长分钟数函数
参 数：无
返回值：Time.SingleMin x1
******************************************************************************
注 意：该函数必须每 ms被调用一次
******************************************************************************/
uint8_t Get_SingleMin_Display(void)
{
return Time.SingleMin;
}
/******************************************************************************
函数名：Get_Single_Working_Hours_Status
功 能：获取单次工作时长状态函数
参 数：无
返回值：Time.SingleValid 0--无效， 1--有效
******************************************************************************
注 意：该函数必须每 ms被调用一次
******************************************************************************/
uint8_t Get_Single_Working_Hours_Status(void)
{
return Time.SingleValid;
}
/******************************************************************************
函数名：Get_Total_Working_Hours
功 能：获取累计工作时长函数
参 数：无
返回值：Time.TotalHour x10
******************************************************************************
注 意：该函数必须每 ms被调用一次
******************************************************************************/
uint32_t Get_Total_Working_Hours(void)
{
return Time.TotalHour;
}
/******************************************************************************
函数名：Get_Clock_All_lenth
功 能：获取累计工作时长数值长度函数
参 数：无
返回值：num x1
******************************************************************************
注 意：该函数必须每 ms被调用一次
******************************************************************************/
uint8_t Get_Clock_All_lenth(void)
{
uint8_t num = 0;
if (Time.TotalHour > 999)
{
num = 2;
}
else if (Time.TotalHour > 9)
{
num = 1;
}
return num;
}
Firmware/Source/Application/Driving_Information/Data_Time.h 0 → 100644
View file @ b0cebb4e
#ifndef DATA_TIME_H__
#define DATA_TIME_H__
#include "Application.h"
#include "Components.h"
typedef struct //__attribute__((aligned(4)))
{
uint8_t SingleHour; /*单次计时小时*/
uint8_t SingleMin; /*单次计时分钟*/
uint8_t SingleValid; /*单次工作时间有效状态*/
uint32_t TotalHour; /*累计计时小时*/
}DataTimeStruct_st_t;
extern void Data_Time_KL30_Init(void);
extern void Data_Time_KL15_Init(void);
extern void Data_Time_Single_Working_Hours(void);
extern void Data_Time_Total_Working_Hours(void);
extern void Data_CumulativeWorkHours_EEPROM_Write(void);
extern uint8_t Get_SingleHour_Display(void);
extern uint8_t Get_SingleMin_Display(void);
extern uint8_t Get_Single_Working_Hours_Status(void);
extern uint32_t Get_Total_Working_Hours(void);
extern uint8_t Get_Clock_All_lenth(void);
#endif
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @ b0cebb4e
...@@ -120,112 +120,37 @@ void Gauge_EleDial_AllSOC_Display(void) ...@@ -120,112 +120,37 @@ void Gauge_EleDial_AllSOC_Display(void)
SEG_SET_EleDial_AllSOC(u8AllSocValid, u8AllSocValue); SEG_SET_EleDial_AllSOC(u8AllSocValid, u8AllSocValue);
} }
uint8_t Clockonetime_flag = 0; /*单次工作时长显示函数*/
void Gauge_Clock_Display(void) void Gauge_Clock_Display(void)
{ {
uint32_t Clock_all = 0; uint8_t Clock_hours = Get_SingleHour_Display();
if (DISPLAY_OPEN) uint8_t Clock_min = Get_SingleMin_Display();
if (Get_Single_Working_Hours_Status() == 1U)
{ {
Clock_all = Get_CAN_Num_MMCU_SingleWorkingHours();
uint8_t Clock_hours = Clock_all / 10;
uint8_t Clock_min = (Clock_all % 10) * 6;
SEG_SET_Clock(Clock_hours, Clock_min, FLASH_SYNC_1Hz, 1, 1); SEG_SET_Clock(Clock_hours, Clock_min, FLASH_SYNC_1Hz, 1, 1);
Clockonetime_flag = 1;
} }
else else
{ {
SEG_SET_Clock(0, 0, 0, 0, 0); SEG_SET_Clock(0, 0, 0, 0, 0);
Clockonetime_flag = 0;
}
}
uint8_t Get_Clockonetime_lenth(void)
{
return Clockonetime_flag;
}
uint32_t u32Data_read[1] = {0};
uint32_t CumulativeWorkHours_Writeback = 0;
uint32_t CumulativeWorkHours_readDiffer = 0;
uint8_t CumulativeWorkHours_MAX_flag = 0;
void Data_CumulativeWorkHours_EEPROM_Write(void)
{
uint32_t CurrentData = 0;
uint32_t u32Data[1] = {0};
if (DISPLAY_OPEN)
{
CurrentData = Get_CAN_Num_MMCU_AccumulatedWorkHours();
if (CumulativeWorkHours_MAX_flag == 0)
{
if (CurrentData > CumulativeWorkHours_Writeback)
{
CumulativeWorkHours_readDiffer = CurrentData - CumulativeWorkHours_Writeback;
eeprom_ReadRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data_read, 4);
u32Data[0] = u32Data_read[0] + CumulativeWorkHours_readDiffer;
eeprom_WriteRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data, 4);
CumulativeWorkHours_Writeback = CurrentData;
}
else if (CurrentData < CumulativeWorkHours_Writeback)
{
CumulativeWorkHours_readDiffer = CumulativeWorkHours_Writeback - CurrentData;
eeprom_ReadRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data_read, 4);
u32Data[0] = u32Data_read[0] - CumulativeWorkHours_readDiffer;
eeprom_WriteRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data, 4);
CumulativeWorkHours_Writeback = CurrentData;
}
}
else
{
if (CumulativeWorkHours_Writeback != 0)
{
if (CurrentData < CumulativeWorkHours_Writeback)
{
CumulativeWorkHours_readDiffer = CumulativeWorkHours_Writeback - CurrentData;
eeprom_ReadRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data_read, 4);
u32Data[0] = u32Data_read[0] - CumulativeWorkHours_readDiffer;
eeprom_WriteRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data, 4);
}
CumulativeWorkHours_Writeback = CurrentData;
}
}
} }
} }
/*累计工作时长显示函数*/
void Gauge_Clock_All_Display(void) void Gauge_Clock_All_Display(void)
{ {
uint32_t u32Data[1] = {0}; uint32_t TotalHours = Get_Total_Working_Hours();
eeprom_ReadRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data_read, 4);
if (u32Data_read[0] > 99999)
{
u32Data[0] = 99999;
eeprom_WriteRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data, 4);
CumulativeWorkHours_MAX_flag = 1;
}
else
{
CumulativeWorkHours_MAX_flag = 0;
}
if (DISPLAY_OPEN) if (DISPLAY_OPEN)
{ {
SEG_SET_Clock_ALL(1, u32Data_read[0]); SEG_SET_Clock_ALL(1, TotalHours);
} }
else else
{ {
SEG_SET_Clock_ALL(0, 0); SEG_SET_Clock_ALL(0, 0);
} }
} }
uint8_t Get_Clock_All_lenth(void)
{
uint8_t num = 0;
if (u32Data_read[0] > 999)
{
num = 2;
}
else if (u32Data_read[0] > 9)
{
num = 1;
}
return num;
}
void Gauge_Frame_Display(void) void Gauge_Frame_Display(void)
{ {
if (DISPLAY_OPEN) if (DISPLAY_OPEN)
......
Firmware/Source/Application/GUI_Display/GUI_Display.h
View file @ b0cebb4e
...@@ -43,34 +43,19 @@ extern uint8_t EEPROM_Cumulativee_clean; ...@@ -43,34 +43,19 @@ extern uint8_t EEPROM_Cumulativee_clean;
extern uint16_t poweroff_time; extern uint16_t poweroff_time;
void Gauge_Power_SOC_pull_Display(void); void Gauge_Power_SOC_pull_Display(void);
// void Gauge_Power_2_SOC_Display(void); // void Gauge_Power_2_SOC_Display(void);
void Gauge_Power_Display(void);
void Gauge_Battery_Display(void);
void Gauge_Clock_Display(void); void Gauge_Clock_Display(void);
// void Gauge_Gear_Display(void); // void Gauge_Gear_Display(void);
void Gauge_Clock_All_Display(void);
void Gauge_DrivingRange_Display(void);
//void Gauge_Gear_Display(void); //void Gauge_Gear_Display(void);
void Gauge_Frame_Display(void); void Gauge_Frame_Display(void);
void Gauge_MaintenanceMileage_Display(void);
void Gauge_EnergyRecoveryLevel_Display(void);
void Gauge_EleDial_AllSOC_Display(void); void Gauge_EleDial_AllSOC_Display(void);
void Data_CumulativeWorkHours_EEPROM_Write(void);
void Gauge_Cutterhead_Gear_Display(void); void Gauge_Cutterhead_Gear_Display(void);
void Gauge_Gears_Display(void); void Gauge_Gears_Display(void);
void Gauge_KL30_Init(void);
void Gauge_KL15_Init(void);
void Gauge_Service(void); void Gauge_Service(void);
void Temp_Calc_Init(void);
void Temp_Calc_Send(void);
uint32_t Get_Temp_Calc(void);
void Gauge_CAN_setup_Service(void); void Gauge_CAN_setup_Service(void);
void Checkself_LED_Display(void); void Checkself_LED_Display(void);
void BUZZER_Init(void); void BUZZER_Init(void);
uint8_t Get_Clock_All_lenth(void); uint8_t Get_Clock_All_lenth(void);
uint8_t Get_Clockonetime_lenth(void);
uint8_t Get_CAN_Num_SBMS_Soc_2_Grid(void); uint8_t Get_CAN_Num_SBMS_Soc_2_Grid(void);
uint8_t Get_CAN_Num_MBMS_Soc_1_Grid(void); uint8_t Get_CAN_Num_MBMS_Soc_1_Grid(void);
void TYW_Clear_Eeprom_Service(void); void TYW_Clear_Eeprom_Service(void);
......
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @ b0cebb4e
...@@ -71,6 +71,7 @@ static void Power_KL30_Init(void) ...@@ -71,6 +71,7 @@ static void Power_KL30_Init(void)
RTE_RTC_Init(g_stRTCInformation); RTE_RTC_Init(g_stRTCInformation);
RTE_DEEPSLEEP_GPIO_Interrupt_Enable(KL15_AD_IN,Trigger_Rising); RTE_DEEPSLEEP_GPIO_Interrupt_Enable(KL15_AD_IN,Trigger_Rising);
Data_Soc_KL30_Init(); Data_Soc_KL30_Init();
Data_Time_KL30_Init();
} }
extern uint32_t PowerIgnOffTimeLine; extern uint32_t PowerIgnOffTimeLine;
......
Firmware/Source/Component/Telltales/Telltales_user.c
View file @ b0cebb4e
...@@ -710,7 +710,7 @@ static void LED_Cutterhead_Gear_Execution(Tellib_uint16_t led_status) ...@@ -710,7 +710,7 @@ static void LED_Cutterhead_Gear_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_Working_Hours_One_Judgement(void) static Tellib_uint16_t LED_Working_Hours_One_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
if ((Get_Clockonetime_lenth() == 1) && openLED_flag) if ((Get_Single_Working_Hours_Status() == 1) && openLED_flag)
{ {
LED_STATE = 1; LED_STATE = 1;
} }
......
Firmware/Source/System/Sys_Task_List.c
View file @ b0cebb4e
...@@ -77,6 +77,9 @@ void Sys_100ms_Tasks(void) ...@@ -77,6 +77,9 @@ void Sys_100ms_Tasks(void)
{ {
u8LEDDriverCheckCount++; u8LEDDriverCheckCount++;
} }
Data_Time_Single_Working_Hours();
Data_Time_Total_Working_Hours();
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment