bsec: cache everything on successfull run()

arduino-libraries · Mar 28, 2024 · 5d8947b · 5d8947b
1 parent aeb9f6b
commit 5d8947b
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 35 deletions.
diff --git a/src/AirQualityClass.cpp b/src/AirQualityClass.cpp
@@ -115,50 +115,50 @@ float AirQualityClass::readVOC()
 {
   if (_revision == BOARD_REVISION_2) {
     if(iaqSensor->run()){
-      breathVocEquivalent = iaqSensor->breathVocEquivalent;
+      mkr_iot_carrier_rev2::cache();
     }
   }
-  return breathVocEquivalent;
+  return mkr_iot_carrier_rev2::breathVocEquivalent;
 }
 
 float AirQualityClass::readGasResistor()
 {
   if (_revision == BOARD_REVISION_2) {
     if(iaqSensor->run()){
-      gasResistance = iaqSensor->gasResistance;
+      mkr_iot_carrier_rev2::cache();
     }
   }
-  return gasResistance;
+  return mkr_iot_carrier_rev2::gasResistance;
 }
 
 float AirQualityClass::readIAQ()
 {
   if (_revision == BOARD_REVISION_2) {
     if(iaqSensor->run()){
-      iaq = iaqSensor->iaq;
+      mkr_iot_carrier_rev2::cache();
     }
   }
-  return iaq;
+  return mkr_iot_carrier_rev2::iaq;
 }
 
 float AirQualityClass::readIAQAccuracy()
 {
   if (_revision == BOARD_REVISION_2) {
     if(iaqSensor->run()){
-      iaqAccuracy = iaqSensor->iaqAccuracy;
+      mkr_iot_carrier_rev2::cache();
     }
   }
-  return iaqAccuracy;
+  return mkr_iot_carrier_rev2::iaqAccuracy;
 }
 
 float AirQualityClass::readStaticIAQ()
 {
   if (_revision == BOARD_REVISION_2) {
     if(iaqSensor->run()){
-      staticIaq = iaqSensor->staticIaq;
+      mkr_iot_carrier_rev2::cache();
     }
   }
-  return staticIaq;
+  return mkr_iot_carrier_rev2::staticIaq;
 }
 
 
@@ -167,9 +167,9 @@ float AirQualityClass::readCO2()
   float reading = 0.0;
   if (_revision == BOARD_REVISION_2) {
     if(iaqSensor->run()){
-      co2Equivalent = iaqSensor->co2Equivalent;
+      mkr_iot_carrier_rev2::cache();
     }
   }
-  return co2Equivalent;
+  return mkr_iot_carrier_rev2::co2Equivalent;
 }
 
