diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 9461af29d..d1714299d 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -34,7 +34,7 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino - ref: ci-wippersnapper + ref: ci-wippersnapper-feb2025-rp2xxx_4-4-4_esp32_3-2-0-rc1 path: ci - name: Checkout Board Definitions uses: actions/checkout@v4 @@ -205,7 +205,7 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino - ref: ci-wippersnapper + ref: ci-wippersnapper-feb2025-rp2xxx_4-4-4_esp32_3-2-0-rc1 path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh @@ -309,7 +309,7 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino - ref: ci-wippersnapper + ref: ci-wippersnapper-feb2025-rp2xxx_4-4-4_esp32_3-2-0-rc1 path: ci - name: Checkout Board Definitions uses: actions/checkout@v4 @@ -439,7 +439,7 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino - ref: ci-wippersnapper + ref: ci-wippersnapper-feb2025-rp2xxx_4-4-4_esp32_3-2-0-rc1 path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh @@ -513,7 +513,7 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino - ref: ci-wippersnapper + ref: ci-wippersnapper-feb2025-rp2xxx_4-4-4_esp32_3-2-0-rc1 path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh @@ -584,7 +584,7 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino - ref: ci-wippersnapper + ref: ci-wippersnapper-feb2025-rp2xxx_4-4-4_esp32_3-2-0-rc1 path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh @@ -672,7 +672,7 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino - ref: ci-wippersnapper + ref: ci-wippersnapper-feb2025-rp2xxx_4-4-4_esp32_3-2-0-rc1 path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh @@ -768,7 +768,7 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino - ref: ci-wippersnapper + ref: ci-wippersnapper-feb2025-rp2xxx_4-4-4_esp32_3-2-0-rc1 path: ci - name: Checkout Board Definitions uses: actions/checkout@v4 @@ -921,7 +921,7 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino - ref: ci-wippersnapper + ref: ci-wippersnapper-feb2025-rp2xxx_4-4-4_esp32_3-2-0-rc1 path: ci - name: pre-install run: bash ci/actions_install.sh diff --git a/library.properties b/library.properties index 2200ce7f9..ba7878696 100644 --- a/library.properties +++ b/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 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 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 +depends=Adafruit NeoPixel, Adafruit SPIFlash, 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 diff --git a/platformio.ini b/platformio.ini index a9bc5e7e0..3584be6e2 100644 --- a/platformio.ini +++ b/platformio.ini @@ -70,6 +70,7 @@ lib_deps = adafruit/Adafruit VEML7700 Library adafruit/Adafruit LC709203F adafruit/Adafruit LPS2X + adafruit/Adafruit LPS28 adafruit/Adafruit LPS35HW adafruit/Adafruit seesaw Library adafruit/Adafruit BME680 Library @@ -94,7 +95,7 @@ lib_deps = ; Common build environment for ESP32 platform [common:esp32] -platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.07/platform-espressif32.zip +platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.13+github/platform-espressif32.zip ; This is needed for occasional new features and bug fixes ; platform = https://github.com/pioarduino/platform-espressif32#develop lib_ignore = WiFiNINA, WiFi101, OneWire @@ -197,6 +198,21 @@ build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S2 -DBOARD_HAS_PSRAM board_build.partitions = tinyuf2-partitions-4MB.csv extra_scripts = pre:rename_usb_config.py +; Adafruit Feather ESP32-S2 debug +[env:featheresp32s2-debug] +extends = common:esp32 +board = featheresp32-s2 +build_type = debug +build_flags = + -DARDUINO_ADAFRUIT_FEATHER_ESP32S2 + -DBOARD_HAS_PSRAM + -DTWOWIRE_DEBUG=1 + -DDEBUG=1 + -DESP_LOG_LEVEL=5 + -DARDUINO_CORE_DEBUG_LEVEL=5 +board_build.partitions = tinyuf2-partitions-4MB-noota.csv +extra_scripts = pre:rename_usb_config.py + ; Adafruit Feather ESP32-S2 TFT [env:adafruit_feather_esp32s2_tft] extends = common:esp32 diff --git a/src/components/i2c/WipperSnapper_I2C.cpp b/src/components/i2c/WipperSnapper_I2C.cpp index dfae4db42..2e722fb3f 100644 --- a/src/components/i2c/WipperSnapper_I2C.cpp +++ b/src/components/i2c/WipperSnapper_I2C.cpp @@ -156,8 +156,11 @@ WipperSnapper_Component_I2C::scanAddresses() { // Scan all I2C addresses between 0x08 and 0x7F inclusive and return a list of // those that respond. + uint8_t addresses_failed_count = 0, current_failed_count = 0; WS_DEBUG_PRINTLN("EXEC: I2C Scan"); for (address = 0x08; address < 0x7F; address++) { + start_scan: + current_failed_count = 0; _i2c->beginTransmission(address); endTransmissionRC = _i2c->endTransmission(); @@ -165,13 +168,25 @@ WipperSnapper_Component_I2C::scanAddresses() { // Check endTransmission()'s return code (Arduino-ESP32 ONLY) // https://github.com/espressif/arduino-esp32/blob/master/libraries/Wire/src/Wire.cpp if (endTransmissionRC == 5) { - WS_DEBUG_PRINTLN("ESP_ERR_TIMEOUT: I2C Bus Busy"); + addresses_failed_count++; + current_failed_count++; + WS_DEBUG_PRINT("ESP_ERR_TIMEOUT: I2C Bus Busy - (Address: 0x"); + WS_DEBUG_PRINT(address, HEX); + WS_DEBUG_PRINT(" - Error Count: "); + WS_DEBUG_PRINT(current_failed_count); + WS_DEBUG_PRINT(" of "); + WS_DEBUG_PRINT(addresses_failed_count); + WS_DEBUG_PRINT(")"); scanResp.bus_response = wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_ERROR_HANG; // NOTE: ESP-IDF appears to handle this "behind the scenes" by // resetting/clearing the bus. The user should be prompted to - // perform a bus scan again. - break; + // perform a bus scan again. Workaround for ESP32-S2 in v3.1.x + if (current_failed_count > 5 || addresses_failed_count > 100) { + WS_DEBUG_PRINTLN("ESP_ERR_TIMEOUT: Too many bus hangs"); + break; + } + goto start_scan; } else if (endTransmissionRC == 7) { WS_DEBUG_PRINT("I2C_ESP_ERR: SDA/SCL shorted, requests queued: "); WS_DEBUG_PRINTLN(endTransmissionRC); @@ -709,6 +724,17 @@ bool WipperSnapper_Component_I2C::initI2CDevice( _lps25hb->configureDriver(msgDeviceInitReq); drivers.push_back(_lps25hb); WS_DEBUG_PRINTLN("LPS25HB Sensor Initialized Successfully!"); + } else if (strcmp("lps28dfw", msgDeviceInitReq->i2c_device_name) == 0) { + _lps28hb = new WipperSnapper_I2C_Driver_LPS28DFW(this->_i2c, i2cAddress); + if (!_lps28hb->begin()) { + WS_DEBUG_PRINTLN("ERROR: Failed to initialize LPS28DFW Sensor!"); + _busStatusResponse = + wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_DEVICE_INIT_FAIL; + return false; + } + _lps28hb->configureDriver(msgDeviceInitReq); + drivers.push_back(_lps28hb); + WS_DEBUG_PRINTLN("LPS28HB Sensor Initialized Successfully!"); } else if ((strcmp("lps33hw", msgDeviceInitReq->i2c_device_name) == 0) || (strcmp("lps35hw", msgDeviceInitReq->i2c_device_name)) == 0) { _lps3xhw = new WipperSnapper_I2C_Driver_LPS3XHW(this->_i2c, i2cAddress); diff --git a/src/components/i2c/WipperSnapper_I2C.h b/src/components/i2c/WipperSnapper_I2C.h index 0c514b813..7998fc015 100644 --- a/src/components/i2c/WipperSnapper_I2C.h +++ b/src/components/i2c/WipperSnapper_I2C.h @@ -38,6 +38,7 @@ #include "drivers/WipperSnapper_I2C_Driver_LC709203F.h" #include "drivers/WipperSnapper_I2C_Driver_LPS22HB.h" #include "drivers/WipperSnapper_I2C_Driver_LPS25HB.h" +#include "drivers/WipperSnapper_I2C_Driver_LPS28DFW.h" #include "drivers/WipperSnapper_I2C_Driver_LPS3XHW.h" #include "drivers/WipperSnapper_I2C_Driver_LTR329_LTR303.h" #include "drivers/WipperSnapper_I2C_Driver_LTR390.h" @@ -177,6 +178,7 @@ class WipperSnapper_Component_I2C { WipperSnapper_I2C_Driver_LC709203F *_lc = nullptr; WipperSnapper_I2C_Driver_LPS22HB *_lps22hb = nullptr; WipperSnapper_I2C_Driver_LPS25HB *_lps25hb = nullptr; + WipperSnapper_I2C_Driver_LPS28DFW *_lps28hb = nullptr; WipperSnapper_I2C_Driver_LPS3XHW *_lps3xhw = nullptr; WipperSnapper_I2C_Driver_STEMMA_Soil_Sensor *_ss = nullptr; WipperSnapper_I2C_Driver_VL53L0X *_vl53l0x = nullptr; diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_LPS28DFW.h b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_LPS28DFW.h new file mode 100644 index 000000000..4f667f6e9 --- /dev/null +++ b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_LPS28DFW.h @@ -0,0 +1,151 @@ +/*! + * @file WipperSnapper_I2C_Driver_LPS28DFW.h + * + * Device driver for a LPS28DFW precision pressure sensor breakout. + * + * Adafruit invests time and resources providing this open source code, + * please support Adafruit and open-source hardware by purchasing + * products from Adafruit! + * + * Copyright (c) Tyeth Gundry 2025 for Adafruit Industries. + * + * MIT license, all text here must be included in any redistribution. + * + */ + +#ifndef WipperSnapper_I2C_Driver_LPS28DFW_H +#define WipperSnapper_I2C_Driver_LPS28DFW_H + +#include "WipperSnapper_I2C_Driver.h" +#include + +/**************************************************************************/ +/*! + @brief Class that provides a sensor driver for the LPS28DFW temperature + and pressure sensor. +*/ +/**************************************************************************/ +class WipperSnapper_I2C_Driver_LPS28DFW : public WipperSnapper_I2C_Driver { + +public: + /*******************************************************************************/ + /*! + @brief Constructor for an LPS28DFW sensor. + @param i2c + The I2C interface. + @param sensorAddress + 7-bit device address. + */ + /*******************************************************************************/ + WipperSnapper_I2C_Driver_LPS28DFW(TwoWire *i2c, uint16_t sensorAddress) + : WipperSnapper_I2C_Driver(i2c, sensorAddress) { + _i2c = i2c; + _sensorAddress = sensorAddress; + } + + /*******************************************************************************/ + /*! + @brief Destructor for an LPS28DFW sensor. + */ + /*******************************************************************************/ + ~WipperSnapper_I2C_Driver_LPS28DFW() { delete _lps28; } + + /*******************************************************************************/ + /*! + @brief Initializes the LPS28DFW sensor and begins I2C. + @returns True if initialized successfully, False otherwise. + */ + /*******************************************************************************/ + bool begin() { + _lps28 = new Adafruit_LPS28(); + // attempt to initialize LPS28DFW + if (!_lps28->begin(_i2c, _sensorAddress)) + return false; + + // Set up sample rate and filter initialization + if (!_lps28->setDataRate(LPS28_ODR_ONESHOT)) { + WS_DEBUG_PRINTLN("Failed to set data rate"); + return false; + } + if (!_lps28->setAveraging(LPS28_AVG_512)) { + WS_DEBUG_PRINTLN("Failed to set averaging"); + return false; + } + if (!_lps28->setFullScaleMode(true)) { + WS_DEBUG_PRINTLN("Failed to set 4060hPa max mode"); + return false; + } + + return true; + } + + /*******************************************************************************/ + /*! + @brief Reads the sensor and stores the data in the object. + @returns True if the sensor was read successfully, False otherwise. + */ + /*******************************************************************************/ + bool readSensor() { + // grab one reading to seed the sensor + if (!_lps28->triggerOneShot()) { + return false; + } + + // Wait (block up to 100ms) until data is ready + for (uint8_t i = 0; i < 100; i++) { + if (_lps28->getStatus() & LPS28_STATUS_PRESS_READY) { + if (_temp == NULL) { + _temp = _lps28->getTemperatureSensor(); + } + if (_pressure == NULL) { + _pressure = _lps28->getPressureSensor(); + } + return true; + } + delay(1); + } + return false; + } + + /*******************************************************************************/ + /*! + @brief Gets the LPS28DFW's current temperature. + @param tempEvent + Pointer to an Adafruit_Sensor event. + @returns True if the temperature was obtained successfully, False + otherwise. + */ + /*******************************************************************************/ + bool getEventAmbientTemp(sensors_event_t *tempEvent) { + if (!readSensor()) + return false; + _temp->getEvent(tempEvent); + return true; + } + + /*******************************************************************************/ + /*! + @brief Reads a pressure sensor and converts + the reading into the expected SI unit. + @param pressureEvent + Pointer to an Adafruit_Sensor event. + @returns True if the sensor event was obtained successfully, False + otherwise. + */ + /*******************************************************************************/ + bool getEventPressure(sensors_event_t *pressureEvent) { + if (!readSensor()) + return false; + _pressure->getEvent(pressureEvent); + return true; + } + +protected: + Adafruit_LPS28 *_lps28 = nullptr; ///< LPS28DFW object + Adafruit_Sensor *_temp = + NULL; ///< Ptr to an adafruit_sensor representing the temperature + Adafruit_Sensor *_pressure = + NULL; ///< Ptr to an adafruit_sensor representing the pressure +}; + +#endif // WipperSnapper_I2C_Driver_LPS28DFW