完善了显示,修改了复合管控的通信协议
This commit is contained in:
@@ -3,16 +3,27 @@
|
||||
#include "driver.h"
|
||||
#include "fsm/PowerManagerFsm.hpp"
|
||||
|
||||
UpperCommManager::UpperCommManager(PowerManger* pm) : m_pm(pm) {
|
||||
// 初始化消息对象
|
||||
m_secdistStateMsg = uDevice_secdistStateMsg();
|
||||
m_setOpConditionMsg = uExternComm_setOpConditionMsg();
|
||||
m_depthMsg = uDevice_depthMsg();
|
||||
m_taskStartMsg = uPlan_taskStartMsg();
|
||||
m_equInsStateMsg = uPower_equInsStateMsg();
|
||||
m_equStateMsg = uPower_equStateMsg();
|
||||
m_setPMSysMsg = uExternComm_setPowerSystemMsg();
|
||||
};
|
||||
UpperCommManager::UpperCommManager(PowerManger* pm) :
|
||||
m_pm(pm),
|
||||
m_secdistStateMsg(),
|
||||
m_setOpConditionMsg(),
|
||||
m_depthMsg(),
|
||||
m_taskStartMsg(),
|
||||
m_equInsStateMsg(),
|
||||
m_equStateMsg(),
|
||||
m_setPMSysMsg(),
|
||||
m_disSysStateMsg(),
|
||||
m_currentStateMsg(),
|
||||
m_pmStateMsg(),
|
||||
m_fcsStateMsg(),
|
||||
m_liBatStateMsg(),
|
||||
m_setOpModeMsg(),
|
||||
m_taskStopMsg(),
|
||||
m_setDevSwitchMsg(),
|
||||
m_sysStateMsg(),
|
||||
m_msCmd(),
|
||||
m_driver() {
|
||||
}
|
||||
|
||||
bool UpperCommManager::processUpperMsg(const string& key, const string& strJson) {
|
||||
if (key == m_sysStateMsg.key)
|
||||
@@ -190,4 +201,4 @@ void UpperCommManager::buildSystemReport() {
|
||||
m_disSysStateMsg_st_debug = std::make_pair(m_disSysStateMsg.key, m_disSysStateMsg.buildMsg(*(m_pm->m_systemData),m_pm->m_currentDisBreakerState));
|
||||
m_currentStateMsg_st_debug = std::make_pair(m_currentStateMsg.key, m_currentStateMsg.buildMsg(m_pm->m_pmCurrentState));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user