Skip to content

Commit 3e2f7e4

Browse files
tyethtyeth
committed
Merge remote-tracking branch 'upstream/main' into ina238
2 parents c5b8706 + 13aa641 commit 3e2f7e4

17 files changed

+392
-28
lines changed

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

Lines changed: 78 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ name: WipperSnapper Build CI
55

66
on:
77
workflow_dispatch:
8+
inputs:
9+
board:
10+
description: 'Build ONLY this board (must match a matrix entry exactly, or leave empty for all)'
11+
required: false
12+
default: ''
813
pull_request:
914
workflow_call:
1015
secrets:
@@ -15,13 +20,27 @@ jobs:
1520
build-esp32sx-esptool:
1621
name: 🏗️ESP32-Sx(lvgl)
1722
runs-on: ubuntu-latest
23+
continue-on-error: true
1824
strategy:
1925
fail-fast: false
2026
matrix:
21-
arduino-platform: ["funhouse_noota"]
27+
arduino-platform:
28+
[
29+
"funhouse_noota",
30+
"esp32s3_devkitc_1_n8"
31+
]
2232
include:
33+
- offset: "0x0"
2334
- offset: "0x1000"
35+
arduino-platform: "funhouse_noota"
2436
steps:
37+
- name: "skip if unwanted"
38+
if: |
39+
github.event_name == 'workflow_dispatch' &&
40+
github.event.inputs.board != '' &&
41+
matrix.arduino-platform != github.event.inputs.board
42+
run: |
43+
echo "don't build this one!"; exit 1
2544
- uses: actions/setup-python@v5
2645
with:
2746
python-version: "3.x"
@@ -105,6 +124,7 @@ jobs:
105124
mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.elf wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.elf
106125
mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.map wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.map
107126
mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.bootloader.bin wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.bootloader.bin
127+
mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.merged.bin wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.merged_auto.bin
108128
mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.partitions.bin wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.partitions.bin
109129
- name: Get Board Flash Parameters
110130
id: get_board_json
@@ -174,6 +194,7 @@ jobs:
174194
build-esp32sx:
175195
name: 🏗️ESP32-Sx
176196
runs-on: ubuntu-latest
197+
continue-on-error: true
177198
strategy:
178199
fail-fast: false
179200
matrix:
@@ -194,6 +215,13 @@ jobs:
194215
"qtpy_esp32s3_n4r2",
195216
]
196217
steps:
218+
- name: "skip if unwanted"
219+
if: |
220+
github.event_name == 'workflow_dispatch' &&
221+
github.event.inputs.board != '' &&
222+
matrix.arduino-platform != github.event.inputs.board
223+
run: |
224+
echo "don't build this one!"; exit 1
197225
- uses: actions/setup-python@v5
198226
with:
199227
python-version: "3.x"
@@ -278,6 +306,7 @@ jobs:
278306
build-esp32:
279307
name: 🏗️ESP32/Cx
280308
runs-on: ubuntu-latest
309+
continue-on-error: true
281310
strategy:
282311
fail-fast: false
283312
matrix:
@@ -299,6 +328,13 @@ jobs:
299328
- offset: "0x0"
300329
arduino-platform: "wippersnapper_feather_esp32c6"
301330
steps:
331+
- name: "skip if unwanted"
332+
if: |
333+
github.event_name == 'workflow_dispatch' &&
334+
github.event.inputs.board != '' &&
335+
matrix.arduino-platform != github.event.inputs.board
336+
run: |
337+
echo "don't build this one!"; exit 1
302338
- uses: actions/setup-python@v5
303339
with:
304340
python-version: "3.x"
@@ -419,6 +455,7 @@ jobs:
419455
build-samd:
420456
name: 🏗️SAMD
421457
runs-on: ubuntu-latest
458+
continue-on-error: true
422459
strategy:
423460
fail-fast: false
424461
matrix:
@@ -429,6 +466,13 @@ jobs:
429466
"metro_m4_airliftlite_tinyusb",
430467
]
431468
steps:
469+
- name: "skip if unwanted"
470+
if: |
471+
github.event_name == 'workflow_dispatch' &&
472+
github.event.inputs.board != '' &&
473+
matrix.arduino-platform != github.event.inputs.board
474+
run: |
475+
echo "don't build this one!"; exit 1
432476
- uses: actions/setup-python@v5
433477
with:
434478
python-version: "3.x"
@@ -498,11 +542,19 @@ jobs:
498542
build-rp2040:
499543
name: 🏗️RP2040
500544
runs-on: ubuntu-latest
545+
continue-on-error: true
501546
strategy:
502547
fail-fast: false
503548
matrix:
504549
arduino-platform: ["picow_rp2040_tinyusb", "picow_rp2350_tinyusb"]
505550
steps:
551+
- name: "skip if unwanted"
552+
if: |
553+
github.event_name == 'workflow_dispatch' &&
554+
github.event.inputs.board != '' &&
555+
matrix.arduino-platform != github.event.inputs.board
556+
run: |
557+
echo "don't build this one!"; exit 1
506558
- uses: actions/setup-python@v5
507559
with:
508560
python-version: "3.x"
@@ -569,11 +621,19 @@ jobs:
569621
build-esp8266:
570622
name: 🏗️ESP8266
571623
runs-on: ubuntu-latest
624+
continue-on-error: true
572625
strategy:
573626
fail-fast: false
574627
matrix:
575628
arduino-platform: ["feather_esp8266"]
576629
steps:
630+
- name: "skip if unwanted"
631+
if: |
632+
github.event_name == 'workflow_dispatch' &&
633+
github.event.inputs.board != '' &&
634+
matrix.arduino-platform != github.event.inputs.board
635+
run: |
636+
echo "don't build this one!"; exit 1
577637
- uses: actions/setup-python@v5
578638
with:
579639
python-version: "3.x"
@@ -647,11 +707,13 @@ jobs:
647707
build-esp32sx-dev:
648708
name: 🏗️ESP32-Sx(DEV)
649709
runs-on: ubuntu-latest
710+
continue-on-error: true
650711
strategy:
651712
fail-fast: false
652713
matrix:
653714
arduino-platform:
654715
[
716+
"esp32s3_devkitc_1_n8_debug",
655717
"feather_esp32s2_debug",
656718
"feather_esp32s2_tft_debug",
657719
"feather_esp32s3_debug",
@@ -662,6 +724,13 @@ jobs:
662724
"metro_esp32s3_debug",
663725
]
664726
steps:
727+
- name: "skip if unwanted"
728+
if: |
729+
github.event_name == 'workflow_dispatch' &&
730+
github.event.inputs.board != '' &&
731+
matrix.arduino-platform != github.event.inputs.board
732+
run: |
733+
echo "don't build this one!"; exit 1
665734
- uses: actions/setup-python@v5
666735
with:
667736
python-version: "3.x"
@@ -746,6 +815,7 @@ jobs:
746815
build-esp32-dev:
747816
name: 🏗️ESP32/Cx(DEV)
748817
runs-on: ubuntu-latest
818+
continue-on-error: true
749819
strategy:
750820
fail-fast: false
751821
matrix:
@@ -758,6 +828,13 @@ jobs:
758828
- offset: "0x0"
759829
arduino-platform: "wippersnapper_feather_esp32c6_debug"
760830
steps:
831+
- name: "skip if unwanted"
832+
if: |
833+
github.event_name == 'workflow_dispatch' &&
834+
github.event.inputs.board != '' &&
835+
matrix.arduino-platform != github.event.inputs.board
836+
run: |
837+
echo "don't build this one!"; exit 1
761838
- uses: actions/setup-python@v5
762839
with:
763840
python-version: "3.x"

