diff --git a/iflytop_canbus_protocol.hpp b/iflytop_canbus_protocol.hpp index 7b783aa..3211cbd 100644 --- a/iflytop_canbus_protocol.hpp +++ b/iflytop_canbus_protocol.hpp @@ -250,7 +250,10 @@ typedef enum { /*********************************************************************************************************************** * H2O2传感器数值上报 * ***********************************************************************************************************************/ - kreport_h2o2_sensor_data = 750, // report:subid h2o2_sensor_data + kcmd_h2o2_sensor_read_calibration_date = 700, // cmd:subid ack:year,month,day + kcmd_h2o2_sensor_read_sub_ic_errorcode = 701, // cmd:subid ack:errorcode + 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 @@ -409,11 +412,12 @@ typedef struct { #endif typedef struct { - uint16_t subid; - uint16_t h2o2; // ppm - uint16_t humid; // %RH * 100 - uint16_t temp; // °C * 100 - uint16_t saturation; // %RS * 100 + uint8_t subid; // 传感器子编号,当且仅当板子上有多个传感器时使用 + uint8_t sensor_error; // 传感器异常 + uint16_t h2o2; // ppm * 10 + uint16_t humid; // %RH * 10 + uint16_t temp; // °C * 10 + uint16_t saturation; // %RS * 10 } report_h2o2_data_t; #pragma pack()