bsec: cache everything on successfull run()

facchinm · facchinm · commit 5d8947b899e3 · 2024-03-28T17:27:59.000+01:00
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);

Original file line number	Diff line number	Diff line change
`@@ -115,50 +115,50 @@ float AirQualityClass::readVOC()`
`115`	`115`	`{`
`116`	`116`	`if (_revision == BOARD_REVISION_2) {`
`117`	`117`	`if(iaqSensor->run()){`
`118`		`- breathVocEquivalent = iaqSensor->breathVocEquivalent;`
	`118`	`+ mkr_iot_carrier_rev2::cache();`
`119`	`119`	`}`
`120`	`120`	`}`
`121`		`- return breathVocEquivalent;`
	`121`	`+ return mkr_iot_carrier_rev2::breathVocEquivalent;`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`float AirQualityClass::readGasResistor()`
`125`	`125`	`{`
`126`	`126`	`if (_revision == BOARD_REVISION_2) {`
`127`	`127`	`if(iaqSensor->run()){`
`128`		`- gasResistance = iaqSensor->gasResistance;`
	`128`	`+ mkr_iot_carrier_rev2::cache();`
`129`	`129`	`}`
`130`	`130`	`}`
`131`		`- return gasResistance;`
	`131`	`+ return mkr_iot_carrier_rev2::gasResistance;`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`float AirQualityClass::readIAQ()`
`135`	`135`	`{`
`136`	`136`	`if (_revision == BOARD_REVISION_2) {`
`137`	`137`	`if(iaqSensor->run()){`
`138`		`- iaq = iaqSensor->iaq;`
	`138`	`+ mkr_iot_carrier_rev2::cache();`
`139`	`139`	`}`
`140`	`140`	`}`
`141`		`- return iaq;`
	`141`	`+ return mkr_iot_carrier_rev2::iaq;`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`float AirQualityClass::readIAQAccuracy()`
`145`	`145`	`{`
`146`	`146`	`if (_revision == BOARD_REVISION_2) {`
`147`	`147`	`if(iaqSensor->run()){`
`148`		`- iaqAccuracy = iaqSensor->iaqAccuracy;`
	`148`	`+ mkr_iot_carrier_rev2::cache();`
`149`	`149`	`}`
`150`	`150`	`}`
`151`		`- return iaqAccuracy;`
	`151`	`+ return mkr_iot_carrier_rev2::iaqAccuracy;`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`float AirQualityClass::readStaticIAQ()`
`155`	`155`	`{`
`156`	`156`	`if (_revision == BOARD_REVISION_2) {`
`157`	`157`	`if(iaqSensor->run()){`
`158`		`- staticIaq = iaqSensor->staticIaq;`
	`158`	`+ mkr_iot_carrier_rev2::cache();`
`159`	`159`	`}`
`160`	`160`	`}`
`161`		`- return staticIaq;`
	`161`	`+ return mkr_iot_carrier_rev2::staticIaq;`
`162`	`162`	`}`
`163`	`163`
`164`	`164`
`@@ -167,9 +167,9 @@ float AirQualityClass::readCO2()`
`167`	`167`	`float reading = 0.0;`
`168`	`168`	`if (_revision == BOARD_REVISION_2) {`
`169`	`169`	`if(iaqSensor->run()){`
`170`		`- co2Equivalent = iaqSensor->co2Equivalent;`
	`170`	`+ mkr_iot_carrier_rev2::cache();`
`171`	`171`	`}`
`172`	`172`	`}`
`173`		`- return co2Equivalent;`
	`173`	`+ return mkr_iot_carrier_rev2::co2Equivalent;`
`174`	`174`	`}`
`175`	`175`
Original file line number	Diff line number	Diff line change
`@@ -109,12 +109,12 @@ float EnvClass::readTemperature(int units /= CELSIUS/)`
`109`	`109`	`{`
`110`	`110`	`if (_revision == BOARD_REVISION_2) {`
`111`	`111`	`if(iaqSensor->run()){`
`112`		`- temperature = iaqSensor->temperature;`
	`112`	`+ mkr_iot_carrier_rev2::cache();`
`113`	`113`	`}`
`114`	`114`	`if (units == FAHRENHEIT){`
`115`		`- return (temperature * 9.0 / 5.0) + 32.0;`
	`115`	`+ return (mkr_iot_carrier_rev2::temperature * 9.0 / 5.0) + 32.0;`
`116`	`116`	`} else {`
`117`		`- return temperature;`
	`117`	`+ return mkr_iot_carrier_rev2::temperature;`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`return HTS221->readTemperature(units);`
`@@ -124,9 +124,9 @@ float EnvClass::readHumidity()`
`124`	`124`	`{`
`125`	`125`	`if (_revision == BOARD_REVISION_2) {`
`126`	`126`	`if(iaqSensor->run()){`
`127`		`- humidity = iaqSensor->humidity;`
	`127`	`+ mkr_iot_carrier_rev2::cache();`
`128`	`128`	`}`
`129`		`- return humidity;`
	`129`	`+ return mkr_iot_carrier_rev2::humidity;`
`130`	`130`	`}`
`131`	`131`	`return HTS221->readHumidity();`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,14 +109,15 @@ float PressureClass::readPressure(int units)`
`109`	`109`	`{`
`110`	`110`	`if (_revision == BOARD_REVISION_2) {`
`111`	`111`	`if(iaqSensor->run()){`
`112`		`- pressure = iaqSensor->pressure/1000;`
	`112`	`+ mkr_iot_carrier_rev2::cache();`
`113`	`113`	`}`
	`114`	`+ auto _pressure = mkr_iot_carrier_rev2::pressure / 1000;`
`114`	`115`	`if (units == MILLIBAR) { // 1 kPa = 10 millibar`
`115`		`- return pressure * 10;`
	`116`	`+ return _pressure * 10;`
`116`	`117`	`} else if (units == PSI) { // 1 kPa = 0.145038 PSI`
`117`		`- return pressure * 0.145038;`
	`118`	`+ return _pressure * 0.145038;`
`118`	`119`	`} else {`
`119`		`- return pressure;`
	`120`	`+ return _pressure;`
`120`	`121`	`}`
`121`	`122`	`}`
`122`	`123`	`return LPS22HB->readPressure(units);`
`@@ -126,12 +127,12 @@ float PressureClass::readTemperature(int units /= CELSIUS/)`
`126`	`127`	`{`
`127`	`128`	`if (_revision == BOARD_REVISION_2) {`
`128`	`129`	`if(iaqSensor->run()){`
`129`		`- temperature = iaqSensor->temperature;`
	`130`	`+ mkr_iot_carrier_rev2::cache();`
`130`	`131`	`}`
`131`	`132`	`if (units == FAHRENHEIT){`
`132`		`- return (temperature * 9.0 / 5.0) + 32.0;`
	`133`	`+ return (mkr_iot_carrier_rev2::temperature * 9.0 / 5.0) + 32.0;`
`133`	`134`	`} else {`
`134`		`- return temperature;`
	`135`	`+ return mkr_iot_carrier_rev2::temperature;`
`135`	`136`	`}`
`136`	`137`	`}`
`137`	`138`	`return LPS22HB->readTemperature();`