Skip to content

Commit db2af9c

Browse files
authored
Merge branch 'main' into funhouse-display-config-recreate
2 parents 989f666 + 6e49411 commit db2af9c

File tree

47 files changed

+3610
-1635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+3610
-1635
lines changed

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

+659-363
Large diffs are not rendered by default.

.github/workflows/release-callee.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Download build artifacts from build-platform steps
15-
uses: actions/download-artifact@v2
15+
uses: actions/download-artifact@v3
1616
with:
1717
name: build-files
1818
- name: List Files
1919
run: ls
2020
- name: Upload Assets to the GitHub Release
21-
uses: softprops/action-gh-release@v1
21+
uses: softprops/action-gh-release@v2
2222
if: startsWith(github.ref, 'refs/tags/')
2323
with:
2424
files: |

.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,8 @@ src/.vscode/settings.json
4444

4545
examples/Wippersnapper_demo/build/
4646

47-
#Platformio artifacts
47+
# Platformio artifacts
4848
.pio/
49+
50+
# Secrets
51+
data/

.vscode/settings.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"limits": "c",
44
"type_traits": "c"
55
},
6-
"C_Cpp.dimInactiveRegions": false,
7-
"dotnet.defaultSolution": "disable"
6+
"C_Cpp.dimInactiveRegions": true,
7+
"dotnet.defaultSolution": "disable",
8+
"cmake.configureOnOpen": false
89
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

library.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name=Adafruit WipperSnapper
2-
version=1.0.0-alpha.79
2+
version=1.0.0-beta.90
33
author=Adafruit
44
maintainer=Adafruit <adafruitio@adafruit.com>
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=Adafruit NeoPixel, Adafruit SPIFlash, ArduinoJson, Adafruit DotStar, Adafruit INA219, Adafruit LTR329 and LTR303, Adafruit LTR390 Library, Adafruit SleepyDog Library, Adafruit TMP117, Adafruit TinyUSB Library, Adafruit AHTX0, Adafruit BME280 Library, Adafruit BMP280 Library, Adafruit BMP3XX Library, Adafruit DPS310, 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, 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
10+
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, 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

platformio.ini

+134-21
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ monitor_speed = 115200
1717
lib_compat_mode = strict
1818
lib_deps =
1919
adafruit/Adafruit Zero DMA Library
20-
adafruit/Adafruit TinyUSB Library
20+
https://github.com/adafruit/Adafruit_TinyUSB_Arduino.git
2121
adafruit/Adafruit NeoPixel
2222
adafruit/Adafruit SPIFlash
2323
adafruit/Adafruit DotStar
@@ -28,7 +28,9 @@ lib_deps =
2828
adafruit/Adafruit BMP280 Library
2929
adafruit/Adafruit BMP3XX Library
3030
adafruit/Adafruit DPS310
31+
adafruit/Adafruit DS248x
3132
adafruit/Adafruit INA219
33+
adafruit/Adafruit HDC302x
3234
adafruit/Adafruit HTS221
3335
adafruit/Adafruit HTU21DF Library
3436
adafruit/Adafruit HTU31D Library
@@ -41,15 +43,19 @@ lib_deps =
4143
adafruit/Adafruit Si7021 Library
4244
adafruit/Adafruit VCNL4020 Library
4345
adafruit/Adafruit VCNL4040
46+
adafruit/Adafruit MCP3421
4447
adafruit/Adafruit MCP9808 Library
4548
adafruit/Adafruit MCP9600 Library
4649
adafruit/Adafruit MPL115A2
4750
adafruit/Adafruit MPRLS Library
4851
adafruit/Adafruit MS8607
52+
adafruit/Adafruit NAU7802 Library
4953
adafruit/Adafruit TMP117
5054
adafruit/Adafruit TSL2591 Library
5155
adafruit/Adafruit_VL53L0X
5256
adafruit/Adafruit VL53L1X
57+
stm32duino/STM32duino VL53L4CD
58+
stm32duino/STM32duino VL53L4CX
5359
adafruit/Adafruit_VL6180X
5460
adafruit/Adafruit PM25 AQI Sensor
5561
adafruit/Adafruit VEML7700 Library
@@ -65,30 +71,37 @@ lib_deps =
6571
adafruit/Adafruit TouchScreen
6672
adafruit/Adafruit MQTT Library
6773
bblanchon/ArduinoJson
68-
PaulStoffregen/OneWire
74+
https://github.com/pstolarz/OneWireNg.git
6975
https://github.com/milesburton/Arduino-Temperature-Control-Library.git
7076
https://github.com/Sensirion/arduino-sht.git
7177
https://github.com/Sensirion/arduino-i2c-scd4x.git
7278
https://github.com/Sensirion/arduino-i2c-sen5x.git
7379
https://github.com/adafruit/WiFiNINA.git
7480
https://github.com/Starmbi/hp_BH1750.git
7581

