Fix SHT4x driver

Author: brentru

library.properties

@@ -7,4 +7,4 @@ paragraph=Arduino application for Adafruit.io WipperSnapper
 category=Communication
 url=https://github.com/adafruit/Adafruit_Wippersnapper_Arduino
 architectures=*
-depends=Adafruit NeoPixel, Adafruit SPIFlash, ArduinoJson, Adafruit DotStar, Adafruit INA219, Adafruit LTR329 and LTR303, Adafruit LTR390 Library, Adafruit MCP3421, Adafruit NAU7802 Library, Adafruit SleepyDog Library, Adafruit TMP117, Adafruit TinyUSB Library, Adafruit AHTX0, Adafruit BME280 Library, Adafruit BMP280 Library, Adafruit BMP3XX Library, Adafruit DPS310, Adafruit DS248x, Adafruit SCD30, Adafruit SGP30 Sensor, Adafruit SGP40 Sensor, Sensirion I2C SCD4x, Sensirion I2C SEN5X, arduino-sht, Adafruit Si7021 Library, Adafruit MQTT Library, Adafruit MS8607, Adafruit MCP9808 Library, Adafruit MCP9600 Library, Adafruit MPL115A2, Adafruit MPRLS Library, Adafruit TSL2591 Library, Adafruit_VL53L0X, Adafruit VL53L1X, STM32duino VL53L4CD, STM32duino VL53L4CX, Adafruit_VL6180X, Adafruit PM25 AQI Sensor, Adafruit VCNL4020 Library, Adafruit VCNL4040, Adafruit VEML7700 Library, Adafruit LC709203F, Adafruit LPS2X, Adafruit LPS35HW, Adafruit seesaw Library, Adafruit BME680 Library, Adafruit MAX1704X, Adafruit ADT7410 Library, Adafruit HTS221, Adafruit HTU21DF Library, Adafruit HTU31D Library, Adafruit PCT2075, hp_BH1750, ENS160 - Adafruit Fork, RTClib, StreamUtils, Adafruit BusIO, Adafruit Unified Sensor, Sensirion Core, SdFat - Adafruit Fork, Adafruit GFX Library
+depends=Adafruit NeoPixel, Adafruit SPIFlash, ArduinoJson, Adafruit DotStar, Adafruit INA219, Adafruit LTR329 and LTR303, Adafruit LTR390 Library, Adafruit MCP3421, Adafruit NAU7802 Library, Adafruit SleepyDog Library, Adafruit TMP117, Adafruit TinyUSB Library, Adafruit AHTX0, Adafruit BME280 Library, Adafruit BMP280 Library, Adafruit BMP3XX Library, Adafruit DPS310, Adafruit DS248x, Adafruit SCD30, Adafruit SGP30 Sensor, Adafruit SGP40 Sensor, Sensirion I2C SCD4x, Sensirion I2C SEN5X, arduino-sht, Adafruit Si7021 Library, Adafruit MQTT Library, Adafruit MS8607, Adafruit MCP9808 Library, Adafruit MCP9600 Library, Adafruit MPL115A2, Adafruit MPRLS Library, Adafruit TSL2591 Library, Adafruit_VL53L0X, Adafruit VL53L1X, STM32duino VL53L4CD, STM32duino VL53L4CX, Adafruit_VL6180X, Adafruit PM25 AQI Sensor, Adafruit VCNL4020 Library, Adafruit VCNL4040, Adafruit VEML7700 Library, Adafruit LC709203F, Adafruit LPS2X, Adafruit LPS35HW, Adafruit seesaw Library, Adafruit BME680 Library, Adafruit MAX1704X, Adafruit ADT7410 Library, Adafruit HTS221, Adafruit HTU21DF Library, Adafruit HTU31D Library, Adafruit PCT2075, hp_BH1750, ENS160 - Adafruit Fork, RTClib, StreamUtils, Adafruit BusIO, Adafruit Unified Sensor, Sensirion Core, SdFat - Adafruit Fork, Adafruit GFX Library, Adafruit SHT4x Library

