Merge branch 'offline-mode' into migrate-api-v2

Author: brentru

.github/workflows/build-clang-doxy.yml

@@ -521,6 +521,7 @@ jobs:
         run: |
           git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg
           git clone --quiet https://github.com/pstolarz/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
+          git clone --quiet https://github.com/brentru/Adafruit_SPIFlash.git /home/runner/Arduino/libraries/Adafruit_SPIFlash
           git clone --quiet https://github.com/adafruit/Adafruit_TinyUSB_Arduino /home/runner/Arduino/libraries/Adafruit_TinyUSB_Arduino
       - name: Download stable Nanopb
         id: download-nanopb

.github/workflows/release-caller.yml

@@ -1,23 +1,37 @@
-# SPDX-FileCopyrightText: Brent Rubell for Adafruit Industries, 2022 - 2024
+# SPDX-FileCopyrightText: Brent Rubell for Adafruit Industries, 2022-2025
 #
 # SPDX-License-Identifier: MIT
 name: WipperSnapper Release Workflow
-
 on:
   release:
     types: [published]
-    branches-ignore:
-      - offline-mode
+  workflow_call:
     secrets:
       GH_REPO_TOKEN:
         required: true
-
 jobs:
+  check-branch:
+    runs-on: ubuntu-latest
+    outputs:
+      should_run: ${{ steps.check.outputs.should_run }}
+    steps:
+      - id: check
+        run: |
+          if [[ $GITHUB_REF == *"offline-mode"* ]]; then
+            echo "should_run=false" >> $GITHUB_OUTPUT
+          else
+            echo "should_run=true" >> $GITHUB_OUTPUT
+          fi
+        shell: bash
+
   call-workflow-build:
+    needs: check-branch
+    if: needs.check-branch.outputs.should_run == 'true'
     uses: adafruit/Adafruit_Wippersnapper_Arduino/.github/workflows/build-clang-doxy.yml@main
     secrets:
       GH_REPO_TOKEN: ${{ secrets.GH_REPO_TOKEN }}
-
+      
   call-workflow-release:
-    needs: call-workflow-build
-    uses: adafruit/Adafruit_Wippersnapper_Arduino/.github/workflows/release-callee.yml@main
+    needs: [check-branch, call-workflow-build]
+    if: needs.check-branch.outputs.should_run == 'true'
+    uses: adafruit/Adafruit_Wippersnapper_Arduino/.github/workflows/release-callee.yml@main

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=SdFat - Adafruit Fork, Adafruit SPIFlash, Adafruit NeoPixel, ArduinoJson, Adafruit DotStar, Adafruit HDC302x, 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, Sensirion I2C SEN66, 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 VCNL4200 Library, Adafruit VEML7700 Library, Adafruit LC709203F, Adafruit LPS2X, Adafruit LPS28, 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, Adafruit BusIO, Adafruit Unified Sensor, Sensirion Core, Adafruit GFX Library, RTClib, StreamUtils, Adafruit SHT4x Library

platformio.ini

@@ -70,6 +70,7 @@ lib_deps =
     adafruit/Adafruit STMPE610
     adafruit/Adafruit TouchScreen
     adafruit/Adafruit MQTT Library
+    https://github.com/adafruit/Adafruit_SHT4X.git
     bblanchon/ArduinoJson
     https://github.com/adafruit/SdFat.git
     https://github.com/pstolarz/OneWireNg.git

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,12 +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())
       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 +75,8 @@ 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 humid;
+    _sht4x->getEvent(&humid, tempEvent);
     return true;
   }
 
@@ -93,15 +90,12 @@ 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 temp;
+    _sht4x->getEvent(humidEvent, &temp);
     return true;
   }
 
 protected:
-  SHTSensor *_sht4x; ///< SHT4X object
+  Adafruit_SHT4x *_sht4x; ///< SHT4X object
 };
-
 #endif // drvSht4x

src/provisioning/sdcard/ws_sdcard.h

@@ -15,7 +15,7 @@
 #ifndef WS_SDCARD_H
 #define WS_SDCARD_H
 #include "RTClib.h"
-#include "SdFat.h"
+#include "SdFat_Adafruit_Fork.h"
 #include "StreamUtils.h"
 #include "Wippersnapper_V2.h"
 #include "sdios.h"

src/provisioning/tinyusb/Wippersnapper_FS.h

@@ -17,7 +17,7 @@
 
 #include "Adafruit_SPIFlash.h"
 #include "Adafruit_TinyUSB.h"
-#include "SdFat.h"
+#include "SdFat_Adafruit_Fork.h"
 // using f_mkfs() for formatting
 #include "fatfs/ff.h" // NOTE: This should be #included before fatfs/diskio.h!!!
 #include "fatfs/diskio.h"