增加了配电控制器操作代码

src/pPowerManger/pmSysvariable.h

@@ -91,19 +91,30 @@ typedef struct ccuState
   float placeholder5;  
 } ccuState;
 
-//TODO：增加复合管控的控制指令
-// typedef struct ccuCmd
-// {
-//   unsigned char currentWorkCondition;
-//   unsigned char fcuState;
-//   unsigned char fcuFaultLeve;
-// } ccuCmd;
-typedef struct ccuParamCmd
-{
-  unsigned char insBat1Hold;
-  unsigned char insBat2Hold;
-  unsigned char insBat3Hold;
-}ccuParamCmd;
+typedef struct {
+  unsigned char insSocHold1;
+  unsigned char insSocHold2;
+  unsigned char insSocHold3;
+  unsigned char fcuToInsLimit1;
+  unsigned char fcuToinsLimit2;
+  unsigned char powerSocHold1;
+  unsigned char powerSocHold2;
+  unsigned char powerSocHold3;
+  unsigned char fcuToPowerLimit1;
+  unsigned char fcuToPowerLimit2;
+}ccuSetParmCmd;
+
+typedef struct {
+  unsigned char workCondition;
+  unsigned char fcuCmd;
+  unsigned char fcuPowerEfficiency;
+  unsigned char fcuInsEfficiency;
+  unsigned char insBatCmd;
+  unsigned char powerBatCmd;
+  unsigned char powerBatEfficiency;
+  unsigned char heartbeat;
+  unsigned char masterState;
+}ccuColCmd;
 
 typedef struct disHighVolBusState
 {
@@ -263,13 +274,9 @@ typedef struct disLowBusCmd
   unsigned char emergencyLithiumBatteryGroup1CircuitBreaker;
 }disLowBusCmd;
 
-
 #pragma pack (0)
 
-
-
 //状态结构体定义
-
 typedef struct pmState
 {
   ccuState            ccustate;
@@ -338,52 +345,13 @@ typedef struct pmState
     /* data */
   } disBus4Breaker;
 
-
-enum disBreaker{
-    bus1_fuelCellCircuitBreaker,
-    bus1_powerLithiumBatteryCircuitBreaker,
-    bus1_propulsionMotorCircuitBreaker,
-    bus1_lithiumBatteryGroupInstrumentCircuitBreaker,
-    bus1_dcDc5ModuleCircuitBreaker,
-    bus1_bowHighVoltageDistributionBoxCircuitBreaker,
-    bus1_sternFTDevice45CircuitBreaker,
-    bus1_sternRudderSwitch1CircuitBreaker,
-    bus1_sternRudderSwitch2CircuitBreaker,
-    bus1_fbReservedCircuitBreaker,
-    bus1_tyzReservedCircuitBreaker,
-    bus1_reservedCircuitBreaker,
-    
-    bus2_bowFTDevice123CircuitBreaker,
-    bus2_actuatorCircuitBreaker,
-    bus2_mastSteeringGearControlBoxCircuitBreaker,
-    bus2_xczCircuitBreaker,
-    bus2_bowRudderControlBoxCircuitBreaker,
-    bus2_openWaterCoverStartCylinderCircuitBreaker,
-
-    bus3_lithiumBatteryGroupInstrumentCircuitBreaker,
-    bus3_bowLowVoltageDistributionBoxCircuitBreaker,
-    bus3_unit4InstrumentDC48VCircuitBreaker,
-    bus3_dcC1DCDistributionPanelCircuitBreaker,
-    bus3_reservedCircuitBreaker1,
-    bus3_reservedCircuitBreaker2,
-    bus3_emergencyLithiumBatteryGroup2CircuitBreaker,
-
-    bus4_unit1CircuitBreaker,
-    bus4_unit2CircuitBreaker,
-    bus4_unit3CircuitBreaker,
-    bus4_unit5CircuitBreaker,
-    bus4_bowPZDeviceCircuitBreaker,
-    bus4_reservedCircuitBreaker1,
-    bus4_reservedCircuitBreaker2
-};
-
-enum disBreakerOpt{
-  hold,
-  turn_off,
-  turn_on
-};
-
-
+  typedef struct disSysBreakerList
+  {
+    disBus1Breaker bus1Breaker;
+    disBus2Breaker bus2Breaker;
+    disBus3Breaker bus3Breaker;
+    disBus4Breaker bus4Breaker;
+  } disSysBreaker;
 
 
 #endif