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

src/pPowerManger/PowerManger.h

@@ -101,6 +101,16 @@ class PowerManger : public AppCastingMOOSApp
   
 
  protected: 
+ //===========================交互状态变量==================================
+ Driver m_driver;
+ pmState m_pmCurrentState; //能源系统的当前状态
+ disSysBreakerList m_currentDisBreakerState; //配电断路器状态
+ disSysBreakerList m_targetDisBreakerState;
+ DriverTable m_currentDriverState;
+ DriverTable m_MSDriverCmd;
+ DriverTable m_subDisSysCmd;
+ DriverTable m_subDisSysState;
+//===========================================================================
   //系统运行状态
   unsigned char workCondition;
   unsigned char currentMod;
@@ -109,7 +119,7 @@ class PowerManger : public AppCastingMOOSApp
   vector<unsigned int> faultCode;
   unsigned int soc;
   unsigned int sustainableTime;
-  pmState m_pmCurrentState; //能源系统的当前状态
+
 
   // 配电和CCU的反馈状态
   msg_CcuStateFbMsg       m_CcuCurrentState;
@@ -120,8 +130,6 @@ class PowerManger : public AppCastingMOOSApp
 
   //下位机操作函数
   //断路器状态
-  disSysBreakerList m_currentDisBreakerState;
-  disSysBreakerList m_targetDisBreakerState;
   ccuColCmd m_CcuColCmd;
   void disSysOption();
   void ccuOption();
@@ -146,8 +154,6 @@ class PowerManger : public AppCastingMOOSApp
   unsigned int  m_faultNum;
   unsigned int  m_ticker;
 
- 
-
  public: 
  //===========================状态机实现==============================================
   void printState(FSM_State st, string desp);