From eb739c10f2971294ee3a12e845e9bfb4cb40f32d Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 12 May 2024 11:09:56 +0800 Subject: [PATCH] update --- iflytop_canbus_protocol.hpp | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/iflytop_canbus_protocol.hpp b/iflytop_canbus_protocol.hpp index 9459dc8..c456742 100644 --- a/iflytop_canbus_protocol.hpp +++ b/iflytop_canbus_protocol.hpp @@ -138,6 +138,7 @@ static inline const char *ErrorCodeToString(uint32_t code) { return "subdevice_offline"; case kerr_function_not_support: return "function_not_support"; + case kerr_motor_reset_error: return "motor_reset_error"; case kerr_motor_subdevice_offline: @@ -164,7 +165,7 @@ typedef enum { * 板子基本操作 * ***********************************************************************************************************************/ kcmd_read_board_info = 1, // cmd:no, ack:ack_read_board_info_data_t - kcmd_force_report = 2, // cmd:no, ack:none + kcmd_force_report = 2, // cmd:no, ack:none //!delete kcmd_read_sysinfo = 3, // cmd:no, ack:ack_sysinfo_t kcmd_read_taskinfo = 4, // cmd:taskoff, ack:ask_taskinfo_t kcmd_heart_ping = 5, // cmd:pingindex, ack:ask_taskinfo_t @@ -215,11 +216,9 @@ typedef enum { /*********************************************************************************************************************** * 压力传感器数据上报 * ***********************************************************************************************************************/ - kcmd_pressure_sensor_bus_read_data = 400, // cmd:subid ack:pressure(0.1pa) -#if 0 + kcmd_pressure_sensor_bus_read_data = 400, // cmd:subid ack:pressure(0.1pa) kcmd_pressure_sensor_bus_set_report_period_ms = 401, // cmd:period kreport_pressure_data = 450, // report:subid pressure(0.1pa) -#endif /*********************************************************************************************************************** * MINI_PWM风机控制 * @@ -258,15 +257,21 @@ typedef enum { kcmd_h2o2_sensor_read_sub_ic_reg = 702, // cmd:subid,reg,num ack:errorcode kreport_h2o2_sensor_data = 750, // report:subid h2o2_sensor_data -#if 0 - /*********************************************************************************************************************** * 报警指示灯控制 * ***********************************************************************************************************************/ - kcmd_triple_warning_light_ctl = 200, // cmd: r,g,b,warning + kcmd_triple_warning_light_ctl = 800, // cmd: r,g,b,warning + /*********************************************************************************************************************** + * 水浸传感器 * + ***********************************************************************************************************************/ + kcmd_evaporation_bin_water_sensor_read_state = 900, // cmd: state + kcmd_device_bottom_water_sensor_read_state = 901, // cmd: state + kreport_evaporation_bin_water_sensor = 950, // report:state //蒸发仓水浸 //report_evaporation_bin_water_sensor_data_t + kreport_device_bottom_water_sensor = 951, // report:state //设备底部水浸 //report_device_bottom_water_sensor_data +#if 0 /*********************************************************************************************************************** * H2O2传感器数值上报 * ***********************************************************************************************************************/ @@ -423,4 +428,17 @@ typedef struct { uint16_t saturation; // %RS * 10 } report_h2o2_data_t; +typedef struct { + uint16_t temperature; // 0.01 +} report_heater_temperature_data_t; + +typedef struct { + uint16_t subid; // 0->100 + uint16_t valve_state; // 0->100 +} report_proportional_valve_value_data_t; + +typedef struct { + uint16_t state; +} report_water_sensor_state_t; + #pragma pack()