From 3a14a3cff88d130534457e25fb913431276d3215 Mon Sep 17 00:00:00 2001 From: zhaojingkui <1553836110@qq.com> Date: Thu, 22 May 2025 19:28:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=85=8D=E7=94=B5?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A0=A1=E9=AA=8C=E7=A0=81=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pPowerManger/CMakeLists.txt | 6 +- src/pPowerManger/LowerCommManager.cpp | 43 ++-- src/pPowerManger/LowerCommManager.h | 3 +- src/pPowerManger/PowerManger.cpp | 2 +- src/pPowerManger/PowerManger.h | 2 +- src/pPowerManger/fsm/PowerManagerFsm.cpp | 2 +- src/pPowerManger/fsm/PowerManagerFsm.hpp | 2 +- .../httpserver/batteryoperation.h | 0 src/pPowerManger/httpserver/dashboard.h | 2 +- src/pPowerManger/httpserver/data.h | 2 +- src/pPowerManger/httpserver/degubpage.h | 229 ++++++++++++------ src/pPowerManger/httpserver/httpserver.h | 2 +- src/pPowerManger/httpserver/index.h | 13 +- src/pPowerManger/{ => logc}/loguru.cpp | 0 src/pPowerManger/{ => logc}/loguru.hpp | 0 src/pPowerManger/main.cpp | 2 +- src/pPowerManger/sqlit3/SQLite.cpp | 2 +- src/pPowerManger/udpcomm/udpComm.cpp | 27 ++- src/pPowerManger/udpcomm/udpComm.h | 2 +- src/pPowerManger/upmsg/uDevice_depth.h | 2 +- src/pPowerManger/upmsg/uDevice_secdistState.h | 2 +- .../upmsg/uExternComm_setOpCondition.h | 2 +- .../upmsg/uExternComm_setOpMode.h | 2 +- .../upmsg/uExternComm_setPowerSystem.h | 2 +- src/pPowerManger/upmsg/uPlan_planStop.h | 2 +- src/pPowerManger/upmsg/uPlan_taskStart.h | 2 +- src/pPowerManger/upmsg/uPower_sysState.h | 2 +- 27 files changed, 227 insertions(+), 130 deletions(-) create mode 100644 src/pPowerManger/httpserver/batteryoperation.h rename src/pPowerManger/{ => logc}/loguru.cpp (100%) rename src/pPowerManger/{ => logc}/loguru.hpp (100%) diff --git a/src/pPowerManger/CMakeLists.txt b/src/pPowerManger/CMakeLists.txt index 33d36aa..9c9bf37 100644 --- a/src/pPowerManger/CMakeLists.txt +++ b/src/pPowerManger/CMakeLists.txt @@ -25,6 +25,9 @@ SET(HTTP_SRC httpserver/mongoose.c httpserver/httpserver.cpp) +SET(LOG_SRC + logc/loguru.cpp) + SET(UDP_COMM_SRC udpcomm/udpComm.cpp) @@ -50,6 +53,7 @@ SET(SRC ${SQLITE_SRC} ${HTTP_SRC} ${UDP_COMM_SRC} + ${LOG_SRC} PowerManger.cpp PowerManger_Info.cpp # udpComm.cpp @@ -58,7 +62,7 @@ SET(SRC driver.cpp LowerCommManager.cpp UpperCommManager.cpp - loguru.cpp + # loguru.cpp ) ADD_EXECUTABLE(pPowerManger ${SRC}) diff --git a/src/pPowerManger/LowerCommManager.cpp b/src/pPowerManger/LowerCommManager.cpp index b05fb92..16359d0 100644 --- a/src/pPowerManger/LowerCommManager.cpp +++ b/src/pPowerManger/LowerCommManager.cpp @@ -76,12 +76,11 @@ bool LowerCommManager::initUdpComm(){ return true; } void LowerCommManager::processPeriodicTasks() { - // sendCcuCommand(m_pm->m_CcuColCmd); + sendCcuCommand(m_pm->m_CcuColCmd); //延时5ms usleep(5000); // sendDisSysCommand(m_pm->m_targetDisBreakerState); m_udpComm->clearMsgQueue(); - } bool LowerCommManager::sendCcuCommand(const ccuColCmd cmd){ @@ -706,7 +705,7 @@ bool LowerCommManager::operate_LVA_mergencyLithiumBatteryGroup1Circuit_Breaker(c // 仪表母线断路器操作函数 bool LowerCommManager::operate_LV_lithiumBatteryGroupInstrumentCircuit_Breaker(char opt){ return operateBreakerGeneric( - "HV_fuelCellCircuit_Breaker", + "lithiumBatteryGroupInstrumentCircuitBreaker", opt, [&](disLowMainBusCmd& c){ c.lithiumBatteryGroupInstrumentCircuitBreaker = getBreakerOption(opt); }, [&](){ return m_pm->m_pmCurrentState.bus3State.lithiumBatteryGroupInstrumentCircuitBreaker; } @@ -714,7 +713,7 @@ bool LowerCommManager::operate_LV_lithiumBatteryGroupInstrumentCircuit_Breaker(c } bool LowerCommManager::operate_LV_bowLowVoltageDistributionBoxCircuit_Breaker(char opt){ return operateBreakerGeneric( - "HV_fuelCellCircuit_Breaker", + "bowLowVoltageDistributionBoxCircuitBreaker", opt, [&](disLowMainBusCmd& c){ c.bowLowVoltageDistributionBoxCircuitBreaker = getBreakerOption(opt); }, [&](){ return m_pm->m_pmCurrentState.bus3State.bowLowVoltageDistributionBoxCircuitBreaker; } @@ -722,7 +721,7 @@ bool LowerCommManager::operate_LV_bowLowVoltageDistributionBoxCircuit_Breaker(ch } bool LowerCommManager::operate_LV_unit4Dc48V_Breaker(char opt){ return operateBreakerGeneric( - "HV_fuelCellCircuit_Breaker", + "unit4InstrumentDC48VCircuitBreaker", opt, [&](disLowMainBusCmd& c){ c.unit4InstrumentDC48VCircuitBreaker = getBreakerOption(opt); }, [&](){ return m_pm->m_pmCurrentState.bus3State.unit4InstrumentDC48VCircuitBreaker; } @@ -730,7 +729,7 @@ bool LowerCommManager::operate_LV_unit4Dc48V_Breaker(char opt){ } bool LowerCommManager::operate_LV_dcC1Panel_Breaker(char opt){ return operateBreakerGeneric( - "HV_fuelCellCircuit_Breaker", + "dcC1DCDistributionPanelCircuitBreaker", opt, [&](disLowMainBusCmd& c){ c.dcC1DCDistributionPanelCircuitBreaker = getBreakerOption(opt); }, [&](){ return m_pm->m_pmCurrentState.bus3State.dcC1DCDistributionPanelCircuitBreaker; } @@ -738,7 +737,7 @@ bool LowerCommManager::operate_LV_dcC1Panel_Breaker(char opt){ } bool LowerCommManager::operate_LV_reservedCircuit1_Breaker(char opt){ return operateBreakerGeneric( - "HV_fuelCellCircuit_Breaker", + "reservedCircuitBreaker1", opt, [&](disLowMainBusCmd& c){ c.reservedCircuitBreaker1 = getBreakerOption(opt); }, [&](){ return m_pm->m_pmCurrentState.bus3State.reservedCircuitBreaker1; } @@ -746,7 +745,7 @@ bool LowerCommManager::operate_LV_reservedCircuit1_Breaker(char opt){ } bool LowerCommManager::operate_LV_reservedCircuit2_Breaker(char opt){ return operateBreakerGeneric( - "HV_fuelCellCircuit_Breaker", + "reservedCircuitBreaker2", opt, [&](disLowMainBusCmd& c){ c.reservedCircuitBreaker2 = getBreakerOption(opt); }, [&](){ return m_pm->m_pmCurrentState.bus3State.reservedCircuitBreaker2; } @@ -754,7 +753,7 @@ bool LowerCommManager::operate_LV_reservedCircuit2_Breaker(char opt){ } bool LowerCommManager::operate_LV_mergencyLithiumBatteryGroup2Circuit_Breaker(char opt){ return operateBreakerGeneric( - "HV_fuelCellCircuit_Breaker", + "emergencyLithiumBatteryGroup2CircuitBreaker", opt, [&](disLowMainBusCmd& c){ c.emergencyLithiumBatteryGroup2CircuitBreaker = getBreakerOption(opt); }, [&](){ return m_pm->m_pmCurrentState.bus3State.emergencyLithiumBatteryGroup2CircuitBreaker; } @@ -771,31 +770,37 @@ bool LowerCommManager::operateBreakerGeneric( ) { CmdT cmd{}; // 默认全零 double t0 = MOOSTime(); + bool ok = false; LOG_F(INFO, "operate %s: opt=%d", name, opt); // 第一次发包 fillCmd(cmd); m_udpComm->sendDisSysCmd(cmd); MOOSPause(100); - // 等待状态变更 - while ( readState() != getBreakerOption(opt) ) { + while ( !ok ) { + if( readState() == getBreakerOption(opt) ) + { + ok = true; + break; + } if (!m_udpComm->sendDisSysCmd(cmd)) { LOG_F(ERROR, "operate %s: sendDisSysCmd failed", name); - return false; + ok = false; + break; } - if (MOOSTime() > t0 + 5) { + if (MOOSTime() > t0 + 6) { LOG_F(ERROR, "operate %s: timeout", name); - return false; + ok = false; + break; } - MOOSPause(1000); + MOOSPause(200); } - - // 清零再发三次 + //继电器复位 CmdT clr{}; for (int i = 0; i < 3; ++i) { m_udpComm->sendDisSysCmd(clr); - MOOSPause(100); + MOOSPause(200); } - return true; + return ok; } diff --git a/src/pPowerManger/LowerCommManager.h b/src/pPowerManger/LowerCommManager.h index 6db155e..567dbff 100644 --- a/src/pPowerManger/LowerCommManager.h +++ b/src/pPowerManger/LowerCommManager.h @@ -80,7 +80,8 @@ public: bool operate_LVA_reservedCircuit1_Breaker(char opt); bool operate_LVA_reservedCircuit2_Breaker(char opt); bool operate_LVA_mergencyLithiumBatteryGroup1Circuit_Breaker(char opt); - //======================================================================================== + //================================复合管控器操作函数==================================== + bool operate_CCU_fcmod(char opt); // 发送CCU控制命令 bool sendCcuCommand(const ccuColCmd cmd); bool sendDisSysCommand(const disSysBreakerList& cmd); //已废弃，不同时操作多个继电器设备 diff --git a/src/pPowerManger/PowerManger.cpp b/src/pPowerManger/PowerManger.cpp index 4c43016..54466f0 100644 --- a/src/pPowerManger/PowerManger.cpp +++ b/src/pPowerManger/PowerManger.cpp @@ -9,7 +9,7 @@ #include "MBUtils.h" #include "ACTable.h" #include "PowerManger.h" -#include "loguru.hpp" +#include "logc/loguru.hpp" #include using namespace std; diff --git a/src/pPowerManger/PowerManger.h b/src/pPowerManger/PowerManger.h index 37ad451..9c7d0ec 100644 --- a/src/pPowerManger/PowerManger.h +++ b/src/pPowerManger/PowerManger.h @@ -21,7 +21,7 @@ #define JSON_USE_EXCEPTION 1 #include -#include "loguru.hpp" +#include "logc/loguru.hpp" #include "MOOS/libMOOS/Thirdparty/AppCasting/AppCastingMOOSApp.h" #include "MOOS/libMOOS/Utils/MOOSThread.h" #include "MOOS/libMOOS/Utils/MOOSUtilityFunctions.h" diff --git a/src/pPowerManger/fsm/PowerManagerFsm.cpp b/src/pPowerManger/fsm/PowerManagerFsm.cpp index ebfaba1..e12acf0 100644 --- a/src/pPowerManger/fsm/PowerManagerFsm.cpp +++ b/src/pPowerManger/fsm/PowerManagerFsm.cpp @@ -1,6 +1,6 @@ #include "PowerManagerFsm.hpp" #include "../PowerManger.h" -#include "../loguru.hpp" +#include "../logc/loguru.hpp" #include #include "MOOS/libMOOS/Utils/MOOSUtilityFunctions.h" #include "../faultCode.h" diff --git a/src/pPowerManger/fsm/PowerManagerFsm.hpp b/src/pPowerManger/fsm/PowerManagerFsm.hpp index 2f5223c..e506d6b 100644 --- a/src/pPowerManger/fsm/PowerManagerFsm.hpp +++ b/src/pPowerManger/fsm/PowerManagerFsm.hpp @@ -1,7 +1,7 @@ #ifndef POWER_MANAGER_FSM_HPP #define POWER_MANAGER_FSM_HPP #include "tinyfsm.hpp" -#include "../loguru.hpp" +#include "../logc/loguru.hpp" #include #include // 新增头文件 #include // 新增头文件 diff --git a/src/pPowerManger/httpserver/batteryoperation.h b/src/pPowerManger/httpserver/batteryoperation.h new file mode 100644 index 0000000..e69de29 diff --git a/src/pPowerManger/httpserver/dashboard.h b/src/pPowerManger/httpserver/dashboard.h index 387167c..d96d307 100644 --- a/src/pPowerManger/httpserver/dashboard.h +++ b/src/pPowerManger/httpserver/dashboard.h @@ -484,7 +484,7 @@ function sendCommand(type, id, action, value) { // 启动5秒计时器 if (timerEl) { - let seconds = 6; + let seconds = 8; timerEl.textContent = `等待反馈: ${seconds}秒`; timer = setInterval(() => { seconds--; diff --git a/src/pPowerManger/httpserver/data.h b/src/pPowerManger/httpserver/data.h index 8ff9715..f3324d9 100644 --- a/src/pPowerManger/httpserver/data.h +++ b/src/pPowerManger/httpserver/data.h @@ -589,7 +589,7 @@ const std::string DATA_HTML = R"( 正在加载...
- 仪表汇流排绝缘状态: + 仪表母线排绝缘状态: 正在加载...
diff --git a/src/pPowerManger/httpserver/degubpage.h b/src/pPowerManger/httpserver/degubpage.h index bf2a1b5..d3e0292 100644 --- a/src/pPowerManger/httpserver/degubpage.h +++ b/src/pPowerManger/httpserver/degubpage.h @@ -166,19 +166,72 @@ body { margin-bottom: 8px; } -.data-table { +.message-cards { + display: grid; + grid-template-columns: 1fr; + gap: 12px; + margin-top: 16px; + max-width: 600px; + padding: 0 16px; +} + +.message-card { width: 100%; - border-collapse: collapse; + box-sizing: border-box; } -.data-table th, .data-table td { - padding: 8px 12px; +.message-card { + background: white; border: 1px solid #e5e7eb; - text-align: left; + border-radius: 8px; + overflow: hidden; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); } -.data-table th { - background-color: #f3f4f6; +.card-header { + padding: 12px 16px; + background: #f3f4f6; + border-bottom: 1px solid #e5e7eb; + font-weight: 600; + cursor: pointer; + display: flex; + justify-content: space-between; + align-items: center; +} + +.card-header:hover { + background: #e5e7eb; +} + +.card-content { + padding: 16px; +} + +.card-content pre { + margin: 0; + white-space: pre-wrap; + font-family: monospace; + max-height: 150px; + overflow: hidden; + transition: max-height 0.3s ease; +} + +.card-content pre.expanded { + max-height: none; +} + +.toggle-button { + background: none; + border: none; + color: #2563eb; + cursor: pointer; + font-size: 0.9em; + padding: 4px 8px; + border-radius: 4px; +} + +.toggle-button:hover { + background: rgba(37, 99, 235, 0.1); } .raw-data { @@ -239,32 +292,16 @@ body {
订阅消息
- - - - - - - - - - -
消息名称消息内容
+
+ +
发布消息
- - - - - - - - - - -
消息名称消息内容
+
+ +
@@ -296,49 +333,61 @@ function initWebSocket() { // 更新订阅消息表格 const subscribeTable = document.getElementById('subscribeDataTable'); - subscribeTable.innerHTML = ''; - if (data.debug) { - const subscribeMessages = [ - 'm_secdistStateMsg_fb_debug', - 'm_equStateMsg_cmd_debug', - 'm_depthMsg_st_debug', - 'm_setOpConditionMsg_st_debug', - 'm_setOpModeMsg_st_debug', - 'm_taskStartMsg_st_debug', - 'm_taskStopMsg_st_debug', - 'm_setDevSwitchMsg_st_debug', - 'm_setPMSysMsg_st_debug', - 'm_sysStateMsg_st_debug' - ]; - - subscribeMessages.forEach(msg => { - if (data.debug[msg]) { + const subscribeMessages = [ + 'm_secdistStateMsg_fb_debug', + 'm_equStateMsg_cmd_debug', + 'm_depthMsg_st_debug', + 'm_setOpConditionMsg_st_debug', + 'm_setOpModeMsg_st_debug', + 'm_taskStartMsg_st_debug', + 'm_taskStopMsg_st_debug', + 'm_setDevSwitchMsg_st_debug', + 'm_setPMSysMsg_st_debug', + 'm_sysStateMsg_st_debug' + ]; + + subscribeMessages.forEach(msg => { + if (data.debug && data.debug[msg] && data.debug[msg].name) { + const msgName = data.debug[msg].name; + const existingCard = Array.from(subscribeTable.children).find(card => + card.querySelector('.card-header').textContent === msgName + ); + + if (existingCard) { + existingCard.querySelector('pre').textContent = formatJsonContent(data.debug[msg].content || '无内容'); + } else if (msgName !== '未知消息') { addDebugRow(subscribeTable, data.debug[msg]); } - }); - } + } + }); // 更新发布消息表格 const publishTable = document.getElementById('publishDataTable'); - publishTable.innerHTML = ''; - if (data.debug) { - const publishMessages = [ - 'm_equInsStateMsg_fb_degub', - 'm_secdistStateMsg_cmd_debug', - 'm_equStateMsg_fb_debug', - 'm_disSysStateMsg_st_debug', - 'm_currentStateMsg_st_debug', - 'm_pmStateMsg_fb_debug', - 'm_fcsStateMsg_st_debug', - 'm_liBatStateMsg_st_debug' - ]; - - publishMessages.forEach(msg => { - if (data.debug[msg]) { + const publishMessages = [ + 'm_equInsStateMsg_fb_degub', + 'm_secdistStateMsg_cmd_debug', + 'm_equStateMsg_fb_debug', + 'm_disSysStateMsg_st_debug', + 'm_currentStateMsg_st_debug', + 'm_pmStateMsg_fb_debug', + 'm_fcsStateMsg_st_debug', + 'm_liBatStateMsg_st_debug' + ]; + + publishMessages.forEach(msg => { + if (data.debug && data.debug[msg] && data.debug[msg].name) { + const msgName = data.debug[msg].name; + const existingCard = Array.from(publishTable.children).find(card => + card.querySelector('.card-header').textContent === msgName + ); + + if (existingCard) { + existingCard.querySelector('pre').textContent = formatJsonContent(data.debug[msg].content || '无内容'); + } else if (msgName !== '未知消息') { addDebugRow(publishTable, data.debug[msg]); } - }); - } + } + }); } catch (e) { console.error('解析调试数据出错:', e); @@ -362,18 +411,50 @@ function updateStatus(status) { document.getElementById('wsStatus').textContent = status; } -function addDebugRow(table, msgObj) { - const row = document.createElement('tr'); +function formatJsonContent(content) { + try { + const parsed = JSON.parse(content); + return JSON.stringify(parsed, null, 2); + } catch (e) { + return content; + } +} + +function addDebugRow(container, msgObj) { + const card = document.createElement('div'); + card.className = 'message-card'; - const nameCell = document.createElement('td'); - nameCell.textContent = msgObj.name || '未知消息'; - row.appendChild(nameCell); + const header = document.createElement('div'); + header.className = 'card-header'; + header.textContent = msgObj.name || '未知消息'; - const valueCell = document.createElement('td'); - valueCell.textContent = msgObj.content || '无内容'; - row.appendChild(valueCell); + const content = document.createElement('div'); + content.className = 'card-content'; - table.appendChild(row); + const pre = document.createElement('pre'); + pre.textContent = formatJsonContent(msgObj.content || '无内容'); + + const toggleBtn = document.createElement('button'); + toggleBtn.className = 'toggle-button'; + toggleBtn.textContent = '展开'; + toggleBtn.onclick = function(e) { + e.stopPropagation(); + pre.classList.toggle('expanded'); + this.textContent = pre.classList.contains('expanded') ? '收起' : '展开'; + }; + + header.onclick = function(e) { + if(e.target !== toggleBtn) { + pre.classList.toggle('expanded'); + toggleBtn.textContent = pre.classList.contains('expanded') ? '收起' : '展开'; + } + }; + + content.appendChild(pre); + content.appendChild(toggleBtn); + card.appendChild(header); + card.appendChild(content); + container.appendChild(card); } window.addEventListener('load', initWebSocket); diff --git a/src/pPowerManger/httpserver/httpserver.h b/src/pPowerManger/httpserver/httpserver.h index 80cc8fc..9a81512 100644 --- a/src/pPowerManger/httpserver/httpserver.h +++ b/src/pPowerManger/httpserver/httpserver.h @@ -2,7 +2,7 @@ #define HTTP_SERVER_H #include "MOOS/libMOOS/Utils/MOOSThread.h" #include "mongoose.h" -#include "../loguru.hpp" +#include "../logc/loguru.hpp" #include "../systemData.h" #include #include diff --git a/src/pPowerManger/httpserver/index.h b/src/pPowerManger/httpserver/index.h index bf082f4..f227f45 100644 --- a/src/pPowerManger/httpserver/index.h +++ b/src/pPowerManger/httpserver/index.h @@ -147,14 +147,14 @@ body { .data-panel { background: white; border-radius: 4px; - padding: 6px; + padding: 20px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); height: calc(100vh - var(--header-height) + 3px); overflow: auto; } .panel-title { - font-size: 1rem; + font-size: 1.2rem; font-weight: 600; color: #1a1a1a; margin-bottom: 8px; @@ -168,8 +168,9 @@ body { justify-content: center; height: calc(100% - 2rem); color: #6b7280; - font-size: 1rem; - margin-top: 8px; + font-size: 1.1rem; + margin-top: 24px; + padding: 0 20px; } @media (max-width: 768px) { @@ -214,6 +215,10 @@ body { 🧪 测试页面 + + 🐞 + 调试页面 +
diff --git a/src/pPowerManger/loguru.cpp b/src/pPowerManger/logc/loguru.cpp similarity index 100% rename from src/pPowerManger/loguru.cpp rename to src/pPowerManger/logc/loguru.cpp diff --git a/src/pPowerManger/loguru.hpp b/src/pPowerManger/logc/loguru.hpp similarity index 100% rename from src/pPowerManger/loguru.hpp rename to src/pPowerManger/logc/loguru.hpp diff --git a/src/pPowerManger/main.cpp b/src/pPowerManger/main.cpp index 19dacf3..5f11674 100644 --- a/src/pPowerManger/main.cpp +++ b/src/pPowerManger/main.cpp @@ -10,7 +10,7 @@ #include "ColorParse.h" #include "PowerManger.h" #include "PowerManger_Info.h" -#include "loguru.hpp" +#include "logc/loguru.hpp" using namespace std; diff --git a/src/pPowerManger/sqlit3/SQLite.cpp b/src/pPowerManger/sqlit3/SQLite.cpp index 6dc18c6..9397577 100644 --- a/src/pPowerManger/sqlit3/SQLite.cpp +++ b/src/pPowerManger/sqlit3/SQLite.cpp @@ -1,7 +1,7 @@ #include "SQLite.h" #include #include -#include "../loguru.hpp" +#include "../logc/loguru.hpp" SQLite::SQLite(const std::string& dbPath) { diff --git a/src/pPowerManger/udpcomm/udpComm.cpp b/src/pPowerManger/udpcomm/udpComm.cpp index bb0885c..3636d5d 100644 --- a/src/pPowerManger/udpcomm/udpComm.cpp +++ b/src/pPowerManger/udpcomm/udpComm.cpp @@ -391,7 +391,7 @@ bool udpComm::popMsgFormQueue(double &time,msg_disLowBusFbMsg &m) bool udpComm::sendDisSysCmd(const disHighVolBusCmd cmd) { unsigned char* msgBuf; - Checksum cc; + cChecksum cc; msg_disHVBCmd* msg = new msg_disHVBCmd; msg->header.id = DIS_HVBUS_CMD_ID; msg->header.start1 = DIS_MSG_HEAD1; @@ -401,9 +401,8 @@ bool udpComm::sendDisSysCmd(const disHighVolBusCmd cmd) // msg->header.length = sizeof(disHighVolBusCmd); msg->data = cmd; msgBuf = reinterpret_cast(msg); - cc = calculateChecksum(msgBuf,sizeof(msg_disHVBCmd)); - msg->checkCode = static_cast(cc & 0xFF); - // std::cout << (int)sizeof(msg_disHVBCmd) << endl; + cc = calculateChecksum(msgBuf,sizeof(msg_disHVBCmd),sizeof(cChecksum)); + msg->checkCode = cc; try { sendMsg(msgBuf,sizeof(msg_disHVBCmd)); @@ -419,7 +418,7 @@ bool udpComm::sendDisSysCmd(const disHighVolBusCmd cmd) bool udpComm::sendDisSysCmd(const disHighAVolBusCmd cmd) { unsigned char* msgBuf; - Checksum cc; + cChecksum cc; msg_disHVBACmd* msg = new msg_disHVBACmd; msg->header.id = DIS_HVBUSA_CMD_ID; msg->header.start1 = DIS_MSG_HEAD1; @@ -429,8 +428,8 @@ bool udpComm::sendDisSysCmd(const disHighAVolBusCmd cmd) // msg->header.length = sizeof(disHighAVolBusCmd); msg->data = cmd; msgBuf = reinterpret_cast(msg); - cc = calculateChecksum(msgBuf,sizeof(msg_disHVBACmd)); - msg->checkCode = static_cast(cc & 0xFF); + cc = calculateChecksum(msgBuf,sizeof(msg_disHVBACmd),sizeof(cChecksum)); + msg->checkCode = cc; try { sendMsg(msgBuf,sizeof(msg_disHVBACmd)); @@ -446,7 +445,7 @@ bool udpComm::sendDisSysCmd(const disHighAVolBusCmd cmd) bool udpComm::sendDisSysCmd(const disHighBVolBusCmd cmd) { unsigned char* msgBuf; - Checksum cc; + cChecksum cc; msg_disHVBBCmd* msg = new msg_disHVBBCmd; msg->header.id = DIS_HVBUSB_CMD_ID; msg->header.start1 = DIS_MSG_HEAD1; @@ -456,8 +455,8 @@ bool udpComm::sendDisSysCmd(const disHighBVolBusCmd cmd) // msg->header.length = sizeof(disHighBVolBusCmd); msg->data = cmd; msgBuf = reinterpret_cast(msg); - cc = calculateChecksum(msgBuf,sizeof(msg_disHVBBCmd)); - msg->checkCode = static_cast(cc & 0xFF); + cc = calculateChecksum(msgBuf,sizeof(msg_disHVBBCmd),sizeof(cChecksum)); + msg->checkCode = cc; try { // cout << "=========" <<(int)sizeof(msg_disHVBBCmd) << endl; @@ -474,7 +473,7 @@ bool udpComm::sendDisSysCmd(const disHighBVolBusCmd cmd) bool udpComm::sendDisSysCmd(const disLowBusCmd cmd) { unsigned char* msgBuf; - Checksum cc; + cChecksum cc; msg_disLVBCmd* msg = new msg_disLVBCmd; msg->header.id = DIS_LVBUS_CMD_ID; msg->header.start1 = DIS_MSG_HEAD1; @@ -484,8 +483,10 @@ bool udpComm::sendDisSysCmd(const disLowBusCmd cmd) // msg->header.length = sizeof(disLowBusCmd); msg->data = cmd; msgBuf = reinterpret_cast(msg); - cc = calculateChecksum(msgBuf,sizeof(msg_disLVBCmd)); - msg->checkCode = static_cast(cc & 0xFF); + cc = calculateChecksum(msgBuf,sizeof(msg_disLVBCmd),sizeof(cChecksum)); + // msg->checkCode = static_cast(cc & 0xFF); + msg->checkCode = cc; + cout << "cc======disLowBusCmd=============================" << (int) msg->checkCode << endl; try { sendMsg(msgBuf,sizeof(msg_disLVBCmd)); diff --git a/src/pPowerManger/udpcomm/udpComm.h b/src/pPowerManger/udpcomm/udpComm.h index 89803fd..01edaa4 100644 --- a/src/pPowerManger/udpcomm/udpComm.h +++ b/src/pPowerManger/udpcomm/udpComm.h @@ -13,7 +13,7 @@ #include #include #include -#include "../loguru.hpp" +#include "../logc/loguru.hpp" using namespace std; #define QUENUE_SIZE 100 diff --git a/src/pPowerManger/upmsg/uDevice_depth.h b/src/pPowerManger/upmsg/uDevice_depth.h index fc773f0..e5cae58 100644 --- a/src/pPowerManger/upmsg/uDevice_depth.h +++ b/src/pPowerManger/upmsg/uDevice_depth.h @@ -2,7 +2,7 @@ #ifndef UDEVICE_DEPTH_ST_H #define UDEVICE_DEPTH_ST_H #include -#include "../loguru.hpp" +#include "../logc/loguru.hpp" #define DB_TO_PM_DEEPTH "uDevice_depth_st" class uDevice_depthMsg { diff --git a/src/pPowerManger/upmsg/uDevice_secdistState.h b/src/pPowerManger/upmsg/uDevice_secdistState.h index 3d90ff3..057765a 100644 --- a/src/pPowerManger/upmsg/uDevice_secdistState.h +++ b/src/pPowerManger/upmsg/uDevice_secdistState.h @@ -3,7 +3,7 @@ #include #include #include "../driver.h" -#include "../loguru.hpp" +#include "../logc/loguru.hpp" class uDevice_secdistStateMsg { diff --git a/src/pPowerManger/upmsg/uExternComm_setOpCondition.h b/src/pPowerManger/upmsg/uExternComm_setOpCondition.h index dfdb5ba..dc17045 100644 --- a/src/pPowerManger/upmsg/uExternComm_setOpCondition.h +++ b/src/pPowerManger/upmsg/uExternComm_setOpCondition.h @@ -1,7 +1,7 @@ #ifndef UEXTERCOMM_SETOPCONDITION_CMD_H #define UEXTERCOMM_SETOPCONDITION_CMD_H #include -#include "../loguru.hpp" +#include "../logc/loguru.hpp" #include "json/json.h" //外部通信消息 #define DB_TO_PM_SETOPCONDITION "uExternComm_setOpCondition_cmd" diff --git a/src/pPowerManger/upmsg/uExternComm_setOpMode.h b/src/pPowerManger/upmsg/uExternComm_setOpMode.h index 4c58701..c7fe7b0 100644 --- a/src/pPowerManger/upmsg/uExternComm_setOpMode.h +++ b/src/pPowerManger/upmsg/uExternComm_setOpMode.h @@ -1,7 +1,7 @@ #ifndef UEXTERCOMM_SETOPMODE_CMD_H #define UEXTERCOMM_SETOPMODE_CMD_H #include -#include "../loguru.hpp" +#include "../logc/loguru.hpp" //外部通信消息 #define DB_TO_PM_SETOPMODE "uExternComm_setOpMode_cmd" diff --git a/src/pPowerManger/upmsg/uExternComm_setPowerSystem.h b/src/pPowerManger/upmsg/uExternComm_setPowerSystem.h index a6ced49..84d43a3 100644 --- a/src/pPowerManger/upmsg/uExternComm_setPowerSystem.h +++ b/src/pPowerManger/upmsg/uExternComm_setPowerSystem.h @@ -1,7 +1,7 @@ #ifndef UEXTERNCONM_SETPMSYS_H #define UEXTERNCONM_SETPMSYS_H #include -#include "../loguru.hpp" +#include "../logc/loguru.hpp" #define DB_TO_PM_SETPMSYS "uExternComm_setPowerSystem_cmd" class uExternComm_setPowerSystemMsg { diff --git a/src/pPowerManger/upmsg/uPlan_planStop.h b/src/pPowerManger/upmsg/uPlan_planStop.h index 9defc3c..6a29e7a 100644 --- a/src/pPowerManger/upmsg/uPlan_planStop.h +++ b/src/pPowerManger/upmsg/uPlan_planStop.h @@ -1,7 +1,7 @@ #ifndef UPLAN_PLANSTOP_CMD_H #define UPLAN_PLANSTOP_CMD_H #include -#include "../loguru.hpp" +#include "../logc/loguru.hpp" #define DB_TO_PM_TASKSTOP "uPlan_planStop_cmd" class uPlan_planStopMsg { diff --git a/src/pPowerManger/upmsg/uPlan_taskStart.h b/src/pPowerManger/upmsg/uPlan_taskStart.h index 8a87c02..cda2a71 100644 --- a/src/pPowerManger/upmsg/uPlan_taskStart.h +++ b/src/pPowerManger/upmsg/uPlan_taskStart.h @@ -2,7 +2,7 @@ #define UPPERCOMMMANAGER_H #include #include "../pmSysvariable.h" -#include "../loguru.hpp" +#include "../logc/loguru.hpp" //决策消息 #define DB_TO_PM_MISSION "uPlan_taskStart_cmd" diff --git a/src/pPowerManger/upmsg/uPower_sysState.h b/src/pPowerManger/upmsg/uPower_sysState.h index 425c4c8..4b8ff8d 100644 --- a/src/pPowerManger/upmsg/uPower_sysState.h +++ b/src/pPowerManger/upmsg/uPower_sysState.h @@ -4,7 +4,7 @@ #include "string" #include "json/json.h" #include -#include "../loguru.hpp" +#include "../logc/loguru.hpp" class uPower_sysStateMsg { private: