From 1c3c817bcd7e8a61b8a32105505ca5b1c763966d Mon Sep 17 00:00:00 2001 From: Alvin-lyq <2601685812@qq.com> Date: Tue, 9 Sep 2025 11:08:58 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=20=E8=A1=8C=E8=B5=B0=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8CAN=E6=8A=A5=E6=96=87ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mc/include/mc/can_struct.h | 2 +- src/mqtt_report/src/mqtt_report.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mc/include/mc/can_struct.h b/src/mc/include/mc/can_struct.h index 08cd832..092af32 100644 --- a/src/mc/include/mc/can_struct.h +++ b/src/mc/include/mc/can_struct.h @@ -64,7 +64,7 @@ struct can_MCU_cmd can_MCU_cmd_union data; // 根据报文信息ID (0x0CF1011E，其中011E的01改为设备ID) - static constexpr uint32_t CMD_ID = 0x0CF1011E; + static constexpr uint32_t CMD_ID = 0x0CF1051E; static constexpr bool EXT_FLAG = true; static constexpr bool RTR_FLAG = false; diff --git a/src/mqtt_report/src/mqtt_report.cpp b/src/mqtt_report/src/mqtt_report.cpp index b2b3863..0cf7f75 100644 --- a/src/mqtt_report/src/mqtt_report.cpp +++ b/src/mqtt_report/src/mqtt_report.cpp @@ -54,7 +54,7 @@ void Msg_Handler(const sweeperMsg::CanFrame::SharedPtr msg) } // MCU_Status_1 和 MCU_Fault（基础ID：0x0CF11E00，叠加设备ID） - case 0x0CF11E00: + case 0x0CF11E05: { // 解析电机实际转速（data[0]：低字节，data[1]：高字节） uint16_t raw_speed = (static_cast(msg->data[1]) << 8) | msg->data[0]; @@ -93,7 +93,7 @@ void Msg_Handler(const sweeperMsg::CanFrame::SharedPtr msg) } // MCU_Status_2（基础ID：0x0CF11F00，叠加设备ID） - case 0x0CF11F00: + case 0x0CF11F05: { // 解析控制器温度（data[2]，偏移量40℃，1℃/bit） int raw_ctrl_temp = static_cast(msg->data[2]);