‎examples/Wippersnapper_demo/.esp32s3_devkitc_1_n8.generate‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎examples/Wippersnapper_demo/.esp32s3_devkitc_1_n8_debug.test.skip‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎examples/wippersnapper_debug/.esp32s3_devkitc_1_n8.test.skip‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎examples/wippersnapper_debug/.esp32s3_devkitc_1_n8_debug.generate‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎library.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name=Adafruit WipperSnapper
2-
version=1.0.0-beta.103
2+
version=1.0.0-beta.104
33
author=Adafruit
44
maintainer=Adafruit <[email protected]>
55
sentence=Arduino application for Adafruit.io WipperSnapper
66
paragraph=Arduino application for Adafruit.io WipperSnapper
77
category=Communication
88
url=https://github.com/adafruit/Adafruit_Wippersnapper_Arduino
99
architectures=*
10-
depends=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 SSD1306
10+
depends=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

‎platformio.ini‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ lib_deps =
8585
adafruit/Adafruit LiquidCrystal
8686
adafruit/Adafruit LED Backpack Library
8787
adafruit/Adafruit PM25 AQI Sensor
88+
adafruit/Adafruit SH110X
8889
adafruit/Adafruit SSD1306
8990
https://github.com/pstolarz/OneWireNg.git
9091
https://github.com/milesburton/Arduino-Temperature-Control-Library.git
@@ -101,6 +102,8 @@ lib_deps =
101102
; Common build environment for ESP32 platform
102103
[common:esp32]
103104
platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.13/platform-espressif32.zip
105+
;;Funhouse uses 3.0.7 of arduino-esp32 for now:
106+
; platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.07/platform-espressif32.zip
104107
; This is needed for occasional new features and bug fixes
105108
; platform = https://github.com/pioarduino/platform-espressif32#develop
106109
lib_ignore = WiFiNINA, WiFi101, OneWire
@@ -409,8 +412,10 @@ extra_scripts = pre:rename_usb_config.py
409412
[env:espressif_esp32s3_devkitc_1_n8]
410413
extends = common:esp32
411414
board = esp32-s3-devkitc-1
412-
build_flags = -DARDUINO_ESPRESSIF_ESP32S3_DEVKITC_1_N8
413-
extra_scripts = pre:rename_usb_config.py
415+
build_flags = -DARDUINO_ESPRESSIF_ESP32S3_DEVKITC_1_N8 -DUSE_TINYUSB=1 -DARDUINO_USB_MODE=0 -DARDUINO_USB_CDC_ON_BOOT=1
416+
board_build.partitions = noota_ffat.csv
417+
; board_build.partitions = tinyuf2-partitions-8MB.csv
418+
; extra_scripts = pre:rename_usb_config.py
414419

