zjk/H100PowerManger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

增加了交互变量的状态,增加了设备状态和设备表的json解析和生成函数,修复了设备表类和通信协议中不同的地方

Browse Source
This commit is contained in:
zjk
2025-02-19 17:18:39 +08:00
parent 5b9934c6f2
commit 75575f935c
10 changed files with 724 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/msg/uPower_currentState_st.json
+26 -26
View File
@@ -1,43 +1,43 @@
{
"HVABFTDev123Cur_uint16": 0,
"HVABactCur_uint16": 0,
"HVABbowRudCur_uint16": 0,
"HVABbowRudCur_uint16": 58353,
"HVABbusBCur_uint16": 0,
"HVABbusBVol_uint16": 0,
"HVABmastSteGeaCur_uint16": 0,
"HVABopenWaterCur_uint16": 0,
"HVABxczCur_uint16": 1,
"HVBBCCUCur_uint16": 0,
"HVABopenWaterCur_uint16": 52412,
"HVABxczCur_uint16": 18176,
"HVBBCCUCur_uint16": 193,
"HVBBFCSSecurSysCur_uint16": 0,
"HVBBbatInsCur_uint16": 0,
"HVBBbowLowVolDisBoxCur_uint16": 0,
"HVBBdcC1InsCur_uint16": 0,
"HVBBemer2BusVol_uint16": 0,
"HVBBemerBatCur_uint16": 0,
"HVBBinsBusVol_uint16": 0,
"HVBBbatInsCur_uint16": 22321,
"HVBBbowLowVolDisBoxCur_uint16": 22321,
"HVBBdcC1InsCur_uint16": 64995,
"HVBBemer2BusVol_uint16": 22272,
"HVBBemerBatCur_uint16": 47104,
"HVBBinsBusVol_uint16": 49152,
"HVBBplcCur_uint16": 0,
"HVBBreservedCur1_uint16": 0,
"HVBBreservedCur2_uint16": 0,
"HVBBunit4Cur_uint16": 0,
"HVBFTDev45Cur_uint16": 0,
"HVBbatGroupCur_uint16": 0,
"HVBbowHVolDisBoxCur_uint16": 0,
"HVBBreservedCur1_uint16": 127,
"HVBBreservedCur2_uint16": 127,
"HVBBunit4Cur_uint16": 64995,
"HVBFTDev45Cur_uint16": 32716,
"HVBbatGroupCur_uint16": 64208,
"HVBbowHVolDisBoxCur_uint16": 48482,
"HVBbusACur_uint16": 0,
"HVBbusAVol_uint16": 0,
"HVBbusAVol_uint16": 48479,
"HVBdcDc5Cur_uint16": 0,
"HVBfbCur_uint16": 0,
"HVBmotorCur_uint16": 0,
"HVBpowerBusCur_uint16": 0,
"HVBfbCur_uint16": 12532,
"HVBmotorCur_uint16": 32716,
"HVBpowerBusCur_uint16": 55488,
"HVBpowerBusVol_uint16": 0,
"HVBreservedCur1_uint16": 0,
"HVBreservedCur1_uint16": 58199,
"HVBreservedCur2_uint16": 0,
"HVBreservedCur3_uint16": 0,
"HVBsternRud1Cur_uint16": 0,
"HVBsternRud2Cur_uint16": 0,
"HVBreservedCur3_uint16": 58199,
"HVBsternRud1Cur_uint16": 12536,
"HVBsternRud2Cur_uint16": 32765,
"HVBtyzCur_uint16": 0,
"LVBBbowPZDevCur_uint16": 0,
"LVBBemerBatCur_uint16": 0,
"LVBBemerBusVol_uint16": 0,
"LVBBemerBatCur_uint16": 64768,
"LVBBemerBusVol_uint16": 44966,
"LVBBinsBusCur_uint16": 0,
"LVBBunit1Cur_uint16": 0,
"LVBBunit2Cur_uint16": 0,
data/msg/uPower_disSysState_st.json
+3 -3
View File
@@ -1,8 +1,8 @@
{
"HVolABusBreaker_unit16": 0,
"HVolBBusBreaker_unit16": 79,
"HVolBusBreaker_uint16": 58,
"LVolBusBreaker_uint16": 159,
"HVolBBusBreaker_unit16": 1640,
"HVolBusBreaker_uint16": 21943,
"LVolBusBreaker_uint16": 48483,
"faultCode_array":
[
0
data/msg/uPower_fcsState_st.json
+27 -27
View File
@@ -1,30 +1,30 @@
{
"backpressure1_fp32": 8.0,
"backpressure2_fp32": 9.0,
"ch4oConcent1_fp32": 53.0,
"ch4oConcent2_fp32": 81.0,
"ch4o_fp32": 0.0,
"excTemp_fp32": 84.0,
"faultCode1_uint16": 0,
"faultCode2_uint16": 0,
"faultCode3_uint16": 0,
"fcuCurIns_fp32": 0.0,
"backpressure1_fp32": 1.129433109780545e-38,
"backpressure2_fp32": 1.1736554268475541e-38,
"ch4oConcent1_fp32": -1.6155215737897056e+25,
"ch4oConcent2_fp32": 1.9618178500547439e-44,
"ch4o_fp32": 1.1736554268475541e-38,
"excTemp_fp32": 1.1736552867177076e-38,
"faultCode1_uint16": 36880,
"faultCode2_uint16": 48384,
"faultCode3_uint16": 32716,
"fcuCurIns_fp32": 8.602403116674333e-40,
"fcuCurPower_fp32": 0.0,
"fcuCur_fp32": 14.0,
"fcuFaultLeve_uint8": 0,
"fcuOutIns_fp32": 56.0,
"fcuOutPower_fp32": 386.0,
"fcuState_uint8": 0,
"fcuVolIns_fp32": 0.0,
"fcuVolPower_fp32": 0.0,
"fcuVol_fp32": 382.0,
"flameDet_uint8": 1,
"h2Concent1_fp32": 5.0,
"h2Concent2_fp32": 3.0,
"o2Concent1_fp32": 80.0,
"o2Concent2_fp32": 82.0,
"o2Level_fp32": 0.0,
"o2_fp32": 0.0,
"powLimit_fp32": 10.0,
"powerGen_fp32": 390.0
"fcuCur_fp32": -1.1078134507391041e+21,
"fcuFaultLeve_uint8": 96,
"fcuOutIns_fp32": 1.1754185405753675e-38,
"fcuOutPower_fp32": 194012262694912.0,
"fcuState_uint8": 92,
"fcuVolIns_fp32": 6.4791036039165641e+19,
"fcuVolPower_fp32": 1.1736554268475541e-38,
"fcuVol_fp32": 3.4331812375958018e-43,
"flameDet_uint8": 0,
"h2Concent1_fp32": 6.3595330338098774e+19,
"h2Concent2_fp32": 1.1736554268475541e-38,
"o2Concent1_fp32": 2.7580044118016918e+19,
"o2Concent2_fp32": 1.1736554268475541e-38,
"o2Level_fp32": 1.1736552867177076e-38,
"o2_fp32": -1.7820938281008955e+23,
"powLimit_fp32": 1.1736554268475541e-38,
"powerGen_fp32": 2.9084246393558663e+19
}
data/msg/uPower_liBatState_st.json
+26 -26
View File
@@ -1,38 +1,38 @@
{
"fcuCurToInsLimit1_uint8": 0,
"fcuCurToinsLimit2_uint8": 0,
"insBatCurElect_uint16": 0,
"insBatLimit_uint16": 89,
"insBatSoc_uint8": 57,
"insBatTotalElect_uint16": 829,
"insChargeState_uint8": 0,
"insCurSocHold1_uint8": 0,
"insBatCurElect_uint16": 32716,
"insBatLimit_uint16": 58199,
"insBatSoc_uint8": 0,
"insBatTotalElect_uint16": 24778,
"insChargeState_uint8": 209,
"insCurSocHold1_uint8": 48,
"insCurSocHold2_uint8": 0,
"insCurSocHold3_uint8": 0,
"insCurrent_uint16": 77,
"insCurrent_uint16": 0,
"insLinkVol_uint16": 0,
"insNegRelayState_uint8": 1,
"insNegRes_uint16": 0,
"insNegRelayState_uint8": 0,
"insNegRes_uint16": 48480,
"insPackVol_uint16": 0,
"insPosRelayState_uint8": 0,
"insPosRes_uint16": 0,
"insfaultCode_uint8": 0,
"insPosRes_uint16": 23716,
"insfaultCode_uint8": 228,
"powBatCurElect_uint16": 0,
"powBatSoc_uint8": 55,
"powBatTotalElect_uint16": 924,
"powChargeState_uint8": 0,
"powBatSoc_uint8": 0,
"powBatTotalElect_uint16": 48480,
"powChargeState_uint8": 18,
"powCurSocHold1_uint8": 0,
"powCurSocHold2_uint8": 0,
"powCurSocHold3_uint8": 0,
"powCurToInsLimit1_uint8": 0,
"powCurToinsLimit2_uint8": 0,
"powCur_uint16": 74,
"powLinkVol_uint16": 0,
"powNegRelayState_uint8": 0,
"powNegRes_uint16": 0,
"powPosRelayState_uint8": 0,
"powPosRes_uint16": 0,
"powerBatLimit_uint16": 53,
"powCurSocHold2_uint8": 244,
"powCurSocHold3_uint8": 212,
"powCurToInsLimit1_uint8": 95,
"powCurToinsLimit2_uint8": 189,
"powCur_uint16": 64208,
"powLinkVol_uint16": 32716,
"powNegRelayState_uint8": 48,
"powNegRes_uint16": 32716,
"powPosRelayState_uint8": 180,
"powPosRes_uint16": 48482,
"powerBatLimit_uint16": 32765,
"powerPackVol_uint16": 0,
"powfaultCode_uint8": 0
"powfaultCode_uint8": 85
}
data/subDisSysCmd.json
+64
View File
@@ -0,0 +1,64 @@
{
"CTD1" : 0,
"CTD2" : 0,
"DVL" : 0,
"USBL" : 0,
"bowCover1" : 0,
"bowCover2" : 0,
"bowCover3" : 0,
"bowCover4" : 0,
"bowCover5" : 0,
"bowCover6" : 0,
"bowRudderDeploy" : 0,
"bowRudderServo1" : 0,
"bowRudderServo2" : 0,
"bowThrow" : 0,
"bowWaterlnet1" : 0,
"bowWaterlnet2" : 0,
"bowWaterlnet3" : 0,
"bowWaterlnet4" : 0,
"bowWaterlnet5" : 0,
"bowWaterlnet6" : 0,
"bowWaterlnet7" : 0,
"bowWaterlnet8" : 0,
"buoyage" : 0,
"buoyancyAdjust1" : 0,
"buoyancyAdjust2" : 0,
"buoyancyAdjust3" : 0,
"buoyancyAdjust4" : 0,
"buoyancyAdjust5" : 0,
"commMast" : 0,
"depth1" : 0,
"depth2" : 0,
"depth3" : 0,
"electSensor" : 0,
"forwardSonar" : 0,
"inputWaterSensor1" : 0,
"inputWaterSensor2" : 0,
"inputWaterSensor3" : 0,
"ins" : 0,
"launchControler" : 0,
"lowFreqSonar" : 0,
"mastLiftingServo" : 0,
"ntp" : 0,
"overDeep1" : 0,
"overDeep2" : 0,
"photoSensor" : 0,
"sideSonar" : 0,
"singleBeamSonar1" : 0,
"singleBeamSonar2" : 0,
"singleBeamSonar3" : 0,
"singleBeamSonar4" : 0,
"singleBeamSonar5" : 0,
"singleBeamSonar6" : 0,
"singleBeamSonar7" : 0,
"singleBeamSonar8" : 0,
"soundVeloc" : 0,
"sternRudderServo1" : 0,
"sternRudderServo2" : 0,
"sternRudderServo3" : 0,
"sternRudderServo4" : 0,
"sternThrow" : 0,
"thruster" : 0,
"waterInject" : 0
}