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

brentru · web-flow · commit 9c6ee194d459 · 2025-03-14T10:42:32.000-05:00
SCD-pointers-v98-fix
diff --git a/library.properties b/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
diff --git a/src/Wippersnapper.h b/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
diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_SCD30.h b/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;
   }
 
diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_SCD4X.h b/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;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver {`
`95`	`95`	`return false;`
`96`	`96`	`}`
`97`	`97`
`98`		`- if (_scd->getEvent(&_humidity, &_temperature)) {`
	`98`	`+ if (!_scd->getEvent(&_humidity, &_temperature)) {`
`99`	`99`	`return false;`
`100`	`100`	`}`
`101`	`101`	`_CO2.CO2 = _scd->CO2;`
`@@ -118,7 +118,7 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver {`
`118`	`118`	`return false;`
`119`	`119`	`}`
`120`	`120`
`121`		`- tempEvent = &_temperature;`
	`121`	`+ *tempEvent = _temperature;`
`122`	`122`	`return true;`
`123`	`123`	`}`
`124`	`124`
`@@ -137,7 +137,7 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver {`
`137`	`137`	`return false;`
`138`	`138`	`}`
`139`	`139`
`140`		`- humidEvent = &_humidity;`
	`140`	`+ *humidEvent = _humidity;`
`141`	`141`	`return true;`
`142`	`142`	`}`
`143`	`143`
`@@ -156,7 +156,7 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver {`
`156`	`156`	`return false;`
`157`	`157`	`}`
`158`	`158`
`159`		`- co2Event = &_CO2;`
	`159`	`+ *co2Event = _CO2;`
`160`	`160`	`return true;`
`161`	`161`	`}`
`162`	`162`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ class WipperSnapper_I2C_Driver_SCD4X : public WipperSnapper_I2C_Driver {`
`141`	`141`	`return false;`
`142`	`142`	`}`
`143`	`143`
`144`		`- tempEvent = &_temperature;`
	`144`	`+ *tempEvent = _temperature;`
`145`	`145`	`return true;`
`146`	`146`	`}`
`147`	`147`
`@@ -160,7 +160,7 @@ class WipperSnapper_I2C_Driver_SCD4X : public WipperSnapper_I2C_Driver {`
`160`	`160`	`return false;`
`161`	`161`	`}`
`162`	`162`
`163`		`- humidEvent = &_humidity;`
	`163`	`+ *humidEvent = _humidity;`
`164`	`164`	`return true;`
`165`	`165`	`}`
`166`	`166`
`@@ -179,7 +179,7 @@ class WipperSnapper_I2C_Driver_SCD4X : public WipperSnapper_I2C_Driver {`
`179`	`179`	`return false;`
`180`	`180`	`}`
`181`	`181`
`182`		`- co2Event = &_CO2;`
	`182`	`+ *co2Event = _CO2;`
`183`	`183`	`return true;`
`184`	`184`	`}`
`185`	`185`