Merge pull request #689 from tyeth/scd4x-header-rename

Update WipperSnapper_I2C_Driver_SCD4X.h - renamed include

Author: brentru

src/components/i2c/drivers/WipperSnapper_I2C_Driver_SCD4X.h

@@ -18,7 +18,7 @@
 #define WipperSnapper_I2C_Driver_SCD4X_H
 
 #include "WipperSnapper_I2C_Driver.h"
-#include <SensirionI2CScd4x.h>
+#include <SensirionI2cScd4x.h>
 #include <Wire.h>
 
 /**************************************************************************/
@@ -51,8 +51,8 @@ class WipperSnapper_I2C_Driver_SCD4X : public WipperSnapper_I2C_Driver {
   */
   /*******************************************************************************/
   bool begin() {
-    _scd = new SensirionI2CScd4x();
-    _scd->begin(*_i2c);
+    _scd = new SensirionI2cScd4x();
+    _scd->begin(*_i2c, _sensorAddress);
 
     // stop previously started measurement
     if (_scd->stopPeriodicMeasurement())
@@ -78,7 +78,7 @@ class WipperSnapper_I2C_Driver_SCD4X : public WipperSnapper_I2C_Driver {
     delay(100);
 
     // Check if data is ready
-    error = _scd->getDataReadyFlag(isDataReady);
+    error = _scd->getDataReadyStatus(isDataReady);
     if (error || !isDataReady)
       return false;
 
@@ -145,10 +145,10 @@ class WipperSnapper_I2C_Driver_SCD4X : public WipperSnapper_I2C_Driver {
   }
 
 protected:
-  SensirionI2CScd4x *_scd; ///< SCD4x driver object
+  SensirionI2cScd4x *_scd; ///< SCD4x driver object
   uint16_t _co2;           ///< SCD4x co2 reading
   float _temperature;      ///< SCD4x temperature reading
   float _humidity;         ///< SCD4x humidity reading
 };
 
-#endif // WipperSnapper_I2C_Driver_SCD4X
+#endif // WipperSnapper_I2C_Driver_SCD4X

src/network_interfaces/Wippersnapper_ESP32.h

@@ -106,10 +106,11 @@ class Wippersnapper_ESP32 : public Wippersnapper {
 // For boards with a "3D Antenna", we need to reduce the TX power
 // to prevent flaky operation.
 // NOTE: This is a known issue with the QT Py series of boards.
-#ifdef ARDUINO_ADAFRUIT_QTPY_ESP32S2 ||                                        \
-    ARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM ||                                   \
-    ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2 || ARDUINO_ADAFRUIT_QTPY_ESP32C3 ||     \
-    ARDUINO_ADAFRUIT_QTPY_ESP32_PICO
+#if defined(ARDUINO_ADAFRUIT_QTPY_ESP32S2) ||                                  \
+    defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM) ||                          \
+    defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2) ||                             \
+    defined(ARDUINO_ADAFRUIT_QTPY_ESP32C3) ||                                  \
+    defined(ARDUINO_ADAFRUIT_QTPY_ESP32_PICO)
     WiFi.setTxPower(WIFI_POWER_15dBm);
 #endif