82+
7683
; Common build environment for ESP32 platform
7784
[common:esp32]
78-
platform = espressif32 @ ^6.3.2
79-
lib_ignore = WiFiNINA
85+
; platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.04/platform-espressif32.zip
86+
; This is needed for Adafruit Feather C6 in platformio (until 51.03.05):
87+
platform = https://github.com/pioarduino/platform-espressif32#develop
88+
lib_ignore = WiFiNINA, WiFi101, OneWire
8089
monitor_filters = esp32_exception_decoder, time
8190

8291
; Common build environment for ESP8266 platform
8392
[common:esp8266]
8493
platform = espressif8266
85-
lib_ignore = WiFiNINA, Adafruit TinyUSB Library
94+
lib_ignore = WiFiNINA, WiFi101, Adafruit TinyUSB Library, OneWire
8695

8796
; Common build environment for Atmel/Microchip SAMDx platform
8897
[common:atsamd]
8998
platform = atmelsam
99+
platform_packages =
100+
platformio/framework-arduino-samd-adafruit@^1.7.13
101+
platformio/tool-jlink@^1.78811.0
90102
lib_ldf_mode = deep
91-
103+
lib_archive = no ; debug timer issues see https://community.platformio.org/t/choose-usb-stack-as-tiny-usb/22451/5
104+
lib_ignore = OneWire
92105

93106
[common:rp2040]
94107
platform = https://github.com/maxgerhardt/platform-raspberrypi.git
@@ -101,9 +114,12 @@ board_build.core = earlephilhower
101114
board_build.filesystem_size = 0.5m
102115
build_flags = -DUSE_TINYUSB
103116
; Once https://github.com/platformio/platformio-core > 6.1.11 these can be removed
104-
lib_ignore = WiFiNINA, Adafruit Zero DMA Library
117+
lib_ignore = WiFiNINA, WiFi101, Adafruit Zero DMA Library, OneWire
105118
lib_compat_mode = soft ; can be strict once pio detects SleepyDog on RP2040
106119

120+
121+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Individual Board Definitions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
122+
107123
; ESP32-x Boards ;
108124

109125
; Adafruit ESP32 Feather
@@ -112,6 +128,7 @@ extends = common:esp32
112128
board = featheresp32
113129
build_flags = -DARDUINO_FEATHER_ESP32
114130
board_build.filesystem = littlefs
131+
board_build.partitions = min_spiffs.csv
115132

116133

117134
; Adafruit ESP32 Feather V2
@@ -129,33 +146,67 @@ board = adafruit_itsybitsy_esp32
129146
build_flags = -DARDUINO_ADAFRUIT_ITSYBITSY_ESP32
130147
board_build.filesystem = littlefs
131148

149+
; Adafruit ESP32 Feather C6
150+
[env:adafruit_feather_esp32c6_4mbflash_nopsram]
151+
extends = common:esp32
152+
board = adafruit_feather_esp32c6
153+
build_flags =
154+
-DARDUINO_ADAFRUIT_FEATHER_ESP32C6
155+
-DARDUINO_USB_CDC_ON_BOOT=1
156+
-DCORE_DEBUG_LEVEL=3
157+
board_build.filesystem = littlefs
158+
board_build.partitions = min_spiffs.csv
159+
160+
; Espressif ESP32-C6 4MB NO PSRAM esp32-c6-devkitm-1
161+
[env:espressif_esp32-c6-devkitm-1]
162+
extends = common:esp32
163+
board = esp32-c6-devkitm-1
164+
build_type = debug
165+
build_flags =
166+
-DARDUINO_ESPRESSIF_ESP32C6_DEVKITM_1
167+
-DARDUINO_ADAFRUIT_FEATHER_ESP32C6
168+
-DNDEBUG=1
169+
-DDEBUG=1
170+
-DESP_LOG_LEVEL=5
171+
-DARDUINO_CORE_DEBUG_LEVEL=5
172+
-DARDUINO_DEBUG_LEVEL=5
173+
-DARDUINO_LOG_LEVEL=5
174+
-DCORE_DEBUG_LEVEL=5
175+
-DARDUHAL_LOG_LEVEL=5
176+
board_build.filesystem = littlefs
177+
board_build.partitions = min_spiffs.csv
132178

