Skip to content

R
RT_RMR42E
Commit 9ac8bc24 authored by 李秉薇's avatar 李秉薇
Browse files
Options

feat:解决冲突

parents 48d58643 2bd3900f
Hide whitespace changes
Inline Side-by-side
Showing with 594 additions and 434 deletions
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvguix.Administrator
View file @ 9ac8bc24
...@@ -15,17 +15,17 @@ ...@@ -15,17 +15,17 @@
<View> <View>
<WinId>38003</WinId> <WinId>38003</WinId>
<ViewName>Registers</ViewName> <ViewName>Registers</ViewName>
<TableColWidths>140 100</TableColWidths> <TableColWidths>140 141</TableColWidths>
</View> </View>
<View> <View>
<WinId>346</WinId> <WinId>346</WinId>
<ViewName>Code Coverage</ViewName> <ViewName>Code Coverage</ViewName>
<TableColWidths>885 605</TableColWidths> <TableColWidths>885 160</TableColWidths>
</View> </View>
<View> <View>
<WinId>204</WinId> <WinId>204</WinId>
<ViewName>Performance Analyzer</ViewName> <ViewName>Performance Analyzer</ViewName>
<TableColWidths>1045 156 156 133</TableColWidths> <TableColWidths>1045</TableColWidths>
</View> </View>
</SECTreeCtrl> </SECTreeCtrl>
...@@ -93,18 +93,18 @@ ...@@ -93,18 +93,18 @@
<flags>2</flags> <flags>2</flags>
<showCmd>3</showCmd> <showCmd>3</showCmd>
<MinPosition> <MinPosition>
<xPos>-1</xPos> <xPos>-32000</xPos>
<yPos>-1</yPos> <yPos>-32000</yPos>
</MinPosition> </MinPosition>
<MaxPosition> <MaxPosition>
<xPos>-1</xPos> <xPos>-1</xPos>
<yPos>-1</yPos> <yPos>-1</yPos>
</MaxPosition> </MaxPosition>
<NormalPosition> <NormalPosition>
<Top>180</Top> <Top>181</Top>
<Left>291</Left> <Left>289</Left>
<Right>1489</Right> <Right>1487</Right>
<Bottom>824</Bottom> <Bottom>825</Bottom>
</NormalPosition> </NormalPosition>
</WindowPosition> </WindowPosition>
<MDIClientArea> <MDIClientArea>
...@@ -1805,8 +1805,8 @@ ...@@ -1805,8 +1805,8 @@
<RegID>59392</RegID> <RegID>59392</RegID>
<Name>File</Name> <Name>File</Name>
<Buttons> <Buttons>
<Len>2825</Len> <Len>2602</Len>
<Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000015436865636B73656C665F5345475F446973706C617996000000000000000C0015436865636B73656C665F5345475F446973706C617912506F7765725F537461795F50726F7465637411436F6D6D6F6E5F496E7075745F50617261125379735F5363686564756C65725F496E6974155379735F526561645F4B4C33305F566F6C74616765114261636B4C696768745F50726F636573731354696D65724D5F50574D5F7365745F647574790F5345475F5345545F5472696E6974790D47617567655F5365727669636510506F7765725F537461795F536C656570134C45445F52454144595F4A756467656D656E740D4C45445F417474726962757465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001E4C45445F426174746572795F4368617267696E675F4A756467656D656E74960000000000000001001E4C45445F426174746572795F4368617267696E675F4A756467656D656E7400000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
</Buttons> </Buttons>
<OriginalItems> <OriginalItems>
<Len>1423</Len> <Len>1423</Len>
...@@ -1822,7 +1822,7 @@ ...@@ -1822,7 +1822,7 @@
<Name>Build</Name> <Name>Build</Name>
<Buttons> <Buttons>
<Len>972</Len> <Len>972</Len>
<Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000006524D523432459600000000000000010006524D52343245000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data> <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000006524D523432459600000000000000010006524D52343245000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
</Buttons> </Buttons>
<OriginalItems> <OriginalItems>
<Len>583</Len> <Len>583</Len>
...@@ -1838,7 +1838,7 @@ ...@@ -1838,7 +1838,7 @@
<Name>Debug</Name> <Name>Debug</Name>
<Buttons> <Buttons>
<Len>2373</Len> <Len>2373</Len>
<Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data> <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
</Buttons> </Buttons>
<OriginalItems> <OriginalItems>
<Len>898</Len> <Len>898</Len>
...@@ -3661,17 +3661,17 @@ ...@@ -3661,17 +3661,17 @@
<Doc> <Doc>
<Name>..\..\..\..\Source\Application\CommonInterface\CommonInterface.c</Name> <Name>..\..\..\..\Source\Application\CommonInterface\CommonInterface.c</Name>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<TopLine>126</TopLine> <TopLine>1</TopLine>
<CurrentLine>133</CurrentLine> <CurrentLine>1</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
<PaneID>0</PaneID> <PaneID>0</PaneID>
</Doc> </Doc>
<Doc> <Doc>
<Name>..\..\..\..\Source\System\Sys_Task_List.c</Name> <Name>..\..\..\..\Source\System\Sys_Task_List.c</Name>
<ColumnNumber>21</ColumnNumber> <ColumnNumber>7</ColumnNumber>
<TopLine>36</TopLine> <TopLine>36</TopLine>
<CurrentLine>61</CurrentLine> <CurrentLine>62</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
<PaneID>0</PaneID> <PaneID>0</PaneID>
...@@ -3732,9 +3732,9 @@ ...@@ -3732,9 +3732,9 @@
</Doc> </Doc>
<Doc> <Doc>
<Name>..\..\..\..\Source\Component\Components.h</Name> <Name>..\..\..\..\Source\Component\Components.h</Name>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>46</ColumnNumber>
<TopLine>6</TopLine> <TopLine>1</TopLine>
<CurrentLine>14</CurrentLine> <CurrentLine>17</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
<PaneID>0</PaneID> <PaneID>0</PaneID>
......
Firmware/Source/Application/BackLight/BackLight.c
View file @ 9ac8bc24
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define BACK_LIGHT_DAY 200 #define BACK_LIGHT_DAY 200
#define openLED_flag (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF &&(ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) <= 16000 && ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) >= 9000)) #define openLED_flag (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF )
uint8_t interact_PWM_Low_Duty = 0; uint8_t interact_PWM_Low_Duty = 0;
void BackLight_Process(void) void BackLight_Process(void)
...@@ -17,26 +17,26 @@ void BackLight_Process(void) ...@@ -17,26 +17,26 @@ void BackLight_Process(void)
//电量 //电量
if (Get_EleDial_AllSOC_lenth() == 2 || checkself_seg_Flag == 1) if (Get_EleDial_AllSOC_lenth() == 2 || checkself_seg_Flag == 1)
{ {
RTE_GPIO_Config(RTE_GPIO_PORT03_PIN00, GpioOut_High);//百位 RTE_GPIO_Set_Level(RTE_GPIO_PORT03_PIN00, RTE_GPIO_LEVEL_HIGH);//百位
RTE_GPIO_Config(RTE_GPIO_PORT02_PIN04, GpioOut_High); RTE_GPIO_Set_Level(RTE_GPIO_PORT02_PIN04, RTE_GPIO_LEVEL_HIGH);
} }
else if(Get_EleDial_AllSOC_lenth() == 1) else if(Get_EleDial_AllSOC_lenth() == 1)
{ {
RTE_GPIO_Config(RTE_GPIO_PORT03_PIN00, GpioOut_Low); RTE_GPIO_Set_Level(RTE_GPIO_PORT03_PIN00, RTE_GPIO_LEVEL_LOW);
RTE_GPIO_Config(RTE_GPIO_PORT02_PIN04, GpioOut_High); RTE_GPIO_Set_Level(RTE_GPIO_PORT02_PIN04, RTE_GPIO_LEVEL_HIGH);
} }
else else
{ {
RTE_GPIO_Config(RTE_GPIO_PORT03_PIN00, GpioOut_Low); RTE_GPIO_Set_Level(RTE_GPIO_PORT03_PIN00, RTE_GPIO_LEVEL_LOW);
RTE_GPIO_Config(RTE_GPIO_PORT02_PIN04, GpioOut_Low); RTE_GPIO_Set_Level(RTE_GPIO_PORT02_PIN04, RTE_GPIO_LEVEL_LOW);
} }
} }
else else
{ {
TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 0); TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 0);
RTE_GPIO_Config(RTE_GPIO_PORT03_PIN00, GpioOut_Low); RTE_GPIO_Set_Level(RTE_GPIO_PORT03_PIN00, RTE_GPIO_LEVEL_LOW);
RTE_GPIO_Config(RTE_GPIO_PORT02_PIN04, GpioOut_Low); RTE_GPIO_Set_Level(RTE_GPIO_PORT02_PIN04, RTE_GPIO_LEVEL_LOW);
} }
} }
...@@ -47,25 +47,25 @@ void BackLight_Clock_All_Process(void) ...@@ -47,25 +47,25 @@ void BackLight_Clock_All_Process(void)
//总计时间 //总计时间
if (Get_Clock_All_lenth() == 2|| checkself_seg_Flag == 1) if (Get_Clock_All_lenth() == 2|| checkself_seg_Flag == 1)
{ {
RTE_GPIO_Config(RTE_GPIO_PORT01_PIN05, GpioOut_High); //总计工作时长统计千位_MCU_OUT RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN05, RTE_GPIO_LEVEL_HIGH); //总计工作时长统计千位_MCU_OUT
RTE_GPIO_Config(RTE_GPIO_PORT01_PIN06, GpioOut_High); //总计工作时长统计百十位_MCU_OUT RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN06, RTE_GPIO_LEVEL_HIGH); //总计工作时长统计百十位_MCU_OUT
} }
else if(Get_Clock_All_lenth() == 1) else if(Get_Clock_All_lenth() == 1)
{ {
RTE_GPIO_Config(RTE_GPIO_PORT01_PIN05, GpioOut_Low); //总计工作时长统计千位_MCU_OUT RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN05, RTE_GPIO_LEVEL_LOW); //总计工作时长统计千位_MCU_OUT
RTE_GPIO_Config(RTE_GPIO_PORT01_PIN06, GpioOut_High); //总计工作时长统计百十位_MCU_OUT RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN06, RTE_GPIO_LEVEL_HIGH); //总计工作时长统计百十位_MCU_OUT
} }
else else
{ {
RTE_GPIO_Config(RTE_GPIO_PORT01_PIN05, GpioOut_Low); //总计工作时长统计千位_MCU_OUT RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN05, RTE_GPIO_LEVEL_LOW); //总计工作时长统计千位_MCU_OUT
RTE_GPIO_Config(RTE_GPIO_PORT01_PIN06, GpioOut_Low); //总计工作时长统计百十位_MCU_OUT RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN06, RTE_GPIO_LEVEL_LOW); //总计工作时长统计百十位_MCU_OUT
} }
} }
else else
{ {
RTE_GPIO_Config(RTE_GPIO_PORT01_PIN05, GpioOut_Low); //总计工作时长统计千位_MCU_OUT RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN05, RTE_GPIO_LEVEL_LOW); //总计工作时长统计千位_MCU_OUT
RTE_GPIO_Config(RTE_GPIO_PORT01_PIN06, GpioOut_Low); //总计工作时长统计百十位_MCU_OUT RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN06, RTE_GPIO_LEVEL_LOW); //总计工作时长统计百十位_MCU_OUT
} }
} }
......
Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
View file @ 9ac8bc24
#include "CAN_CH0_CAN_Communication_Matrix.h" #include "CAN_CH0_CAN_Communication_Matrix.h"
#include "Components.h" #include "Components.h"
#include "Application.h" #include "Application.h"
/* 2024/06/16 14:48:34 */ /* 2024/06/16 14:48:34 */
...@@ -6,149 +6,357 @@ st_CanMsgOp CAN_CH0_CanMsgOp; ...@@ -6,149 +6,357 @@ st_CanMsgOp CAN_CH0_CanMsgOp;
st_CanMsgTxOp CAN_CH0_CanMsgTxOp; st_CanMsgTxOp CAN_CH0_CanMsgTxOp;
#define CAN_CH0 &CAN_CH0_CanMsgOp #define CAN_CH0 &CAN_CH0_CanMsgOp
const st_CAN_SendAttribute CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL] = const st_CAN_SendAttribute CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL] =
{ {
{0x3A2ul, 200ul * 100ul, 0ul, 0u, MSG_STD, 1u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_3A2, (void *)0}, {0x3A2ul, 200ul * 100ul, 0ul, 0u, MSG_STD, 1u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_3A2, (void *)0},
{0x3A7ul, 200ul * 100ul, 0ul, 0u, MSG_STD, 1u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_3A7, (void *)0}, {0x3A7ul, 200ul * 100ul, 0ul, 0u, MSG_STD, 1u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_3A7, (void *)0},
{0x393ul, 200ul * 100ul, 0ul, 0u, MSG_STD, 1u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_393, (void *)0}, {0x393ul, 200ul * 100ul, 0ul, 0u, MSG_STD, 1u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_393, (void *)0},
}; };
uint8_t System_Indicator_CANFlag = 0; uint8_t System_Indicator_CANFlag = 0;
const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] = const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
{
{ {
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
3000ul, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
0x398ul, 3000ul,
(( void * )0), 0x398ul,
(( void * )0), ((void *)0),
(( void * )0), ((void *)0),
}, ((void *)0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
3000ul,
0x39Dul,
((void *)0),
((void *)0),
((void *)0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
200ul,
0x157ul,
((void *)0),
((void *)0),
((void *)0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
2000ul,
0x38Eul,
((void *)0),
((void *)0),
((void *)0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
2500ul,
0x18200A20ul,
((void *)0),
((void *)0),
((void *)0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
1000ul,
0x18202922ul,
((void *)0),
((void *)0),
((void *)0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
2500ul,
0x18203020ul,
((void *)0),
((void *)0),
((void *)0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
2500ul,
0x18203220ul,
((void *)0),
((void *)0),
((void *)0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
200ul,
0x125ul,
((void *)0),
(System_Indicator_ON_callback),
(System_Indicator_OFF_callback),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
20000ul,
0x339ul,
((void *)0),
((void *)0),
((void *)0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
2500ul,
0x18200A21ul,
((void *)0),
((void *)0),
((void *)0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
200ul,
0x134ul,
((void *)0),
((void *)0),
((void *)0),
},
};
static uint8_t BMCU_ErrorGrage = 0;
static uint8_t BMCU_BladeSpeedGear = 0;
static uint8_t BMCU_PTOSwicthState = 0;
static uint8_t BMCU_Moto2_Locked_RotorFault = 0;
static uint8_t BMCU_Moto1_Locked_RotorFault = 0;
static uint8_t MBMS_Soc = 0;
static uint8_t MBMS_TOTALWorkState = 0;
static uint8_t MBMS_TOTALSigOn = 0;
static uint8_t MBMS_TOTALSigAcc = 0;
static uint8_t MBMS_TOTALSigCharge = 0;
static uint8_t MBMS_StatSoc = 0;
static uint8_t MBMS_StatBattChargeState = 0;
static uint8_t MBMS_StatBattWorkState = 0;
static uint8_t MMCU_ErrorGrage = 0;
static uint8_t MMCU_ChgProtectState = 0;
static uint8_t MMCU_DCDCEnableState = 0;
static uint8_t MMCU_ParkingGearState = 0;
static uint8_t MMCU_SeatDetectState = 0;
static uint8_t MMCU_LockMotoState = 0;
static uint8_t MMCU_EBSState = 0;
static uint8_t MMCU_TravelSpeedGear = 0;
static uint8_t MMCU_PowerMode = 0;
static uint8_t MMCU_WorkState = 0;
static uint16_t MMCU_AccumulatedWorkHours = 0;
static uint8_t MMCU_SingleWorkingHours = 0;
static uint8_t SBMS_Soc = 0;
static uint8_t SMCU_ErrorGrage = 0;
void Set_CAN_ALL_Signal(void)
{
if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x157_Msg)) == CAN_ERR_OK)
{ {
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, BMCU_ErrorGrage = Get_CAN_CH0_ID_157_Sig_BMCU_ErrorGrage();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, BMCU_BladeSpeedGear = Get_CAN_CH0_ID_157_Sig_BMCU_BladeSpeedGear();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, BMCU_PTOSwicthState = Get_CAN_CH0_ID_157_Sig_BMCU_PTOSwicthState();
3000ul, }
0x39Dul, if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x38E_Msg)) == CAN_ERR_OK)
(( void * )0),
(( void * )0),
(( void * )0),
},
{ {
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, BMCU_Moto1_Locked_RotorFault = Get_CAN_CH0_ID_38E_Sig_BMCU_Moto1_Locked_RotorFault();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, BMCU_Moto2_Locked_RotorFault = Get_CAN_CH0_ID_38E_Sig_BMCU_Moto2_Locked_RotorFault();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, }
200ul, if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18200A20_Msg)) == CAN_ERR_OK)
0x157ul,
(( void * )0),
(( void * )0),
(( void * )0),
},
{ {
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, MBMS_Soc = Get_CAN_CH0_ID_18200A20_Sig_MBMS_Soc();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, }
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18202922_Msg)) == CAN_ERR_OK)
2000ul,
0x38Eul,
(( void * )0),
(( void * )0),
(( void * )0),
},
{ {
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, MBMS_TOTALWorkState = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALWorkState();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, MBMS_TOTALSigOn = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigOn();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, MBMS_TOTALSigAcc = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigAcc();
2500ul, MBMS_TOTALSigCharge = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigCharge();
0x18200A20ul, }
(( void * )0), if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18203020_Msg)) == CAN_ERR_OK)
(( void * )0),
(( void * )0),
},
{ {
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, MBMS_StatSoc = Get_CAN_CH0_ID_18203020_Sig_MBMS_StatSoc();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, }
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18203220_Msg)) == CAN_ERR_OK)
1000ul,
0x18202922ul,
(( void * )0),
(( void * )0),
(( void * )0),
},
{ {
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, MBMS_StatBattChargeState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattChargeState();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, }
2500ul, if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x125_Msg)) == CAN_ERR_OK)
0x18203020ul,
(( void * )0),
(( void * )0),
(( void * )0),
},
{ {
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, MMCU_ErrorGrage = Get_CAN_CH0_ID_125_Sig_MMCU_ErrorGrage();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, MMCU_ChgProtectState = Get_CAN_CH0_ID_125_Sig_MMCU_ChgProtectState();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, MMCU_DCDCEnableState = Get_CAN_CH0_ID_125_Sig_MMCU_DCDCEnableState();
2500ul, MMCU_ParkingGearState = Get_CAN_CH0_ID_125_Sig_MMCU_ParkingGearState();
0x18203220ul, MMCU_SeatDetectState = Get_CAN_CH0_ID_125_Sig_MMCU_SeatDetectState(); // 掉线需要做处理
(( void * )0), MMCU_LockMotoState = Get_CAN_CH0_ID_125_Sig_MMCU_LockMotoState();
(( void * )0), MMCU_EBSState = Get_CAN_CH0_ID_125_Sig_MMCU_EBSState();
(( void * )0), MMCU_TravelSpeedGear = Get_CAN_CH0_ID_125_Sig_MMCU_TravelSpeedGear();
}, MMCU_PowerMode = Get_CAN_CH0_ID_125_Sig_MMCU_PowerMode();
MMCU_WorkState = Get_CAN_CH0_ID_125_Sig_MMCU_WorkState();
}
else
{ {
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, MMCU_SeatDetectState = Get_CAN_CH0_ID_125_Sig_MMCU_SeatDetectState(); // 掉线需要做处理
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, }
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x339_Msg)) == CAN_ERR_OK)
200ul,
0x125ul,
(( void * )0),
(System_Indicator_ON_callback),
(System_Indicator_OFF_callback),
},
{ {
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, MMCU_AccumulatedWorkHours = Get_CAN_CH0_ID_339_Sig_MMCU_AccumulatedWorkHours();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, MMCU_SingleWorkingHours = Get_CAN_CH0_ID_339_Sig_MMCU_SingleWorkingHours();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, }
20000ul, if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18200A21_Msg)) == CAN_ERR_OK)
0x339ul,
(( void * )0),
(( void * )0),
(( void * )0),
},
{ {
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, SBMS_Soc = Get_CAN_CH0_ID_18200A21_Sig_SBMS_Soc();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, }
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18200A21_Msg)) == CAN_ERR_OK)
2500ul,
0x18200A21ul,
(( void * )0),
(( void * )0),
(( void * )0),
},
{ {
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, SMCU_ErrorGrage = Get_CAN_CH0_ID_134_Sig_SMCU_ErrorGrage();
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, }
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, }
200ul,
0x134ul, uint8_t Get_CAN_Num_BMCU_ErrorGrage(void)
(( void * )0), {
(( void * )0), return BMCU_ErrorGrage;
(( void * )0), }
}, uint8_t Get_CAN_Num_BMCU_BladeSpeedGear(void)
}; {
void System_Indicator_ON_callback(void) return BMCU_BladeSpeedGear;
}
uint8_t Get_CAN_Num_BMCU_PTOSwicthState(void)
{
return BMCU_PTOSwicthState;
}
uint8_t Get_CAN_Num_BMCU_Moto2_Locked_RotorFault(void)
{
return BMCU_Moto2_Locked_RotorFault;
}
uint8_t Get_CAN_Num_BMCU_Moto1_Locked_RotorFault(void)
{
return BMCU_Moto1_Locked_RotorFault;
}
uint8_t Get_CAN_Num_MBMS_Soc(void)
{
return MBMS_Soc;
}
uint8_t Get_CAN_Num_MBMS_TOTALWorkState(void)
{
return MBMS_TOTALWorkState;
}
uint8_t Get_CAN_Num_MBMS_TOTALSigOn(void)
{
return MBMS_TOTALSigOn;
}
uint8_t Get_CAN_Num_MBMS_TOTALSigAcc(void)
{
return MBMS_TOTALSigAcc;
}
uint8_t Get_CAN_Num_MBMS_TOTALSigCharge(void)
{
return MBMS_TOTALSigCharge;
}
uint8_t Get_CAN_Num_MBMS_StatSoc(void)
{
return MBMS_StatSoc;
}
uint8_t Get_CAN_Num_MBMS_StatBattChargeState(void)
{
return MBMS_StatBattChargeState;
}
uint8_t Get_CAN_Num_MBMS_StatBattWorkState(void)
{
return MBMS_StatBattWorkState;
}
uint8_t Get_CAN_Num_MMCU_ErrorGrage(void)
{
return MMCU_ErrorGrage;
}
uint8_t Get_CAN_Num_MMCU_ChgProtectState(void)
{
return MMCU_ChgProtectState;
}
uint8_t Get_CAN_Num_MMCU_DCDCEnableState(void)
{
return MMCU_DCDCEnableState;
}
uint8_t Get_CAN_Num_MMCU_ParkingGearState(void)
{
return MMCU_ParkingGearState;
}
uint8_t Get_CAN_Num_MMCU_SeatDetectState(void)
{
return MMCU_SeatDetectState;
}
uint8_t Get_CAN_Num_MMCU_LockMotoState(void)
{
return MMCU_LockMotoState;
}
uint8_t Get_CAN_Num_MMCU_EBSState(void)
{
return MMCU_EBSState;
}
uint8_t Get_CAN_Num_MMCU_TravelSpeedGear(void)
{
return MMCU_TravelSpeedGear;
}
uint8_t Get_CAN_Num_MMCU_PowerMode(void)
{
return MMCU_PowerMode;
}
uint8_t Get_CAN_Num_MMCU_WorkState(void)
{
return MMCU_WorkState;
}
uint16_t Get_CAN_Num_MMCU_AccumulatedWorkHours(void)
{
return MMCU_AccumulatedWorkHours;
}
uint8_t Get_CAN_Num_MMCU_SingleWorkingHours(void)
{
return MMCU_SingleWorkingHours;
}
uint8_t Get_CAN_Num_SBMS_Soc(void)
{
return SBMS_Soc;
}
uint8_t Get_CAN_Num_SMCU_ErrorGrage(void)
{
return SMCU_ErrorGrage;
}
void System_Indicator_ON_callback(canlib_uint8_t CopyData [])
{ {
System_Indicator_CANFlag = 0; System_Indicator_CANFlag = 0;
} }
void System_Indicator_OFF_callback(void) void System_Indicator_OFF_callback(canlib_uint8_t CopyData [])
{ {
System_Indicator_CANFlag = 1; System_Indicator_CANFlag = 1;
} }
uint8_t Get_CAN_Power_State(void) uint8_t Get_CAN_Power_State(void)
{ {
uint8_t state = 0; uint8_t state = 0;
uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_PowerMode(); uint8_t Power_State = Get_CAN_Num_MMCU_PowerMode();
switch (Signal1) switch (Power_State)
{ {
case 0x0: case 0x0:
state = KEY_OFF; state = KEY_OFF;
...@@ -177,205 +385,205 @@ uint8_t Get_CAN_Power_State(void) ...@@ -177,205 +385,205 @@ uint8_t Get_CAN_Power_State(void)
return state; return state;
} }
uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN0(void) uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN0(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x398_Msg_Count, 5u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x398_Msg_Count, 5u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN1(void) uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN1(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x398_Msg_Count, 4u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x398_Msg_Count, 4u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN2(void) uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN2(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x398_Msg_Count, 3u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x398_Msg_Count, 3u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN3(void) uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN3(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x398_Msg_Count, 2u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x398_Msg_Count, 2u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN4(void) uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN4(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x398_Msg_Count, 1u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x398_Msg_Count, 1u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN5(void) uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN5(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x398_Msg_Count, 0u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x398_Msg_Count, 0u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_39D_Sig_ICU_ProductDay(void) uint8_t Get_CAN_CH0_ID_39D_Sig_ICU_ProductDay(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x39D_Msg_Count, 7u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x39D_Msg_Count, 7u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_39D_Sig_ICU_ProductMon(void) uint8_t Get_CAN_CH0_ID_39D_Sig_ICU_ProductMon(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x39D_Msg_Count, 6u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x39D_Msg_Count, 6u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_39D_Sig_ICU_ProductYear(void) uint8_t Get_CAN_CH0_ID_39D_Sig_ICU_ProductYear(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x39D_Msg_Count, 5u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x39D_Msg_Count, 5u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_39D_Sig_ICU_CustomerCode(void) uint8_t Get_CAN_CH0_ID_39D_Sig_ICU_CustomerCode(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x39D_Msg_Count, 4u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x39D_Msg_Count, 4u) >> 0u) & 0xFFu));
} }
uint16_t Get_CAN_CH0_ID_39D_Sig_ICU_ProductCode(void) uint16_t Get_CAN_CH0_ID_39D_Sig_ICU_ProductCode(void)
{ {
return (((uint16_t)((uint16_t)((uint16_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x39D_Msg_Count, 2u) >> 0u) & 0xFFu) << 8u) + \ return (((uint16_t)((uint16_t)((uint16_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x39D_Msg_Count, 2u) >> 0u) & 0xFFu) << 8u) +
((uint16_t)((uint16_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x39D_Msg_Count, 3u) >> 0u) & 0xFFu)); ((uint16_t)((uint16_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x39D_Msg_Count, 3u) >> 0u) & 0xFFu));
} }
uint16_t Get_CAN_CH0_ID_39D_Sig_ICU_ProductName(void) uint16_t Get_CAN_CH0_ID_39D_Sig_ICU_ProductName(void)
{ {
return (((uint16_t)((uint16_t)((uint16_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x39D_Msg_Count, 0u) >> 0u) & 0xFFu) << 8u) + \ return (((uint16_t)((uint16_t)((uint16_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x39D_Msg_Count, 0u) >> 0u) & 0xFFu) << 8u) +
((uint16_t)((uint16_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x39D_Msg_Count, 1u) >> 0u) & 0xFFu)); ((uint16_t)((uint16_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x39D_Msg_Count, 1u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_157_Sig_BMCU_ErrorGrage(void) uint8_t Get_CAN_CH0_ID_157_Sig_BMCU_ErrorGrage(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x157_Msg_Count, 4u) >> 0u) & 0x07u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x157_Msg_Count, 4u) >> 0u) & 0x07u));
} }
uint8_t Get_CAN_CH0_ID_157_Sig_BMCU_BladeSpeedGear(void) uint8_t Get_CAN_CH0_ID_157_Sig_BMCU_BladeSpeedGear(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x157_Msg_Count, 0u) >> 4u) & 0x07u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x157_Msg_Count, 0u) >> 4u) & 0x07u));
} }
uint8_t Get_CAN_CH0_ID_157_Sig_BMCU_PTOSwicthState(void) uint8_t Get_CAN_CH0_ID_157_Sig_BMCU_PTOSwicthState(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x157_Msg_Count, 0u) >> 3u) & 0x01u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x157_Msg_Count, 0u) >> 3u) & 0x01u));
} }
uint8_t Get_CAN_CH0_ID_38E_Sig_BMCU_Moto2_Locked_RotorFault(void) uint8_t Get_CAN_CH0_ID_38E_Sig_BMCU_Moto2_Locked_RotorFault(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x38E_Msg_Count, 1u) >> 1u) & 0x01u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x38E_Msg_Count, 1u) >> 1u) & 0x01u));
} }
uint8_t Get_CAN_CH0_ID_38E_Sig_BMCU_Moto1_Locked_RotorFault(void) uint8_t Get_CAN_CH0_ID_38E_Sig_BMCU_Moto1_Locked_RotorFault(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x38E_Msg_Count, 1u) >> 0u) & 0x01u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x38E_Msg_Count, 1u) >> 0u) & 0x01u));
} }
uint8_t Get_CAN_CH0_ID_18200A20_Sig_MBMS_Soc(void) uint8_t Get_CAN_CH0_ID_18200A20_Sig_MBMS_Soc(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x18200A20_Msg_Count, 4u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x18200A20_Msg_Count, 4u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALWorkState(void) uint8_t Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALWorkState(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x18202922_Msg_Count, 1u) >> 0u) & 0x07u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x18202922_Msg_Count, 1u) >> 0u) & 0x07u));
} }
uint8_t Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigOn(void) uint8_t Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigOn(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x18202922_Msg_Count, 0u) >> 2u) & 0x01u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x18202922_Msg_Count, 0u) >> 2u) & 0x01u));
} }
uint8_t Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigAcc(void) uint8_t Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigAcc(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x18202922_Msg_Count, 0u) >> 1u) & 0x01u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x18202922_Msg_Count, 0u) >> 1u) & 0x01u));
} }
uint8_t Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigCharge(void) uint8_t Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigCharge(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x18202922_Msg_Count, 0u) >> 0u) & 0x01u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x18202922_Msg_Count, 0u) >> 0u) & 0x01u));
} }
uint8_t Get_CAN_CH0_ID_18203020_Sig_MBMS_StatSoc(void) uint8_t Get_CAN_CH0_ID_18203020_Sig_MBMS_StatSoc(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x18203020_Msg_Count, 4u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x18203020_Msg_Count, 4u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattChargeState(void) uint8_t Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattChargeState(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x18203220_Msg_Count, 1u) >> 0u) & 0x07u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x18203220_Msg_Count, 1u) >> 0u) & 0x07u));
} }
uint8_t Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState(void) uint8_t Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x18203220_Msg_Count, 0u) >> 0u) & 0x0Fu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x18203220_Msg_Count, 0u) >> 0u) & 0x0Fu));
} }
uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_ErrorGrage(void) uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_ErrorGrage(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x125_Msg_Count, 6u) >> 0u) & 0x07u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x125_Msg_Count, 6u) >> 0u) & 0x07u));
} }
uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_ChgProtectState(void) uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_ChgProtectState(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x125_Msg_Count, 3u) >> 2u) & 0x01u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x125_Msg_Count, 3u) >> 2u) & 0x01u));
} }
uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_DCDCEnableState(void) uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_DCDCEnableState(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x125_Msg_Count, 3u) >> 1u) & 0x01u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x125_Msg_Count, 3u) >> 1u) & 0x01u));
} }
uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_ParkingGearState(void) uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_ParkingGearState(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x125_Msg_Count, 2u) >> 7u) & 0x01u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x125_Msg_Count, 2u) >> 7u) & 0x01u));
} }
uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_SeatDetectState(void) uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_SeatDetectState(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x125_Msg_Count, 2u) >> 1u) & 0x01u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x125_Msg_Count, 2u) >> 1u) & 0x01u));
} }
uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_LockMotoState(void) uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_LockMotoState(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x125_Msg_Count, 2u) >> 0u) & 0x01u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x125_Msg_Count, 2u) >> 0u) & 0x01u));
} }
uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_EBSState(void) uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_EBSState(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x125_Msg_Count, 1u) >> 6u) & 0x03u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x125_Msg_Count, 1u) >> 6u) & 0x03u));
} }
uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_TravelSpeedGear(void) uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_TravelSpeedGear(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x125_Msg_Count, 1u) >> 0u) & 0x03u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x125_Msg_Count, 1u) >> 0u) & 0x03u));
} }
uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_PowerMode(void) uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_PowerMode(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x125_Msg_Count, 0u) >> 2u) & 0x0Fu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x125_Msg_Count, 0u) >> 2u) & 0x0Fu));
} }
uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_WorkState(void) uint8_t Get_CAN_CH0_ID_125_Sig_MMCU_WorkState(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x125_Msg_Count, 0u) >> 0u) & 0x03u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x125_Msg_Count, 0u) >> 0u) & 0x03u));
} }
uint16_t Get_CAN_CH0_ID_339_Sig_MMCU_AccumulatedWorkHours(void) uint16_t Get_CAN_CH0_ID_339_Sig_MMCU_AccumulatedWorkHours(void)
{ {
return (((uint16_t)((uint16_t)((uint16_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x339_Msg_Count, 6u) >> 0u) & 0xFFu) << 8u) + \ return (((uint16_t)((uint16_t)((uint16_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x339_Msg_Count, 6u) >> 0u) & 0xFFu) << 8u) +
((uint16_t)((uint16_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x339_Msg_Count, 7u) >> 0u) & 0xFFu)); ((uint16_t)((uint16_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x339_Msg_Count, 7u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_339_Sig_MMCU_SingleWorkingHours(void) uint8_t Get_CAN_CH0_ID_339_Sig_MMCU_SingleWorkingHours(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x339_Msg_Count, 5u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x339_Msg_Count, 5u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_18200A21_Sig_SBMS_Soc(void) uint8_t Get_CAN_CH0_ID_18200A21_Sig_SBMS_Soc(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x18200A21_Msg_Count, 4u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x18200A21_Msg_Count, 4u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_134_Sig_SMCU_ErrorGrage(void) uint8_t Get_CAN_CH0_ID_134_Sig_SMCU_ErrorGrage(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x134_Msg_Count, 2u) >> 0u) & 0x07u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0, CAN_CH0_ID_CAN_0x134_Msg_Count, 2u) >> 0u) & 0x07u));
} }
uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID) uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID)
{ {
uint8_t u8Result = CAN_CH0_ID_TOTAL_MAX; uint8_t u8Result = CAN_CH0_ID_TOTAL_MAX;
switch (MsgID) switch (MsgID)
...@@ -416,10 +624,9 @@ uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID) ...@@ -416,10 +624,9 @@ uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID)
case CAN_CH0_ID_CAN_0x134_Msg: case CAN_CH0_ID_CAN_0x134_Msg:
u8Result = CAN_CH0_ID_CAN_0x134_Msg_Count; u8Result = CAN_CH0_ID_CAN_0x134_Msg_Count;
break; break;
default : default:
u8Result = CAN_CH0_ID_TOTAL_MAX; u8Result = CAN_CH0_ID_TOTAL_MAX;
break; break;
} }
return u8Result; return u8Result;
} }
Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.h
View file @ 9ac8bc24
...@@ -36,7 +36,6 @@ typedef enum ...@@ -36,7 +36,6 @@ typedef enum
CHRG_PLUGIN, CHRG_PLUGIN,
CHRGING, CHRGING,
CHRGEND, CHRGEND,
} POWER_CHECK_STATE_t; } POWER_CHECK_STATE_t;
typedef enum typedef enum
...@@ -64,6 +63,8 @@ extern const st_CAN_SendAttribute CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL] ...@@ -64,6 +63,8 @@ extern const st_CAN_SendAttribute CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL]
#define CAN_CH0_ID_CAN_0x18200A21_Msg 0x18200A21ul #define CAN_CH0_ID_CAN_0x18200A21_Msg 0x18200A21ul
#define CAN_CH0_ID_CAN_0x134_Msg 0x134ul #define CAN_CH0_ID_CAN_0x134_Msg 0x134ul
extern uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN0(void); extern uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN0(void);
extern uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN1(void); extern uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN1(void);
extern uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN2(void); extern uint8_t Get_CAN_CH0_ID_398_Sig_ICU_SN2(void);
...@@ -104,10 +105,40 @@ extern uint8_t Get_CAN_CH0_ID_339_Sig_MMCU_SingleWorkingHours(void); ...@@ -104,10 +105,40 @@ extern uint8_t Get_CAN_CH0_ID_339_Sig_MMCU_SingleWorkingHours(void);
extern uint8_t Get_CAN_CH0_ID_18200A21_Sig_SBMS_Soc(void); extern uint8_t Get_CAN_CH0_ID_18200A21_Sig_SBMS_Soc(void);
extern uint8_t Get_CAN_CH0_ID_134_Sig_SMCU_ErrorGrage(void); extern uint8_t Get_CAN_CH0_ID_134_Sig_SMCU_ErrorGrage(void);
extern uint8_t Get_CAN_Num_BMCU_ErrorGrage(void);
extern uint8_t Get_CAN_Num_BMCU_BladeSpeedGear(void);
extern uint8_t Get_CAN_Num_BMCU_PTOSwicthState(void);
extern uint8_t Get_CAN_Num_BMCU_Moto2_Locked_RotorFault(void);
extern uint8_t Get_CAN_Num_BMCU_Moto1_Locked_RotorFault(void);
extern uint8_t Get_CAN_Num_MBMS_Soc(void);
extern uint8_t Get_CAN_Num_MBMS_TOTALWorkState(void);
extern uint8_t Get_CAN_Num_MBMS_TOTALSigOn(void);
extern uint8_t Get_CAN_Num_MBMS_TOTALSigAcc(void);
extern uint8_t Get_CAN_Num_MBMS_TOTALSigCharge(void);
extern uint8_t Get_CAN_Num_MBMS_StatSoc(void);
extern uint8_t Get_CAN_Num_MBMS_StatBattChargeState(void);
extern uint8_t Get_CAN_Num_MBMS_StatBattWorkState(void);
extern uint8_t Get_CAN_Num_MMCU_ErrorGrage(void);
extern uint8_t Get_CAN_Num_MMCU_ChgProtectState(void);
extern uint8_t Get_CAN_Num_MMCU_DCDCEnableState(void);
extern uint8_t Get_CAN_Num_MMCU_ParkingGearState(void);
extern uint8_t Get_CAN_Num_MMCU_SeatDetectState(void);
extern uint8_t Get_CAN_Num_MMCU_LockMotoState(void);
extern uint8_t Get_CAN_Num_MMCU_EBSState(void);
extern uint8_t Get_CAN_Num_MMCU_TravelSpeedGear(void);
extern uint8_t Get_CAN_Num_MMCU_PowerMode(void);
extern uint8_t Get_CAN_Num_MMCU_WorkState(void);
extern uint16_t Get_CAN_Num_MMCU_AccumulatedWorkHours(void);
extern uint8_t Get_CAN_Num_MMCU_SingleWorkingHours(void);
extern uint8_t Get_CAN_Num_SBMS_Soc(void);
extern uint8_t Get_CAN_Num_SMCU_ErrorGrage(void);
extern uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID); extern uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID);
extern uint8_t System_Indicator_CANFlag; extern uint8_t System_Indicator_CANFlag;
void System_Indicator_ON_callback(void); extern void Set_CAN_ALL_Signal(void);
void System_Indicator_OFF_callback(void); void System_Indicator_ON_callback(canlib_uint8_t CopyData []);
void System_Indicator_OFF_callback(canlib_uint8_t CopyData []);
extern uint8_t Get_CAN_Power_State(void); extern uint8_t Get_CAN_Power_State(void);
#endif #endif
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @ 9ac8bc24
...@@ -8,44 +8,15 @@ uint8_t SOC_Count_Time = 0; ...@@ -8,44 +8,15 @@ uint8_t SOC_Count_Time = 0;
uint8_t BUZZER_ON = 0; uint8_t BUZZER_ON = 0;
uint8_t Charge_OFF_Flag = 0; uint8_t Charge_OFF_Flag = 0;
// void Gauge_Gear_Display(void)
// {
// // uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState();
// if (Common_Get_IG_Sts() == COMMON_POWER_ON)
// {
// SEG_SET_GEAR(1,);
// }
// else
// {
// }
// }
void Gauge_Power_SOC_pull_Display(void) void Gauge_Power_SOC_pull_Display(void)
{ {
// uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState(); // uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState();
if (Common_Get_IG_Sts() == COMMON_POWER_ON && Charge_OFF_Flag == 0) if (Common_Get_IG_Sts() == COMMON_POWER_ON && Charge_OFF_Flag == 0)
{ {
if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18200A20_Msg)) == CAN_ERR_OK ) uint8_t SOC_1_Count = Get_CAN_Num_MBMS_Soc();
{ uint8_t SOC_2_Count = Get_CAN_Num_SBMS_Soc();
uint8_t SOC_1_Count = Get_CAN_CH0_ID_18200A20_Sig_MBMS_Soc(); SEG_SET_EleDial_1SOC(1, SOC_1_Count);
SEG_SET_EleDial_2SOC(1, SOC_2_Count);
SEG_SET_EleDial_1SOC(1, SOC_1_Count);
}
else
{
SEG_SET_EleDial_1SOC(0, 0);
}
if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18200A21_Msg)) == CAN_ERR_OK)
{
uint8_t SOC_2_Count = Get_CAN_CH0_ID_18200A21_Sig_SBMS_Soc();
SEG_SET_EleDial_2SOC(1, SOC_2_Count);
}
else
{
SEG_SET_EleDial_2SOC(0, 0);
}
} }
else else
{ {
...@@ -56,12 +27,11 @@ void Gauge_Power_SOC_pull_Display(void) ...@@ -56,12 +27,11 @@ void Gauge_Power_SOC_pull_Display(void)
void Gauge_Cutterhead_Gear_Display(void) void Gauge_Cutterhead_Gear_Display(void)
{ {
uint8_t Signal1 = Get_CAN_CH0_ID_157_Sig_BMCU_BladeSpeedGear(); uint8_t Signal1 = Get_CAN_Num_BMCU_BladeSpeedGear();
uint8_t Signal2 = Get_CAN_CH0_ID_157_Sig_BMCU_ErrorGrage(); uint8_t Signal2 = Get_CAN_Num_BMCU_ErrorGrage();
// uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState(); // uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState();
if (Common_Get_IG_Sts() == COMMON_POWER_ON && Charge_OFF_Flag == 0 && CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x157_Msg)) == CAN_ERR_OK) if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Charge_OFF_Flag == 0) && (Get_CAN_Power_State() == READY))
{ {
if (Signal2 == 0x1 || Signal2 == 0x2 || Signal2 == 0x3 || Signal2 == 0x4) if (Signal2 == 0x1 || Signal2 == 0x2 || Signal2 == 0x3 || Signal2 == 0x4)
{ {
if (FLASH_SYNC_1Hz) if (FLASH_SYNC_1Hz)
...@@ -86,8 +56,8 @@ void Gauge_Cutterhead_Gear_Display(void) ...@@ -86,8 +56,8 @@ void Gauge_Cutterhead_Gear_Display(void)
void Gauge_Gears_Display(void) void Gauge_Gears_Display(void)
{ {
uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_TravelSpeedGear(); uint8_t Signal1 = Get_CAN_Num_MMCU_TravelSpeedGear();
uint8_t Signal2 = Get_CAN_CH0_ID_125_Sig_MMCU_ParkingGearState(); uint8_t Signal2 = Get_CAN_Num_MMCU_ParkingGearState();
// uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState(); // uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState();
if (Common_Get_IG_Sts() == COMMON_POWER_ON && Charge_OFF_Flag == 0) if (Common_Get_IG_Sts() == COMMON_POWER_ON && Charge_OFF_Flag == 0)
{ {
...@@ -112,117 +82,97 @@ uint8_t SOC1_Count = 0; ...@@ -112,117 +82,97 @@ uint8_t SOC1_Count = 0;
uint8_t SOC2_Count = 0; uint8_t SOC2_Count = 0;
void Gauge_Power_SOC_CHAGING_Display(void) void Gauge_Power_SOC_CHAGING_Display(void)
{ {
uint8_t MBMS_TOTALSigAcc = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigAcc(); uint8_t MBMS_TOTALSigAcc = Get_CAN_Num_MBMS_TOTALSigAcc();
uint8_t MBMS_TOTALSigCharge = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigCharge(); uint8_t MBMS_TOTALSigCharge = Get_CAN_Num_MBMS_TOTALSigCharge();
uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState(); uint8_t MBMS_StatBattWorkState = Get_CAN_Num_MBMS_StatBattWorkState();
// uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState(); // uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState();
if (Common_Get_IG_Sts() == COMMON_POWER_ON) if (Common_Get_IG_Sts() == COMMON_POWER_ON)
{ {
if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18200A20_Msg)) == CAN_ERR_OK || CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18200A21_Msg)) == CAN_ERR_OK) uint8_t SOC_1_Count = Get_CAN_Num_MBMS_Soc();
uint8_t SOC_2_Count = Get_CAN_Num_SBMS_Soc();
if ((MBMS_TOTALSigAcc == 0x1 && MBMS_TOTALSigCharge == 0x1) || (MBMS_TOTALSigAcc == 0x0 && MBMS_TOTALSigCharge == 0x1)) // 上电充电
{ {
uint8_t SOC_1_Count = Get_CAN_CH0_ID_18200A20_Sig_MBMS_Soc(); if (MBMS_StatBattWorkState == 0x1) // 主电池
uint8_t SOC_2_Count = Get_CAN_CH0_ID_18200A21_Sig_SBMS_Soc();
if ((MBMS_TOTALSigAcc == 0x1 && MBMS_TOTALSigCharge == 0x1) || (MBMS_TOTALSigAcc == 0x0 && MBMS_TOTALSigCharge == 0x1)) // 上电充电
{ {
if (MBMS_StatBattWorkState == 0x1) // 主电池 if (++SOC_Count_Time > 10)
{ {
if (++SOC_Count_Time > 10) SOC_Count_Time = 0;
{
SOC_Count_Time = 0;
SEG_SET_EleDial_1SOC(1, SOC1_Count); SEG_SET_EleDial_1SOC(1, SOC1_Count);
SOC1_Count++; SOC1_Count++;
if (SOC1_Count > SOC_1_Count) if (SOC1_Count > SOC_1_Count)
{
SOC1_Count = 0;
}
}
if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18200A21_Msg)))
{ {
SEG_SET_EleDial_2SOC(0, 0); SOC1_Count = 0;
}
else
{
SEG_SET_EleDial_2SOC(1, SOC_2_Count);
} }
} }
else if (MBMS_StatBattWorkState == 0x4) // 副电池
SEG_SET_EleDial_2SOC(1, SOC_2_Count);
}
else if (MBMS_StatBattWorkState == 0x4) // 副电池
{
if (++SOC_Count_Time > 10)
{ {
if (++SOC_Count_Time > 10) SOC_Count_Time = 0;
{
SOC_Count_Time = 0;
SEG_SET_EleDial_2SOC(1, SOC2_Count); SEG_SET_EleDial_2SOC(1, SOC2_Count);
SOC2_Count++; SOC2_Count++;
if (SOC2_Count > SOC_2_Count) if (SOC2_Count > SOC_2_Count)
{
SOC2_Count = 0;
}
}
if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18200A20_Msg)))
{ {
SEG_SET_EleDial_1SOC(0, 0); SOC2_Count = 0;
}
else
{
SEG_SET_EleDial_1SOC(1, SOC_1_Count);
} }
} }
else if (MBMS_StatBattWorkState == 0x7) // 主副电池
SEG_SET_EleDial_1SOC(1, SOC_1_Count);
}
else if (MBMS_StatBattWorkState == 0x7) // 主副电池
{
if (++SOC_Count_Time > 10)
{ {
if (++SOC_Count_Time > 10) SOC_Count_Time = 0;
{
SOC_Count_Time = 0;
SEG_SET_EleDial_1SOC(1, SOC1_Count); SEG_SET_EleDial_1SOC(1, SOC1_Count);
SEG_SET_EleDial_2SOC(1, SOC2_Count); SEG_SET_EleDial_2SOC(1, SOC2_Count);
SOC1_Count++; SOC1_Count++;
SOC2_Count++; SOC2_Count++;
if (SOC_1_Count > SOC_2_Count) if (SOC_1_Count > SOC_2_Count)
{
if (SOC2_Count > SOC_2_Count)
{ {
if (SOC2_Count > SOC_2_Count) SOC2_Count--;
if (SOC1_Count > SOC_1_Count)
{ {
SOC2_Count--; SOC1_Count = 0;
if (SOC1_Count > SOC_1_Count) SOC2_Count = 0;
{
SOC1_Count = 0;
SOC2_Count = 0;
}
} }
} }
else }
else
{
if (SOC1_Count > SOC_1_Count)
{ {
if (SOC1_Count > SOC_1_Count) SOC1_Count--;
if (SOC2_Count > SOC_2_Count)
{ {
SOC1_Count--; SOC1_Count = 0;
if (SOC2_Count > SOC_2_Count) SOC2_Count = 0;
{
SOC1_Count = 0;
SOC2_Count = 0;
}
} }
} }
} }
} }
else
{
SEG_SET_EleDial_1SOC(1, SOC_1_Count);
SEG_SET_EleDial_2SOC(1, SOC_2_Count);
}
}
if (MBMS_TOTALSigAcc == 0x0 && MBMS_TOTALSigCharge == 0x1) // 下电充电
{
poweroff_time++;
} }
else else
{ {
poweroff_time = 0; SEG_SET_EleDial_1SOC(1, SOC_1_Count);
SEG_SET_EleDial_2SOC(1, SOC_2_Count);
} }
} }
if (MBMS_TOTALSigAcc == 0x0 && MBMS_TOTALSigCharge == 0x1) // 下电充电
{
poweroff_time++;
}
else else
{ {
SEG_SET_EleDial_1SOC(0, 0); poweroff_time = 0;
SEG_SET_EleDial_2SOC(0, 0);
} }
} }
else else
...@@ -237,15 +187,8 @@ void Gauge_EleDial_AllSOC_Display(void) ...@@ -237,15 +187,8 @@ void Gauge_EleDial_AllSOC_Display(void)
if (Common_Get_IG_Sts() == COMMON_POWER_ON) if (Common_Get_IG_Sts() == COMMON_POWER_ON)
{ {
if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18203020_Msg)) == CAN_ERR_OK) AllSOC_DIS = Get_CAN_Num_MBMS_StatSoc();
{ SEG_SET_EleDial_AllSOC(1, AllSOC_DIS);
AllSOC_DIS = Get_CAN_CH0_ID_18203020_Sig_MBMS_StatSoc();
SEG_SET_EleDial_AllSOC(1, AllSOC_DIS);
}
else
{
SEG_SET_EleDial_AllSOC(0, 0);
}
} }
else else
{ {
...@@ -267,25 +210,16 @@ uint8_t Get_EleDial_AllSOC_lenth(void) ...@@ -267,25 +210,16 @@ uint8_t Get_EleDial_AllSOC_lenth(void)
return num; return num;
} }
uint8_t Clockonetime_flag = 0; uint8_t Clockonetime_flag = 0;
uint8_t Clock_seconds = 0;
uint8_t Clock_hours = 0;
void Gauge_Clock_Display(void) void Gauge_Clock_Display(void)
{ {
uint32_t Clock_all = 0; uint32_t Clock_all = 0;
if (Common_Get_IG_Sts() == COMMON_POWER_ON && Charge_OFF_Flag == 0) if (Common_Get_IG_Sts() == COMMON_POWER_ON && Charge_OFF_Flag == 0)
{ {
if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x339_Msg)) == CAN_ERR_OK) Clock_all = Get_CAN_Num_MMCU_SingleWorkingHours();
{ uint8_t Clock_hours = Clock_all / 60;
Clock_all = Get_CAN_CH0_ID_339_Sig_MMCU_SingleWorkingHours(); uint8_t Clock_seconds = Clock_all % 60;
Clock_hours = Clock_all / 60; SEG_SET_Clock(Clock_hours, Clock_seconds, FLASH_SYNC_1Hz, 1, 1);
Clock_seconds = Clock_all % 60; Clockonetime_flag = 1;
SEG_SET_Clock(Clock_hours, Clock_seconds, FLASH_SYNC_1Hz, 1, 1);
Clockonetime_flag = 1;
}
else
{
SEG_SET_Clock(Clock_hours, Clock_seconds, 0, 0, 0);
}
} }
else else
{ {
...@@ -299,31 +233,19 @@ uint8_t Get_Clockonetime_lenth(void) ...@@ -299,31 +233,19 @@ uint8_t Get_Clockonetime_lenth(void)
} }
uint16_t EEPROM_Write_Time = 0; uint16_t EEPROM_Write_Time = 0;
uint8_t EEPROM_Cumulativee_clean = 0;
void Data_CumulativeWorkHours_EEPROM_Write(void) void Data_CumulativeWorkHours_EEPROM_Write(void)
{ {
uint32_t u32Data[1] = {0}; uint32_t u32Data[1] = {0};
uint32_t eeprom_back[1] = {0}; if (Common_Get_IG_Sts() == COMMON_POWER_ON && Charge_OFF_Flag == 0)
if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x339_Msg)) == CAN_ERR_OK)
{ {
u32Data[0] = Get_CAN_CH0_ID_339_Sig_MMCU_AccumulatedWorkHours(); u32Data[0] = Get_CAN_Num_MMCU_AccumulatedWorkHours();
if(u32Data[0] > 0XFFFA && EEPROM_Cumulativee_clean == 0) if (++EEPROM_Write_Time > 6000) // 一分钟存一次
{ {
EEPROM_Cumulativee_clean = 1; EEPROM_Write_Time = 0;
eeprom_WriteRecord(EEPROM_BLOCK_00, (uint8_t *)eeprom_back, 4);
u32Data[0] = 0;
} }
eeprom_ReadRecord(EEPROM_BLOCK_00, (uint8_t *)eeprom_back, 4);
if (EEPROM_Write_Time == 0) if (EEPROM_Write_Time == 0)
{ {
if (u32Data[0] >= eeprom_back[0]) eeprom_WriteRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data, 4);
{
eeprom_WriteRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data, 4);
}
}
if (++EEPROM_Write_Time > 6000) // 一分钟存一次
{
EEPROM_Write_Time = 0;
} }
} }
else else
...@@ -334,7 +256,6 @@ void Data_CumulativeWorkHours_EEPROM_Write(void) ...@@ -334,7 +256,6 @@ void Data_CumulativeWorkHours_EEPROM_Write(void)
uint32_t u32Data_read[1] = {0}; uint32_t u32Data_read[1] = {0};
void Gauge_Clock_All_Display(void) void Gauge_Clock_All_Display(void)
{ {
eeprom_ReadRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data_read, 4); eeprom_ReadRecord(EEPROM_BLOCK_00, (uint8_t *)u32Data_read, 4);
if (Common_Get_IG_Sts() == COMMON_POWER_ON && Charge_OFF_Flag == 0) if (Common_Get_IG_Sts() == COMMON_POWER_ON && Charge_OFF_Flag == 0)
{ {
...@@ -383,7 +304,7 @@ void Clear_Bu98(void) ...@@ -383,7 +304,7 @@ void Clear_Bu98(void)
void Gauge_Service(void) void Gauge_Service(void)
{ {
uint8_t i = 0; uint8_t i = 0;
if (Common_Get_IG_Sts() == COMMON_POWER_ON && ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) <= 16000 && ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) >= 9000) if (Common_Get_IG_Sts() == COMMON_POWER_ON)
{ {
if (Get_CAN_Power_State() != PKEY_ON) if (Get_CAN_Power_State() != PKEY_ON)
{ {
...@@ -420,19 +341,19 @@ void Gauge_Service(void) ...@@ -420,19 +341,19 @@ void Gauge_Service(void)
SEG_SET_GEAR(1, Gear_P, 0); SEG_SET_GEAR(1, Gear_P, 0);
if (Buzzer_time <= 6000) if (Buzzer_time <= 6000)
{ {
RTE_GPIO_Config(RTE_GPIO_PORT04_PIN01, GpioOut_High); // OUT_EN_1 RTE_GPIO_Set_Level(RTE_GPIO_PORT04_PIN01, RTE_GPIO_LEVEL_HIGH); // OUT_EN_1
BUZZER_ON = 1; BUZZER_ON = 1;
} }
else else
{ {
RTE_GPIO_Config(RTE_GPIO_PORT04_PIN01, GpioOut_Low); // OUT_EN_1 RTE_GPIO_Set_Level(RTE_GPIO_PORT04_PIN01, RTE_GPIO_LEVEL_LOW); // OUT_EN_1
BUZZER_ON = 0; BUZZER_ON = 0;
} }
} }
else else
{ {
SEG_SET_GEAR(1, Gear_OFF, 0); SEG_SET_GEAR(1, Gear_OFF, 0);
RTE_GPIO_Config(RTE_GPIO_PORT04_PIN01, GpioOut_Low); // OUT_EN_1 RTE_GPIO_Set_Level(RTE_GPIO_PORT04_PIN01, RTE_GPIO_LEVEL_LOW); // OUT_EN_1
BUZZER_ON = 0; BUZZER_ON = 0;
} }
if (Buzzer_time < 0xFFFF) if (Buzzer_time < 0xFFFF)
...@@ -500,8 +421,8 @@ void Gauge_CAN_setup_Service(void) ...@@ -500,8 +421,8 @@ void Gauge_CAN_setup_Service(void)
else else
{ {
Charge_OFF_Flag = 2; Charge_OFF_Flag = 2;
uint8_t MBMS_TOTALSigAcc = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigAcc(); uint8_t MBMS_TOTALSigAcc = Get_CAN_Num_MBMS_TOTALSigAcc();
uint8_t MBMS_TOTALSigCharge = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigCharge(); uint8_t MBMS_TOTALSigCharge = Get_CAN_Num_MBMS_TOTALSigCharge();
SEG_SET_EleDial_AllSOC(0, 0); SEG_SET_EleDial_AllSOC(0, 0);
SEG_SET_EleDial_1SOC(0, 0); SEG_SET_EleDial_1SOC(0, 0);
SEG_SET_EleDial_2SOC(0, 0); SEG_SET_EleDial_2SOC(0, 0);
...@@ -571,5 +492,5 @@ void BUZZER_Init(void) ...@@ -571,5 +492,5 @@ void BUZZER_Init(void)
{ {
Buzzer_time = 0; Buzzer_time = 0;
BUZZER_ON = 0; BUZZER_ON = 0;
RTE_GPIO_Config(RTE_GPIO_PORT04_PIN01, GpioOut_Low); // OUT_EN_1 RTE_GPIO_Set_Level(RTE_GPIO_PORT04_PIN01, GpioOut_Low); // OUT_EN_1
} }
Firmware/Source/Component/System_Monitor/System_Monitor_User.c
View file @ 9ac8bc24
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
#define u16ENTER_LOW_Y_RANGE 9000U #define u16ENTER_LOW_Y_RANGE 9000U
#define u16EXIT_LOW_Y_RANGE 10000U #define u16EXIT_LOW_Y_RANGE 10000U
#define u16EXIT_HIGH_Y_RANGE 17500U #define u16EXIT_HIGH_Y_RANGE 16000U
#define u16ENTER_HIGH_Y_RANGE 18000U #define u16ENTER_HIGH_Y_RANGE 17500U
#define u16EXIT_HIGH_N_RANGE 17500U #define u16EXIT_HIGH_N_RANGE 18000U
#define u16ENTER_HIGH_N_RANGE 18000U #define u16ENTER_HIGH_N_RANGE 18500U
#define u16Top_Vol 0xffffu #define u16Top_Vol 0xffffu
...@@ -36,7 +36,7 @@ static const monitorlib_uint16_t SysFun_Range [ 26u ] = { ...@@ -36,7 +36,7 @@ static const monitorlib_uint16_t SysFun_Range [ 26u ] = {
u16ENTER_HIGH_N_RANGE, u16ENTER_HIGH_N_RANGE,
u16Top_Vol, u16Top_Vol,
2500, 5000,
50u, 50u,
u16Base_Vol, u16Base_Vol,
......
Firmware/Source/Component/Telltales/Telltales_user.c
View file @ 9ac8bc24
...@@ -252,8 +252,8 @@ static void LED_Grass_Full_Execution(Tellib_uint16_t led_status) ...@@ -252,8 +252,8 @@ static void LED_Grass_Full_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_OVERLOAD_Judgement(void) static Tellib_uint16_t LED_OVERLOAD_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_38E_Sig_BMCU_Moto1_Locked_RotorFault(); Tellib_uint8_t Signal1 = Get_CAN_Num_BMCU_Moto1_Locked_RotorFault();
Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_38E_Sig_BMCU_Moto2_Locked_RotorFault(); Tellib_uint8_t Signal2 = Get_CAN_Num_BMCU_Moto2_Locked_RotorFault();
if ((Signal1 == 0x1 || Signal2 == 0x1) && openLED_flag) if ((Signal1 == 0x1 || Signal2 == 0x1) && openLED_flag)
{ {
LED_STATE = 1; LED_STATE = 1;
...@@ -307,7 +307,7 @@ static void LED_READY_Execution(Tellib_uint16_t led_status) ...@@ -307,7 +307,7 @@ static void LED_READY_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_Seat_Detection_Judgement(void) static Tellib_uint16_t LED_Seat_Detection_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_SeatDetectState(); Tellib_uint8_t Signal1 = Get_CAN_Num_MMCU_SeatDetectState();
if (Signal1 == 0x1 && openLED_flag) if (Signal1 == 0x1 && openLED_flag)
{ {
LED_STATE = 1; LED_STATE = 1;
...@@ -343,7 +343,7 @@ static void LED_Seat_Detection_Execution(Tellib_uint16_t led_status) ...@@ -343,7 +343,7 @@ static void LED_Seat_Detection_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_Key_Access_Judgement(void) static Tellib_uint16_t LED_Key_Access_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigAcc(); Tellib_uint8_t Signal1 = Get_CAN_Num_MBMS_TOTALSigAcc();
if (Signal1 == 0x1 && openLED_flag) if (Signal1 == 0x1 && openLED_flag)
{ {
LED_STATE = 1; LED_STATE = 1;
...@@ -370,10 +370,10 @@ static void LED_Key_Access_Execution(Tellib_uint16_t led_status) ...@@ -370,10 +370,10 @@ static void LED_Key_Access_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_Battery_Charging_Judgement(void) static Tellib_uint16_t LED_Battery_Charging_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigAcc(); Tellib_uint8_t Signal1 = Get_CAN_Num_MBMS_TOTALSigAcc();
Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigCharge(); Tellib_uint8_t Signal2 = Get_CAN_Num_MBMS_TOTALSigCharge();
Tellib_uint8_t Signal3 = Get_CAN_Power_State(); Tellib_uint8_t Signal3 = Get_CAN_Power_State();
if(ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) >= 9000 && ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) <= 16000 && (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF && Charge_OFF_Flag != 2)) if( (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF && Charge_OFF_Flag != 2))
{ {
if ((Signal1 == 0x1 || Signal1 == 0x0 ) && Signal2 == 0X1) if ((Signal1 == 0x1 || Signal1 == 0x0 ) && Signal2 == 0X1)
{ {
...@@ -423,8 +423,8 @@ static void LED_Battery_Charging_Execution(Tellib_uint16_t led_status ...@@ -423,8 +423,8 @@ static void LED_Battery_Charging_Execution(Tellib_uint16_t led_status
// static Tellib_uint16_t LED_Battery_Charging_POWEROFF_Judgement(void) // static Tellib_uint16_t LED_Battery_Charging_POWEROFF_Judgement(void)
// { // {
// Tellib_uint16_t LED_STATE = 0u; // Tellib_uint16_t LED_STATE = 0u;
// Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigAcc(); // Tellib_uint8_t Signal1 = Get_CAN_Num_MBMS_TOTALSigAcc();
// Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigCharge(); // Tellib_uint8_t Signal2 = Get_CAN_Num_MBMS_TOTALSigCharge();
// Tellib_uint8_t Signal3 = Get_CAN_CH0_ID_125_Sig_MMCU_PowerMode(); // Tellib_uint8_t Signal3 = Get_CAN_CH0_ID_125_Sig_MMCU_PowerMode();
// if(ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) >= 9 && ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) <= 16) // if(ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) >= 9 && ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) <= 16)
// { // {
...@@ -449,8 +449,8 @@ static void LED_Battery_Charging_Execution(Tellib_uint16_t led_status ...@@ -449,8 +449,8 @@ static void LED_Battery_Charging_Execution(Tellib_uint16_t led_status
static Tellib_uint16_t LED_Cutterhead_Switch_Judgement(void) static Tellib_uint16_t LED_Cutterhead_Switch_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_157_Sig_BMCU_PTOSwicthState(); Tellib_uint8_t Signal1 = Get_CAN_Num_BMCU_PTOSwicthState();
if (Signal1 == 0x1 && openLED_flag) if (Signal1 == 0x1 && openLED_flag && (Get_CAN_Power_State() == READY))
{ {
LED_STATE = 1; LED_STATE = 1;
} }
...@@ -476,8 +476,8 @@ static void LED_Cutterhead_Switch_Execution(Tellib_uint16_t led_statu ...@@ -476,8 +476,8 @@ static void LED_Cutterhead_Switch_Execution(Tellib_uint16_t led_statu
static Tellib_uint16_t LED_GEAR_Judgement(void) static Tellib_uint16_t LED_GEAR_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_TravelSpeedGear(); Tellib_uint8_t Signal1 = Get_CAN_Num_MMCU_TravelSpeedGear();
Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_125_Sig_MMCU_ParkingGearState(); Tellib_uint8_t Signal2 = Get_CAN_Num_MMCU_ParkingGearState();
if(Signal2 != 0x1 && Charge_OFF_Flag == 0) if(Signal2 != 0x1 && Charge_OFF_Flag == 0)
{ {
if (Signal1 == 0x1 || Signal1 == 0x2) if (Signal1 == 0x1 || Signal1 == 0x2)
...@@ -693,8 +693,8 @@ static void LED_Tire_pressure_R_Execution(Tellib_uint16_t led_status) ...@@ -693,8 +693,8 @@ static void LED_Tire_pressure_R_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_Gears_Judgement(void) static Tellib_uint16_t LED_Gears_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_TravelSpeedGear(); Tellib_uint8_t Signal1 = Get_CAN_Num_MMCU_TravelSpeedGear();
Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_125_Sig_MMCU_ParkingGearState(); Tellib_uint8_t Signal2 = Get_CAN_Num_MMCU_ParkingGearState();
if(Signal2 != 0x1 && openLED_flag) if(Signal2 != 0x1 && openLED_flag)
{ {
if (Signal1 == 0x1 || Signal1 == 0x2) if (Signal1 == 0x1 || Signal1 == 0x2)
...@@ -728,9 +728,9 @@ static void LED_Gears_Execution(Tellib_uint16_t led_status) ...@@ -728,9 +728,9 @@ static void LED_Gears_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_Cutterhead_Gear_Judgement(void) static Tellib_uint16_t LED_Cutterhead_Gear_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_157_Sig_BMCU_BladeSpeedGear(); Tellib_uint8_t Signal1 = Get_CAN_Num_BMCU_BladeSpeedGear();
Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_157_Sig_BMCU_ErrorGrage(); Tellib_uint8_t Signal2 = Get_CAN_Num_BMCU_ErrorGrage();
if((Signal2 == 0x1 || Signal2 == 0x2 || Signal2 == 0x3 || Signal2 == 0x4) && openLED_flag) if((Signal2 == 0x1 || Signal2 == 0x2 || Signal2 == 0x3 || Signal2 == 0x4) && openLED_flag && (Get_CAN_Power_State() == READY))
{ {
if(Signal1 == 0x1 || Signal1 == 0x2 || Signal1 == 0x3) if(Signal1 == 0x1 || Signal1 == 0x2 || Signal1 == 0x3)
{ {
...@@ -741,7 +741,7 @@ static Tellib_uint16_t LED_Cutterhead_Gear_Judgement(void) ...@@ -741,7 +741,7 @@ static Tellib_uint16_t LED_Cutterhead_Gear_Judgement(void)
LED_STATE = 0; LED_STATE = 0;
} }
} }
else if (Signal2 == 0x0 && openLED_flag) else if (Signal2 == 0x0 && openLED_flag && (Get_CAN_Power_State() == READY))
{ {
if(Signal1 == 0x1 || Signal1 == 0x2 || Signal1 == 0x3) if(Signal1 == 0x1 || Signal1 == 0x2 || Signal1 == 0x3)
{ {
...@@ -832,8 +832,8 @@ static void LED_Fault_Codes_Execution(Tellib_uint16_t led_status) ...@@ -832,8 +832,8 @@ static void LED_Fault_Codes_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_SystIndicator_R_Judgement(void) static Tellib_uint16_t LED_SystIndicator_R_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_ErrorGrage(); Tellib_uint8_t Signal1 = Get_CAN_Num_MMCU_ErrorGrage();
Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_134_Sig_SMCU_ErrorGrage(); Tellib_uint8_t Signal2 = Get_CAN_Num_SMCU_ErrorGrage();
Tellib_uint8_t Signal3 = System_Indicator_CANFlag; Tellib_uint8_t Signal3 = System_Indicator_CANFlag;
if ((Signal1 == 0x4 || Signal1 == 0x5 ||Signal2 == 0x4 || Signal2 == 0x5 || Signal3 == 1) && openLED_flag) if ((Signal1 == 0x4 || Signal1 == 0x5 ||Signal2 == 0x4 || Signal2 == 0x5 || Signal3 == 1) && openLED_flag)
{ {
...@@ -862,7 +862,7 @@ static void LED_SystIndicator_R_Execution(Tellib_uint16_t led_status) ...@@ -862,7 +862,7 @@ static void LED_SystIndicator_R_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_P_GEAR_G_Judgement(void) static Tellib_uint16_t LED_P_GEAR_G_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_ParkingGearState(); Tellib_uint8_t Signal1 = Get_CAN_Num_MMCU_ParkingGearState();
Tellib_uint8_t Signal2 = Get_CAN_Power_State(); Tellib_uint8_t Signal2 = Get_CAN_Power_State();
if ( Signal1 == 0x1 && openLED_flag && checkself_seg_Flag == 0) if ( Signal1 == 0x1 && openLED_flag && checkself_seg_Flag == 0)
{ {
...@@ -931,7 +931,7 @@ static void LED_Fuel_Alarm_W_Execution(Tellib_uint16_t led_status) ...@@ -931,7 +931,7 @@ static void LED_Fuel_Alarm_W_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_Charging_Connection_R_Judgement(void) static Tellib_uint16_t LED_Charging_Connection_R_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattChargeState(); Tellib_uint8_t Signal1 = Get_CAN_Num_MBMS_StatBattChargeState();
if ((Signal1 == 0x1 || Signal1 == 0x2 ||Signal1 == 0x3) && (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF)) if ((Signal1 == 0x1 || Signal1 == 0x2 ||Signal1 == 0x3) && (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF))
{ {
LED_STATE = 1; LED_STATE = 1;
...@@ -959,7 +959,7 @@ static void LED_Charging_Connection_R_Execution(Tellib_uint16_t led_s ...@@ -959,7 +959,7 @@ static void LED_Charging_Connection_R_Execution(Tellib_uint16_t led_s
static Tellib_uint16_t LED_Power_Battery_Failure_R_Judgement(void) static Tellib_uint16_t LED_Power_Battery_Failure_R_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
// Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattChargeState(); // Tellib_uint8_t Signal1 = Get_CAN_Num_MBMS_StatBattChargeState();
// if (Signal1 == 0x1 || Signal1 == 0x2 ||Signal1 == 0x3) // if (Signal1 == 0x1 || Signal1 == 0x2 ||Signal1 == 0x3)
// { // {
// LED_STATE = 1; // LED_STATE = 1;
......
Firmware/Source/System/Sys_Task_List.c
View file @ 9ac8bc24
...@@ -44,6 +44,7 @@ void Sys_50ms_Tasks(void) ...@@ -44,6 +44,7 @@ void Sys_50ms_Tasks(void)
BU98R10_Update_Request(); BU98R10_Update_Request();
LED_Driver_Scan_Refresh(); LED_Driver_Scan_Refresh();
Telltales_Management(); Telltales_Management();
Set_CAN_ALL_Signal();
Gauge_Service(); Gauge_Service();
} }
......
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