diff --git a/iflytop_canbus_protocol.hpp b/iflytop_canbus_protocol.hpp index 2d935d4..7b783aa 100644 --- a/iflytop_canbus_protocol.hpp +++ b/iflytop_canbus_protocol.hpp @@ -1,7 +1,7 @@ #pragma once #include -#define PROTOCOL_VERSION 5 +#define PROTOCOL_VERSION 6 #define HEART_OVERTIME (30 * 1000) #pragma pack(1) @@ -212,7 +212,7 @@ typedef enum { /*********************************************************************************************************************** * 压力传感器数据上报 * ***********************************************************************************************************************/ - kcmd_pressure_sensor_bus_read_data = 400, // cmd:subid ack:pressure(0.1pa) + kcmd_pressure_sensor_bus_read_data = 400, // cmd:subid ack:pressure(0.1pa) #if 0 kcmd_pressure_sensor_bus_set_report_period_ms = 401, // cmd:period kreport_pressure_data = 450, // report:subid pressure(0.1pa) @@ -250,7 +250,7 @@ typedef enum { /*********************************************************************************************************************** * H2O2传感器数值上报 * ***********************************************************************************************************************/ - kreport_h2o2_sensor_data = 750, // report:subid h2o2_sensor_data + kreport_h2o2_sensor_data = 750, // report:subid h2o2_sensor_data #if 0 @@ -394,10 +394,11 @@ typedef struct { } report_heatpacket_data_t; typedef struct { - uint16_t subid; uint32_t ecode; + uint16_t subid; } report_exeception_data_t; +#if 0 typedef struct { uint8_t sensorDataNum; struct { @@ -405,6 +406,7 @@ typedef struct { int16_t pressureVal; } data[]; } report_pressure_data_t; +#endif typedef struct { uint16_t subid; @@ -414,33 +416,4 @@ typedef struct { uint16_t saturation; // %RS * 100 } report_h2o2_data_t; -typedef struct { - uint16_t temperature; // 0.01 -} report_heater_temperature_data_t; - -typedef struct { - uint16_t electric_current; // ma -} report_heater_electric_current_data_t; - -typedef struct { - uint16_t electric_current; // ma -} report_blower_electric_current_data_t; - -typedef struct { - uint16_t electric_current; // ma -} report_airCompressor_electric_current_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_evaporation_bin_water_sensor_data_t; - -typedef struct { - uint16_t state; -} report_device_bottom_water_sensor_data_t; - #pragma pack()