133179
; Adafruit Feather ESP32-S2
134180
[env:featheresp32s2]
135181
extends = common:esp32
136182
board = featheresp32-s2
137-
build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S2
183+
build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S2 -DBOARD_HAS_PSRAM
184+
board_build.partitions = tinyuf2-partitions-4MB.csv
138185
extra_scripts = pre:rename_usb_config.py
139186

140187
; Adafruit Feather ESP32-S2 TFT
141188
[env:adafruit_feather_esp32s2_tft]
142189
extends = common:esp32
143190
board = adafruit_feather_esp32s2_tft
144-
build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT
191+
build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT -DBOARD_HAS_PSRAM
192+
board_build.partitions = tinyuf2-partitions-4MB.csv
145193
extra_scripts = pre:rename_usb_config.py
146194

147195
; Adafruit Feather ESP32-S2 Reverse TFT
148196
[env:adafruit_feather_esp32s2_reversetft]
149197
extends = common:esp32
150198
board = adafruit_feather_esp32s2_reversetft
151-
build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT
199+
build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT -DBOARD_HAS_PSRAM
200+
board_build.partitions = tinyuf2-partitions-4MB.csv
152201
extra_scripts = pre:rename_usb_config.py
153202

154203
; Adafruit Feather ESP32-S3 2MB PSRAM
155204
[env:adafruit_feather_esp32s3]
156205
extends = common:esp32
157206
board = adafruit_feather_esp32s3
158-
build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S3
207+
build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S3 -DBOARD_HAS_PSRAM
208+
;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1
209+
board_build.partitions = tinyuf2-partitions-4MB.csv
159210
extra_scripts = pre:rename_usb_config.py
160211

161212
; Adafruit Feather ESP32-S3 NO PSRAM
@@ -168,48 +219,65 @@ extra_scripts = pre:rename_usb_config.py
168219
; Adafruit Feather ESP32-S3 TFT
169220
[env:adafruit_feather_esp32s3_tft]
170221
extends = common:esp32
222+
build_type = debug
223+
debug_tool = esp-builtin
171224
board = adafruit_feather_esp32s3_tft
172-
build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT
225+
build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT -DBOARD_HAS_PSRAM
226+
;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1
227+
board_build.partitions = tinyuf2-partitions-4MB.csv
173228
extra_scripts = pre:rename_usb_config.py
174229

175230
; Adafruit Feather ESP32-S3 Reverse TFT
176231
[env:adafruit_feather_esp32s3_reversetft]
177232
extends = common:esp32
178233
board = adafruit_feather_esp32s3_reversetft
179-
build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT
234+
build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT -DBOARD_HAS_PSRAM
235+
;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1
236+
board_build.partitions = tinyuf2-partitions-4MB.csv
180237
extra_scripts = pre:rename_usb_config.py
181238

182239
; Adafruit Magtag ESP32-S2
183240
[env:adafruit_magtag29_esp32s2]
184241
extends = common:esp32
185242
board = adafruit_magtag29_esp32s2
186-
build_flags = -DARDUINO_MAGTAG29_ESP32S2
243+
build_flags = -DARDUINO_MAGTAG29_ESP32S2 -DBOARD_HAS_PSRAM
244+
;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1
245+
board_build.partitions = tinyuf2-partitions-4MB.csv
187246
extra_scripts = pre:rename_usb_config.py
188247

189248
; Adafruit Metro ESP32-S2
190249
[env:adafruit_metro_esp32s2]
191250
extends = common:esp32
192251
board = adafruit_metro_esp32s2
193-
build_flags = -DARDUINO_METRO_ESP32S2
252+
build_flags = -DARDUINO_METRO_ESP32S2 -DBOARD_HAS_PSRAM
253+
;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1
254+
board_build.partitions = tinyuf2-partitions-4MB.csv
194255
extra_scripts = pre:rename_usb_config.py
195256

196257
; Adafruit QT Py ESP32 Pico
197258
[env:adafruit_qtpy_esp32]
198259
extends = common:esp32
199260
board = adafruit_qtpy_esp32
261+
board_build.partitions = default_8MB.csv
262+
board_build.filesystem = littlefs
263+
build_type = debug
200264
build_flags = -DARDUINO_ADAFRUIT_QTPY_ESP32
201265

202266
; Adafruit QT Py ESP32-C3
203267
[env:adafruit_qtpy_esp32c3]
204268
extends = common:esp32
205269
board = adafruit_qtpy_esp32c3
206270
build_flags = -DARDUINO_ADAFRUIT_QTPY_ESP32C3
271+
board_build.filesystem = littlefs
272+
board_build.partitions = min_spiffs.csv
207273

