diff --git a/include/sensor_multichannelgasgmxxx.h b/include/sensor_multichannelgasgmxxx.h index c00bb48..8a1d6b7 100644 --- a/include/sensor_multichannelgasgmxxx.h +++ b/include/sensor_multichannelgasgmxxx.h @@ -32,10 +32,10 @@ public: void setSettings_voc(float minchange, unsigned long senddelaymax, unsigned long readdelay); void setSettings_co(float minchange, unsigned long senddelaymax, unsigned long readdelay); void advertise(HomieNode& p_sensorNode); - void sensorloop_no2(); - void sensorloop_c2h5oh(); - void sensorloop_voc(); - void sensorloop_co(); + void sensorloop_no2(); // GM-102B Nitrogen Dioxide + void sensorloop_c2h5oh(); //GM-302B Ethyl Alcohol + void sensorloop_voc(); // GM-502B Volatile Organic Compounds + void sensorloop_co(); // GM-702B Carbon Monoxide }; diff --git a/include/sensor_vl53l1x.cpp b/include/sensor_vl53l1x.cpp index 18821ed..e39a608 100644 --- a/include/sensor_vl53l1x.cpp +++ b/include/sensor_vl53l1x.cpp @@ -67,13 +67,15 @@ void Sensor_VL53L1X::sensorloop() Serial.print(vl53l1x.ranging_data.ambient_count_rate_MCPS); Serial.println(); */ - - if (abs((int)d.lastsentvalue-d.value)>=d.minchange){ //int abs - _changed=true; + //&& VL53L1X::rangeStatusToString(vl53l1x->ranging_data.range_status)=="range valid" + if (abs((int)d.lastsentvalue-d.value)>=d.minchange ){ //int abs + if (vl53l1x->ranging_data.range_status==0) { // "0 is range valid" + _changed=true; + } } - if (lastsentvalue_vl53l1x_status!=vl53l1x->ranging_data.range_status) { //sensor status changed + /*if (lastsentvalue_vl53l1x_status!=vl53l1x->ranging_data.range_status) { //sensor status changed _changed=true; - } + }*/ d.lastreadtime=millis(); }