|
|
@ -138,12 +138,17 @@ int32_t Hardware::h2o2_sensor_read_sub_ic_errorcode() { // |
|
|
|
} |
|
|
|
int32_t Hardware::h2o2_sensor_read_sub_ic_reg(int32_t add, uint16_t* val, size_t len) { //
|
|
|
|
#ifdef H2O2_SENSOR_TYPE_HPP272
|
|
|
|
return m_H2o2Sensor_HPP272.read_reg(add, val, len); |
|
|
|
if (m_H2o2Sensor_HPP272.read_reg(add, val, len)) { |
|
|
|
return 0; |
|
|
|
} |
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef H2O2_SENSOR_TYPE_HMP110
|
|
|
|
return m_H2o2Sensor_HMP110.read_reg(add, val, len); |
|
|
|
if (m_H2o2Sensor_HMP110.read_reg(add, val, len)) { |
|
|
|
return 0; |
|
|
|
} |
|
|
|
#endif
|
|
|
|
return kerr_subdevice_offline; |
|
|
|
} |
|
|
|
int32_t Hardware::h2o2_sensor_data(report_h2o2_data_t* readdata) { |
|
|
|
#ifdef H2O2_SENSOR_TYPE_HMP110
|
|
|
@ -151,7 +156,6 @@ int32_t Hardware::h2o2_sensor_data(report_h2o2_data_t* readdata) { |
|
|
|
int32_t h2o2adcVal = m_H2o2Sensor_H2O2Adc.getCacheVal(); |
|
|
|
HMP110::hmp110_sensordata_t sensordata; |
|
|
|
m_H2o2Sensor_HMP110.read_cache_sensor_data(&sensordata); |
|
|
|
|
|
|
|
|
|
|
|
// float mv = adcv / 4095.0 * 3.3 * 1000;
|
|
|
|
// float ma = mv / 150.0;
|
|
|
@ -166,7 +170,7 @@ int32_t Hardware::h2o2_sensor_data(report_h2o2_data_t* readdata) { |
|
|
|
readdata->saturation = 0; |
|
|
|
|
|
|
|
ZLOGI(TAG, "ecode: %d ppm:%d, rh:%d, temp:%d, df_ptemp:%d, ah:%d, mr:%d, wbt:%d, eh:%d", //
|
|
|
|
ecode, //
|
|
|
|
ecode, //
|
|
|
|
h2o2ppm, //
|
|
|
|
sensordata.rh, //
|
|
|
|
sensordata.temp, //
|
|
|
|