platformio.ini

@@ -80,6 +80,7 @@ lib_deps =
     https://github.com/adafruit/RTClib.git
     https://github.com/bblanchon/ArduinoStreamUtils.git
     https://github.com/Sensirion/arduino-i2c-scd4x.git
+    Adafruit SHT4x Library
 
 ; Common build environment for ESP32 platform
 [common:esp32]

src/Wippersnapper_V2.h

@@ -127,7 +127,7 @@
 #endif
 
 #define WS_VERSION                                                             \
-  "1.0.0-offline-beta.1" ///< WipperSnapper app. version (semver-formatted)
+  "1.0.0-offline-beta.2" ///< WipperSnapper app. version (semver-formatted)
 
 #define WS_WDT_TIMEOUT 60000       ///< WDT timeout
 #define WS_MAX_ALT_WIFI_NETWORKS 3 ///< Maximum number of alternative networks

src/components/i2c/controller.cpp

@@ -634,6 +634,7 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
                              ->i2c_device_description.i2c_bus_sda);
     WS_DEBUG_PRINTLN("[i2c] Set driver to use Alt I2C bus");
   }
+
   // Configure the driver
   drv->EnableSensorReads(
       _i2c_model->GetI2cDeviceAddOrReplaceMsg()->i2c_device_sensor_types,

src/components/i2c/drivers/drvSht4x.h

@@ -18,9 +18,8 @@
 #ifndef DRV_SHT4X_H
 #define DRV_SHT4X_H
 
+#include "Adafruit_SHT4x.h"
 #include "drvBase.h"
-#include <SHTSensor.h>
-#include <Wire.h>
 
 /**************************************************************************/
 /*!
@@ -56,13 +55,12 @@ class drvSht4x : public drvBase {
   */
   /*******************************************************************************/
   bool begin() override {
-    _sht4x = new SHTSensor(SHTSensor::SHT4X);
-    if (!_sht4x->init(*_i2c))
+    _sht4x = new Adafruit_SHT4x();
+    if (!_sht4x->begin(_i2c))
       return false;
 
-    // configure SHT4x sensor
-    _sht4x->setAccuracy(SHTSensor::SHT_ACCURACY_HIGH);
-
+    _sht4x->setPrecision(SHT4X_HIGH_PRECISION);
+    _sht4x->setHeater(SHT4X_NO_HEATER);
     return true;
   }
 
@@ -76,10 +74,11 @@ class drvSht4x : public drvBase {
   */
   /*******************************************************************************/
   bool getEventAmbientTemp(sensors_event_t *tempEvent) {
-    // populate temp and humidity objects with fresh data
-    if (!_sht4x->readSample())
-      return false;
-    tempEvent->temperature = _sht4x->getTemperature();
+    sensors_event_t humidity;
+    _sht4x->getEvent(
+        &humidity,
+        tempEvent); // populate temp and humidity objects with fresh data
+    // tempEvent->temperature = tempEvent->temperature;
     return true;
   }
 
@@ -93,15 +92,17 @@ class drvSht4x : public drvBase {
   */
   /*******************************************************************************/
   bool getEventRelativeHumidity(sensors_event_t *humidEvent) {
-    // populate temp and humidity objects with fresh data
-    if (!_sht4x->readSample())
-      return false;
-    humidEvent->relative_humidity = _sht4x->getHumidity();
+    sensors_event_t temperature;
+    _sht4x->getEvent(
+        humidEvent,
+        &temperature); // populate temp and humidity objects with fresh data
+    // tempEvent->temperature = tempEvent->temperature;
+    // humidEvent->relative_humidity = humidEvent->relative_humidity;
     return true;
   }
 
 protected:
-  SHTSensor *_sht4x; ///< SHT4X object
+  Adafruit_SHT4x *_sht4x; ///< Adafruit_SHT4x object
 };
 
 #endif // drvSht4x