From 0bd66d916634004038e514e87ac584245a362278 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 11 Oct 2023 15:29:21 +0800 Subject: [PATCH] update --- components/zcancmder_module/zcan_eeprom_module.cpp | 3 +-- components/zcancmder_module/zcan_xy_robot_module.cpp | 8 -------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/components/zcancmder_module/zcan_eeprom_module.cpp b/components/zcancmder_module/zcan_eeprom_module.cpp index 19c8b38..58b8043 100644 --- a/components/zcancmder_module/zcan_eeprom_module.cpp +++ b/components/zcancmder_module/zcan_eeprom_module.cpp @@ -20,7 +20,6 @@ void ZCanEepromModule::onRceivePacket(CanPacketRxBuffer* rxcmd) { // static_assert(sizeof(*report) < sizeof(m_txbuf), "report size too large"); ZLOGI(TAG, "kcmd_eeprom_start_monitor_status exec_status:%d", status); - report->id = m_id; report->status = status; m_cancmder->sendStatusReport(cmdheader, (uint8_t*)report, sizeof(*report)); }); @@ -33,4 +32,4 @@ void ZCanEepromModule::onRceivePacket(CanPacketRxBuffer* rxcmd) { // PROCESS_PACKET(kcmd_eeprom_read_block, m_id) { errorcode = m_module->read(cmd->sector_index, cmd->sector_size, ack->ack); }; END_PP(); } -#endif \ No newline at end of file +#endif diff --git a/components/zcancmder_module/zcan_xy_robot_module.cpp b/components/zcancmder_module/zcan_xy_robot_module.cpp index cdc6ad9..a29392e 100644 --- a/components/zcancmder_module/zcan_xy_robot_module.cpp +++ b/components/zcancmder_module/zcan_xy_robot_module.cpp @@ -26,8 +26,6 @@ void ZCANXYRobotCtrlModule::onRceivePacket(CanPacketRxBuffer* rxcmd) { osDelay(5); // 用来保证回执消息在前面 kcmd_xy_robot_ctrl_move_to_zero_report_t report = {0}; ZLOGI(TAG, "kcmd_xy_robot_ctrl_move_to_zero exec_status:%d", status); - - report.id = m_id; report.exec_status = status; m_cancmder->sendExecStatusReport(cmdheader, (uint8_t*)&report, sizeof(report)); }); @@ -38,8 +36,6 @@ void ZCANXYRobotCtrlModule::onRceivePacket(CanPacketRxBuffer* rxcmd) { osDelay(5); // 用来保证回执消息在前面 kcmd_xy_robot_ctrl_move_to_zero_with_calibrate_report_t report = {0}; ZLOGI(TAG, "kcmd_xy_robot_ctrl_move_to_zero_with_calibrate exec_status:%d", status); - - report.id = m_id; report.exec_status = status; m_cancmder->sendExecStatusReport(cmdheader, (uint8_t*)&report, sizeof(report)); }); @@ -51,8 +47,6 @@ void ZCANXYRobotCtrlModule::onRceivePacket(CanPacketRxBuffer* rxcmd) { osDelay(5); // 用来保证回执消息在前面 kcmd_xy_robot_ctrl_move_to_report_t report = {0}; ZLOGI(TAG, "kcmd_xy_robot_ctrl_move_to exec_status:%d", status); - - report.id = m_id; report.exec_status = status; m_cancmder->sendExecStatusReport(cmdheader, (uint8_t*)&report, sizeof(report)); }); @@ -64,8 +58,6 @@ void ZCANXYRobotCtrlModule::onRceivePacket(CanPacketRxBuffer* rxcmd) { osDelay(5); // 用来保证回执消息在前面 kcmd_xy_robot_ctrl_move_by_report_t report = {0}; ZLOGI(TAG, "kcmd_xy_robot_ctrl_move_by exec_status:%d", status); - - report.id = m_id; report.exec_status = status; m_cancmder->sendExecStatusReport(cmdheader, (uint8_t*)&report, sizeof(report)); });