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]);