sgp30 / sgp40 integer values

also added sgp30 averaging option

Author: mikeysklar

src/components/i2c/drivers/WipperSnapper_I2C_Driver_SGP30.h

@@ -59,23 +59,33 @@ class WipperSnapper_I2C_Driver_SGP30 : public WipperSnapper_I2C_Driver {
     return true;
   }
 
-  bool getEventECO2(sensors_event_t *senseEvent) override {
-    if (!_sgp30)
-      return false;
-    bool ok = _sgp30->IAQmeasure();
-    if (ok)
-      senseEvent->eCO2 = _sgp30->eCO2;
-    return ok;
+bool getEventECO2(sensors_event_t *senseEvent) override {
+  if (!_sgp30) return false;
+  if (_n > 0) {
+    senseEvent->eCO2 = (uint16_t)(_eco2Sum / _n);
+    _eco2Sum = 0; _tvocSum = 0; _n = 0;
+    return true;
+  }
+  if (_sgp30->IAQmeasure()) {
+    senseEvent->eCO2 = (uint16_t)_sgp30->eCO2;
+    return true;
   }
+  return false;
+}
 
-  bool getEventTVOC(sensors_event_t *senseEvent) override {
-    if (!_sgp30)
-      return false;
-    bool ok = _sgp30->IAQmeasure();
-    if (ok)
-      senseEvent->tvoc = _sgp30->TVOC;
-    return ok;
+bool getEventTVOC(sensors_event_t *senseEvent) override {
+  if (!_sgp30) return false;
+  if (_n > 0) {
+    senseEvent->tvoc = (uint16_t)(_tvocSum / _n);
+    _eco2Sum = 0; _tvocSum = 0; _n = 0;
+    return true;
+  }
+  if (_sgp30->IAQmeasure()) {
+    senseEvent->tvoc = (uint16_t)_sgp30->TVOC;
+    return true;
   }
+  return false;
+}
 
   void fastTick() override {
     if (!iaqEnabled())

src/components/i2c/drivers/WipperSnapper_I2C_Driver_SGP40.h

@@ -113,13 +113,13 @@ class WipperSnapper_I2C_Driver_SGP40 : public WipperSnapper_I2C_Driver {
     if (!_sgp40)
       return false;
     if (_n > 0) {
-      vocIndexEvent->voc_index = _vocSum / (float)_n;
+      vocIndexEvent->voc_index = (uint16_t)(_vocSum / (float)_n);
       _rawSum = 0;
       _vocSum = 0.0f;
       _n = 0;
       return true;
     }
-    vocIndexEvent->voc_index = (float)_sgp40->measureVocIndex();
+    vocIndexEvent->voc_index = (uint16_t)_sgp40->measureVocIndex();
     return true;
   }