Skip to content

Commit 4fe998a

Browse files
committed
Address @tyeth review
1 parent 7219d51 commit 4fe998a

File tree

5 files changed

+8
-15
lines changed

5 files changed

+8
-15
lines changed

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ paragraph=Arduino application for Adafruit.io WipperSnapper
77
category=Communication
88
url=https://github.com/adafruit/Adafruit_Wippersnapper_Arduino
99
architectures=*
10-
depends=OmronD6T - Community Fork, SdFat - Adafruit Fork, Adafruit NeoPixel, Adafruit SPIFlash, ArduinoJson, Adafruit DotStar, Adafruit HDC302x, Adafruit INA219, Adafruit INA260 Library, Adafruit INA237 and INA238 Library, 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, Adafruit LED Backpack Library, Adafruit LiquidCrystal, Adafruit SH110X, Adafruit SSD1306, Adafruit EPD, Adafruit ST7735 and ST7789 Library, Adafruit AS5600 Library, Adafruit BMP5xx Library, Adafruit MLX90632 Library, Adafruit EPD, Adafruit SPA06_003, Adafruit QMC5883P Library
10+
depends=OmronD6T - Community Fork, SdFat - Adafruit Fork, Adafruit NeoPixel, Adafruit SPA06_003, Adafruit SPIFlash, ArduinoJson, Adafruit DotStar, Adafruit HDC302x, Adafruit INA219, Adafruit INA260 Library, Adafruit INA237 and INA238 Library, Adafruit LTR329 and LTR303, Adafruit LTR390 Library, Adafruit MCP3421, Adafruit MLX90632 Library, Adafruit NAU7802 Library, Adafruit SleepyDog Library, Adafruit TMP117, Adafruit TinyUSB Library, Adafruit AHTX0, Adafruit AS5600 Library, Adafruit BME280 Library, Adafruit BMP280 Library, Adafruit BMP3XX Library, Adafruit BMP5xx 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 QMC5883P Library, 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, Adafruit LED Backpack Library, Adafruit LiquidCrystal, Adafruit SH110X, Adafruit SSD1306, Adafruit EPD, Adafruit ST7735 and ST7789 Library

platformio.ini

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ lib_deps =
8383
adafruit/Adafruit PM25 AQI Sensor
8484
adafruit/Adafruit SH110X
8585
adafruit/Adafruit SSD1306
86+
adafruit/Adafruit EPD
87+
adafruit/Adafruit ST7735 and ST7789 Library
8688
https://github.com/tyeth/omron-devhub_d6t-arduino.git
8789
https://github.com/pstolarz/OneWireNg.git
8890
; COMMENT OUT FOR RP2040/RP2350 BOARDS
@@ -96,9 +98,6 @@ lib_deps =
9698
https://github.com/adafruit/WiFiNINA.git
9799
https://github.com/Starmbi/hp_BH1750.git
98100
https://github.com/adafruit/Adafruit_TinyUSB_Arduino.git
99-
Adafruit EPD
100-
Adafruit ST7735 and ST7789 Library
101-
102101

103102
; Common build environment for ESP32 platform
104103
[common:esp32]
@@ -263,7 +262,7 @@ extra_scripts = pre:rename_usb_config.py
263262
extends = common:esp32
264263
board = adafruit_magtag29_esp32s2
265264
build_flags = -DARDUINO_MAGTAG29_ESP32S2 -DBOARD_HAS_PSRAM
266-
;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1
265+
;set partition to tinyuf2-partitions-4MB-noota.csv as of CPY 10
267266
board_build.partitions = tinyuf2-partitions-4MB-noota.csv
268267
extra_scripts = pre:rename_usb_config.py
269268

src/Wippersnapper.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2820,11 +2820,6 @@ void Wippersnapper::connect() {
28202820
runNetFSM();
28212821
WS.feedWDT();
28222822

2823-
// Initialize Digital IO class
2824-
WS._digitalGPIO = new Wippersnapper_DigitalGPIO(20);
2825-
// Initialize Analog IO class
2826-
WS._analogIO = new Wippersnapper_AnalogIO(5, 3.3);
2827-
28282823
// Configure hardware
28292824
while (!WS.pinCfgCompleted) {
28302825
WS_DEBUG_PRINTLN(

src/components/display/controller.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ bool DisplayController::Handle_Display_AddOrReplace(
8383
return false;
8484
}
8585

86-
WS.feedWDT();
86+
WS.runNetFSM();
8787
display->showSplash();
88-
WS.feedWDT();
88+
WS.runNetFSM();
8989
display->drawStatusBar(WS._config.aio_user);
9090
WS.feedWDT();
9191

@@ -146,8 +146,8 @@ bool DisplayController::Handle_Display_Write(
146146
// Write the message to the display
147147
WS_DEBUG_PRINT("[display] Writing message to display: ");
148148
WS_DEBUG_PRINTLN(msgWrite->message);
149+
WS.runNetFSM();
149150
display->writeMessage(msgWrite->message);
150-
WS.feedWDT();
151151
WS.runNetFSM();
152152
return true;
153153
}

src/components/register/Wippersnapper_Register.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* please support Adafruit and open-source hardware by purchasing
99
* products from Adafruit!
1010
*
11-
* Copyright (c) Brent Rubell 2021 for Adafruit Industries.
11+
* Copyright (c) Brent Rubell 2021-2025 for Adafruit Industries.
1212
*
1313
* BSD license, all text here must be included in any redistribution.
1414
*
@@ -77,7 +77,6 @@ bool Wippersnapper::encodePubRegistrationReq() {
7777
/****************************************************************************/
7878
void Wippersnapper::pollRegistrationResp() {
7979
// Blocking loop, WDT reset upon failure.
80-
// WS._boardStatus = WS_BOARD_DEF_OK;
8180
while (WS._boardStatus != WS_BOARD_DEF_OK) {
8281
WS_DEBUG_PRINT("Polling for registration message response...");
8382
WS_DEBUG_PRINTLN(WS._boardStatus);

0 commit comments

Comments
 (0)