208274
; Adafruit QT Py ESP32-S2
209275
[env:adafruit_qtpy_esp32s2]
210276
extends = common:esp32
211277
board = adafruit_qtpy_esp32s2
212-
build_flags = -DARDUINO_ADAFRUIT_QTPY_ESP32S2
278+
build_flags = -DARDUINO_ADAFRUIT_QTPY_ESP32S2 -DBOARD_HAS_PSRAM
279+
;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1
280+
board_build.partitions = tinyuf2-partitions-4MB.csv
213281
extra_scripts = pre:rename_usb_config.py
214282

215283
; Adafruit QT Py ESP32-S3 NO PSRAM
@@ -219,6 +287,27 @@ board = adafruit_qtpy_esp32s3_nopsram
219287
build_flags = -DARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM
220288
extra_scripts = pre:rename_usb_config.py
221289

290+
; Espressif ESP32-S3 NO PSRAM espressif_esp32s3_devkitc_1_n8
291+
[env:espressif_esp32s3_devkitc_1_n8]
292+
extends = common:esp32
293+
board = esp32-s3-devkitc-1
294+
build_type = debug
295+
build_flags =
296+
-DUSE_TINYUSB=1
297+
-DARDUINO_ESPRESSIF_ESP32S3_DEVKITC_1_N8
298+
-DNDEBUG=1
299+
-DDEBUG=1
300+
-DESP_LOG_LEVEL=5
301+
-DARDUINO_CORE_DEBUG_LEVEL=5
302+
-DARDUINO_DEBUG_LEVEL=5
303+
; -DARDUINO_DEBUG_OUTPUT=Serial
304+
; -DARDUINO_DEBUG_BAUD=115200
305+
-DARDUINO_LOG_LEVEL=5
306+
-DCORE_DEBUG_LEVEL=5
307+
-DARDUHAL_LOG_LEVEL=5
308+
board_build.partitions = tinyuf2-partitions-8MB.csv
309+
extra_scripts = pre:rename_usb_config.py
310+
222311
; ESP8266 Boards
223312

224313
; Adafruit Feather HUZZAH ESP8266
@@ -242,14 +331,39 @@ build_flags = -DUSE_TINYUSB=1
242331
[env:adafruit_pyportal_m4_titano]
243332
extends = common:atsamd
244333
board = adafruit_pyportal_m4_titano
245-
; build_type = debug
334+
build_type = debug
335+
upload_protocol = sam-ba
246336
; upload_protocol = jlink
247-
; debug_tool = jlink
337+
debug_tool = jlink
338+
monitor_port = auto
248339
; monitor_port = jlink
249-
; debug_init_break =
340+
; monitor_port = socket://localhost:19021
341+
; debug_init_break = tbreak clearConfiguration
250342
lib_ignore = USBHost
251-
build_flags = -DUSE_TINYUSB=1
343+
build_flags = -DUSE_TINYUSB
344+
-D__SAMD51J20A__
345+
-DCRYSTALLESS
252346
-DADAFRUIT_PYPORTAL_M4_TITANO
347+
-D__SAMD51__
348+
-D__FPU_PRESENT
349+
-DARM_MATH_CM4
350+
-mfloat-abi=hard
351+
-mfpu=fpv4-sp-d16
352+
-DCORE_DEBUG_LEVEL=5
353+
-DARDUINO_USB_CDC_ON_BOOT=1
354+
-DCFG_TUSB_DEBUG=1
355+
-DDEBUG=1
356+
-DNDEBUG=1
357+
-DUSE_AIRLIFT=1
358+
-g
359+
; -DUSBCON
360+
; -UCDC_DISABLED
361+
; -UPLUGGABLE_USB_DISABLED
362+
; -DCDC_ENABLED
363+
; -DPLUGGABLE_USB_ENABLED
364+
; -DSERIAL_DEBUG=1
365+
; -DSERIAL_PORT=Serial1
366+
; -DSERCOM_INSTANCE_SERIAL=1
253367

254368
; Adafruit Metro M4 Airlift Lite
255369
[env:adafruit_metro_m4_airliftlite]
@@ -303,4 +417,3 @@ build_flags =
303417
; ; No USB stack
304418
; build_flags = -DPIO_FRAMEWORK_ARDUINO_NO_USB
305419
; -DPIO_FRAMEWORK_ARDUINO_ENABLE_IPV6
306-

0 commit comments

Comments
 (0)