415420
; Espressif ESP32-S3 NO PSRAM espressif_esp32s3_devkitc_1_n8 (DEBUG)
416421
[env:espressif_esp32s3_devkitc_1_n8_debug]
@@ -419,17 +424,17 @@ board = esp32-s3-devkitc-1
419424
build_type = debug
420425
build_flags =
421426
-DUSE_TINYUSB=1
427+
-DARDUINO_USB_MODE=0
428+
-DARDUINO_USB_CDC_ON_BOOT=1
422429
-DARDUINO_ESPRESSIF_ESP32S3_DEVKITC_1_N8
423-
-DNDEBUG=1
424430
-DDEBUG=1
425431
-DESP_LOG_LEVEL=5
426-
-DARDUINO_CORE_DEBUG_LEVEL=5
427-
-DARDUINO_DEBUG_LEVEL=5
432+
-DARDUINO_CORE_LOG_LEVEL=5
428433
-DARDUINO_LOG_LEVEL=5
429-
-DCORE_DEBUG_LEVEL=5
430434
-DARDUHAL_LOG_LEVEL=5
431-
board_build.partitions = tinyuf2-partitions-8MB.csv
432-
extra_scripts = pre:rename_usb_config.py
435+
; board_build.partitions = tinyuf2-partitions-8MB.csv
436+
board_build.partitions = noota_ffat.csv
437+
; extra_scripts = pre:rename_usb_config.py
433438

434439
; ESP8266 Boards
435440

‎src/Wippersnapper.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,9 @@ void Wippersnapper::provision() {
108108
#ifdef USE_DISPLAY
109109
// Initialize the display
110110
displayConfig config;
111-
WS._fileSystem->parseDisplayConfig(config);
111+
if (!WS._fileSystem->parseDisplayConfig(config)) {
112+
WS._fileSystem->parseDisplayConfig(config, true);
113+
}
112114
WS._display = new ws_display_driver(config);
113115
// Begin display
114116
if (!WS._display->begin()) {

‎src/Wippersnapper.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
#endif
143143

144144
#define WS_VERSION \
145-
"1.0.0-beta.103" ///< WipperSnapper app. version (semver-formatted)
145+
"1.0.0-beta.104" ///< WipperSnapper app. version (semver-formatted)
146146

147147
// Reserved Adafruit IO MQTT topics
148148
#define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic

‎src/Wippersnapper_Boards.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,15 @@
5151
#define STATUS_NEOPIXEL_PIN 45
5252
#define STATUS_NEOPIXEL_NUM 1
5353
#define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation
54+
#elif defined(ARDUINO_ESP32S3_DEV)
55+
#define BOARD_ID "esp32s3-devkitc-1-n8"
56+
#define USE_TINYUSB
57+
#define USE_STATUS_NEOPIXEL
58+
#define STATUS_NEOPIXEL_PIN 48
59+
#define STATUS_NEOPIXEL_NUM 1
60+
#ifdef BOARD_HAS_PSRAM
61+
#define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation
62+
#endif
5463
#elif defined(ARDUINO_METRO_ESP32S3)
5564
#define BOARD_ID "metroesp32s3"
5665
#define USE_TINYUSB

0 commit comments

Comments
 (0)