Merge pull request #714 from adafruit/SCD-pointers-v98-fix

SCD-pointers-v98-fix

Author: brentru

library.properties

@@ -1,5 +1,5 @@
 name=Adafruit WipperSnapper
-version=1.0.0-beta.98
+version=1.0.0-beta.99
 author=Adafruit
 maintainer=Adafruit <adafruitio@adafruit.com>
 sentence=Arduino application for Adafruit.io WipperSnapper

src/Wippersnapper.h

@@ -142,7 +142,7 @@
 #endif
 
 #define WS_VERSION                                                             \
-  "1.0.0-beta.98" ///< WipperSnapper app. version (semver-formatted)
+  "1.0.0-beta.99" ///< WipperSnapper app. version (semver-formatted)
 
 // Reserved Adafruit IO MQTT topics
 #define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic

src/components/i2c/drivers/WipperSnapper_I2C_Driver_SCD30.h

@@ -95,7 +95,7 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver {
       return false;
     }
 
-    if (_scd->getEvent(&_humidity, &_temperature)) {
+    if (!_scd->getEvent(&_humidity, &_temperature)) {
       return false;
     }
     _CO2.CO2 = _scd->CO2;
@@ -118,7 +118,7 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver {
       return false;
     }
 
-    tempEvent = &_temperature;
+    *tempEvent = _temperature;
     return true;
   }
 
@@ -137,7 +137,7 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver {
       return false;
     }
 
-    humidEvent = &_humidity;
+    *humidEvent = _humidity;
     return true;
   }
 
@@ -156,7 +156,7 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver {
       return false;
     }
 
-    co2Event = &_CO2;
+    *co2Event = _CO2;
     return true;
   }
 

src/components/i2c/drivers/WipperSnapper_I2C_Driver_SCD4X.h

@@ -141,7 +141,7 @@ class WipperSnapper_I2C_Driver_SCD4X : public WipperSnapper_I2C_Driver {
       return false;
     }
 
-    tempEvent = &_temperature;
+    *tempEvent = _temperature;
     return true;
   }
 
@@ -160,7 +160,7 @@ class WipperSnapper_I2C_Driver_SCD4X : public WipperSnapper_I2C_Driver {
       return false;
     }
 
-    humidEvent = &_humidity;
+    *humidEvent = _humidity;
     return true;
   }
 
@@ -179,7 +179,7 @@ class WipperSnapper_I2C_Driver_SCD4X : public WipperSnapper_I2C_Driver {
       return false;
     }
 
-    co2Event = &_CO2;
+    *co2Event = _CO2;
     return true;
   }