diff --git a/src/AirQualityClass.h b/src/AirQualityClass.h
@@ -25,12 +25,6 @@ class AirQualityClass {
   private:
     // Helper functions declarations
     int checkIaqSensorStatus(void);
-    float breathVocEquivalent = 0.0f;
-    float gasResistance = 0.0f;
-    float iaq = 0.0f;
-    float iaqAccuracy = 0.0f;
-    float staticIaq = 0.0f;
-    float co2Equivalent = 0.0f;
 
   private:
 

diff --git a/src/Arduino_MKRIoTCarrier.cpp b/src/Arduino_MKRIoTCarrier.cpp
@@ -26,6 +26,15 @@ bool CARRIER_CASE = false;
 
 mkr_iot_carrier_rev2 mkr_iot_carrier_rev2_instance;
 Bsec* mkr_iot_carrier_rev2::iaqSensor;
+float mkr_iot_carrier_rev2::breathVocEquivalent;
+float mkr_iot_carrier_rev2::gasResistance;
+float mkr_iot_carrier_rev2::iaq;
+float mkr_iot_carrier_rev2::iaqAccuracy;
+float mkr_iot_carrier_rev2::staticIaq;
+float mkr_iot_carrier_rev2::co2Equivalent;
+float mkr_iot_carrier_rev2::temperature;
+float mkr_iot_carrier_rev2::pressure;
+float mkr_iot_carrier_rev2::humidity;
 
 MKRIoTCarrier::MKRIoTCarrier() {
 }

diff --git a/src/EnvClass.cpp b/src/EnvClass.cpp
@@ -109,12 +109,12 @@ float EnvClass::readTemperature(int units /*= CELSIUS*/)
 {
   if (_revision == BOARD_REVISION_2) {
     if(iaqSensor->run()){
-      temperature = iaqSensor->temperature;
+      mkr_iot_carrier_rev2::cache();
     }
     if (units == FAHRENHEIT){
-      return (temperature * 9.0 / 5.0) + 32.0;
+      return (mkr_iot_carrier_rev2::temperature * 9.0 / 5.0) + 32.0;
     } else {
-      return temperature;
+      return mkr_iot_carrier_rev2::temperature;
     }
   }
   return HTS221->readTemperature(units);
@@ -124,9 +124,9 @@ float EnvClass::readHumidity()
 {
   if (_revision == BOARD_REVISION_2) {
     if(iaqSensor->run()){
-      humidity = iaqSensor->humidity;
+      mkr_iot_carrier_rev2::cache();
     }
-    return humidity;
+    return mkr_iot_carrier_rev2::humidity;
   }
   return HTS221->readHumidity();
 }
diff --git a/src/EnvClass.h b/src/EnvClass.h
@@ -28,8 +28,6 @@ class EnvClass {
 
     int (*board_revision)(void);
     int _revision;
-    float temperature = 0.0f;
-    float humidity = 0.0f;
 };
 
 #endif //_ENVCLASS_H_INCLUDED
diff --git a/src/MKRIoTCarrierDefines.h b/src/MKRIoTCarrierDefines.h
@@ -84,6 +84,26 @@ class mkr_iot_carrier_rev2 {
         GROVE_AN1 = A0,
         GROVE_AN2 = A6,
     };
+    static void cache() {
+        breathVocEquivalent = iaqSensor->breathVocEquivalent;
+        gasResistance = iaqSensor->gasResistance;
+        iaq = iaqSensor->iaq;
+        iaqAccuracy = iaqSensor->iaqAccuracy;
+        staticIaq = iaqSensor->staticIaq;
+        co2Equivalent = iaqSensor->co2Equivalent;
+        temperature = iaqSensor->temperature;
+        pressure = iaqSensor->pressure;
+        humidity = iaqSensor->humidity;
+    };
+    static float breathVocEquivalent;
+    static float gasResistance;
+    static float iaq;
+    static float iaqAccuracy;
+    static float staticIaq;
+    static float co2Equivalent;
+    static float temperature;
+    static float pressure;
+    static float humidity;
 };
 
 extern mkr_iot_carrier_rev2 mkr_iot_carrier_rev2_instance;

diff --git a/src/PressureClass.cpp b/src/PressureClass.cpp
@@ -109,14 +109,15 @@ float PressureClass::readPressure(int units)
 {
   if (_revision == BOARD_REVISION_2) {
     if(iaqSensor->run()){
-      pressure = iaqSensor->pressure/1000;
+      mkr_iot_carrier_rev2::cache();
     }
+    auto _pressure = mkr_iot_carrier_rev2::pressure / 1000;
     if (units == MILLIBAR) { // 1 kPa = 10 millibar
-      return pressure * 10;
+      return _pressure * 10;
     } else if (units == PSI) {  // 1 kPa = 0.145038 PSI
-      return pressure * 0.145038;
+      return _pressure * 0.145038;
     } else {
-      return pressure;
+      return _pressure;
     }
   }
   return LPS22HB->readPressure(units);
@@ -126,12 +127,12 @@ float PressureClass::readTemperature(int units /*= CELSIUS*/)
 {
   if (_revision == BOARD_REVISION_2) {
     if(iaqSensor->run()){
-      temperature = iaqSensor->temperature;
+      mkr_iot_carrier_rev2::cache();
     }
     if (units == FAHRENHEIT){
-      return (temperature * 9.0 / 5.0) + 32.0;
+      return (mkr_iot_carrier_rev2::temperature * 9.0 / 5.0) + 32.0;
     } else {
-      return temperature;
+      return mkr_iot_carrier_rev2::temperature;
     }
   }
   return LPS22HB->readTemperature();

diff --git a/src/PressureClass.h b/src/PressureClass.h
@@ -24,9 +24,6 @@ class PressureClass {
 
     LPS22HBClass* LPS22HB;
 
-    float pressure = 0.0f;
-    float temperature = 0.0f;
-
   private:
 
     int (*board_revision)(void);