Skip to content

Commit 5a205d7

Browse files
tyethtyeth
authored
Merge branch 'adafruit:main' into scd-issue
2 parents e283291 + 570c166 commit 5a205d7

25 files changed

+808
-285
lines changed

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

Lines changed: 208 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,31 @@ jobs:
5555
git clone --quiet https://github.com/adafruit/Adafruit_TinyUSB_Arduino /home/runner/Arduino/libraries/Adafruit_TinyUSB_Arduino
5656
git clone --depth 1 --branch wippersnapper https://github.com/brentru/lvgl.git /home/runner/Arduino/libraries/lvgl
5757
git clone --depth 1 --branch development https://github.com/brentru/Adafruit_LvGL_Glue.git /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library
58-
- name: Download and install stable Nanopb
58+
- name: Download stable Nanopb
59+
id: download-nanopb
60+
continue-on-error: true
5961
run: |
60-
# Download and extract nanopb
6162
wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz
63+
- if: ${{ failure() || steps.download-nanopb.outcome != 'success' }}
64+
name: Restore cached nanopb
65+
id: cache-nanopb-restore
66+
uses: actions/cache/restore@v4
67+
env:
68+
cache-name: cache-node-modules
69+
with:
70+
path: ./nanopb-0.4.8.tar.gz
71+
key: nanopb-0.4.8.tar.gz
72+
- if: ${{ steps.download-nanopb.outcome == 'success' }}
73+
name: Save nanopb to cache
74+
id: cache-nanopb-save
75+
uses: actions/cache/save@v4
76+
env:
77+
cache-name: cache-node-modules
78+
with:
79+
path: ./nanopb-0.4.8.tar.gz
80+
key: nanopb-0.4.8.tar.gz
81+
- name: Install stable Nanopb
82+
run: |
6283
tar -xf nanopb-0.4.8.tar.gz
6384
# Copy files to WipperSnapper's src/nanopb directory
6485
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb
@@ -200,10 +221,31 @@ jobs:
200221
git clone --quiet https://github.com/adafruit/Adafruit_TinyUSB_Arduino /home/runner/Arduino/libraries/Adafruit_TinyUSB_Arduino
201222
git clone --depth 1 --branch wippersnapper https://github.com/brentru/lvgl.git /home/runner/Arduino/libraries/lvgl
202223
git clone --depth 1 --branch development https://github.com/brentru/Adafruit_LvGL_Glue.git /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library
203-
- name: Download and install stable Nanopb
224+
- name: Download stable Nanopb
225+
id: download-nanopb
226+
continue-on-error: true
204227
run: |
205-
# Download and extract nanopb
206228
wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz
229+
- if: ${{ failure() || steps.download-nanopb.outcome != 'success' }}
230+
name: Restore cached nanopb
231+
id: cache-nanopb-restore
232+
uses: actions/cache/restore@v4
233+
env:
234+
cache-name: cache-node-modules
235+
with:
236+
path: ./nanopb-0.4.8.tar.gz
237+
key: nanopb-0.4.8.tar.gz
238+
- if: ${{ steps.download-nanopb.outcome == 'success' }}
239+
name: Save nanopb to cache
240+
id: cache-nanopb-save
241+
uses: actions/cache/save@v4
242+
env:
243+
cache-name: cache-node-modules
244+
with:
245+
path: ./nanopb-0.4.8.tar.gz
246+
key: nanopb-0.4.8.tar.gz
247+
- name: Install stable Nanopb
248+
run: |
207249
tar -xf nanopb-0.4.8.tar.gz
208250
# Copy files to WipperSnapper's src/nanopb directory
209251
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb
@@ -279,10 +321,31 @@ jobs:
279321
run: |
280322
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
281323
git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg
282-
- name: Download and install stable Nanopb
324+
- name: Download stable Nanopb
325+
id: download-nanopb
326+
continue-on-error: true
283327
run: |
284-
# Download and extract nanopb
285328
wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz
329+
- if: ${{ failure() || steps.download-nanopb.outcome != 'success' }}
330+
name: Restore cached nanopb
331+
id: cache-nanopb-restore
332+
uses: actions/cache/restore@v4
333+
env:
334+
cache-name: cache-node-modules
335+
with:
336+
path: ./nanopb-0.4.8.tar.gz
337+
key: nanopb-0.4.8.tar.gz
338+
- if: ${{ steps.download-nanopb.outcome == 'success' }}
339+
name: Save nanopb to cache
340+
id: cache-nanopb-save
341+
uses: actions/cache/save@v4
342+
env:
343+
cache-name: cache-node-modules
344+
with:
345+
path: ./nanopb-0.4.8.tar.gz
346+
key: nanopb-0.4.8.tar.gz
347+
- name: Install stable Nanopb
348+
run: |
286349
tar -xf nanopb-0.4.8.tar.gz
287350
# Copy files to WipperSnapper's src/nanopb directory
288351
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb
@@ -386,10 +449,31 @@ jobs:
386449
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
387450
git clone --quiet https://github.com/PaulStoffregen/OneWire.git /home/runner/Arduino/libraries/OneWire
388451
git clone --quiet https://github.com/adafruit/Adafruit_TinyUSB_Arduino /home/runner/Arduino/libraries/Adafruit_TinyUSB_Arduino
389-
- name: Download and install stable Nanopb
452+
- name: Download stable Nanopb
453+
id: download-nanopb
454+
continue-on-error: true
390455
run: |
391-
# Download and extract nanopb
392456
wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz
457+
- if: ${{ failure() || steps.download-nanopb.outcome != 'success' }}
458+
name: Restore cached nanopb
459+
id: cache-nanopb-restore
460+
uses: actions/cache/restore@v4
461+
env:
462+
cache-name: cache-node-modules
463+
with:
464+
path: ./nanopb-0.4.8.tar.gz
465+
key: nanopb-0.4.8.tar.gz
466+
- if: ${{ steps.download-nanopb.outcome == 'success' }}
467+
name: Save nanopb to cache
468+
id: cache-nanopb-save
469+
uses: actions/cache/save@v4
470+
env:
471+
cache-name: cache-node-modules
472+
with:
473+
path: ./nanopb-0.4.8.tar.gz
474+
key: nanopb-0.4.8.tar.gz
475+
- name: Install stable Nanopb
476+
run: |
393477
tar -xf nanopb-0.4.8.tar.gz
394478
# Copy files to WipperSnapper's src/nanopb directory
395479
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb
@@ -414,7 +498,7 @@ jobs:
414498
strategy:
415499
fail-fast: false
416500
matrix:
417-
arduino-platform: ["picow_rp2040_tinyusb"]
501+
arduino-platform: ["picow_rp2040_tinyusb", "picow_rp2350_tinyusb"]
418502
steps:
419503
- uses: actions/setup-python@v5
420504
with:
@@ -438,10 +522,31 @@ jobs:
438522
git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg
439523
git clone --quiet https://github.com/pstolarz/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
440524
git clone --quiet https://github.com/adafruit/Adafruit_TinyUSB_Arduino /home/runner/Arduino/libraries/Adafruit_TinyUSB_Arduino
441-
- name: Download and install stable Nanopb
525+
- name: Download stable Nanopb
526+
id: download-nanopb
527+
continue-on-error: true
442528
run: |
443-
# Download and extract nanopb
444529
wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz
530+
- if: ${{ failure() || steps.download-nanopb.outcome != 'success' }}
531+
name: Restore cached nanopb
532+
id: cache-nanopb-restore
533+
uses: actions/cache/restore@v4
534+
env:
535+
cache-name: cache-node-modules
536+
with:
537+
path: ./nanopb-0.4.8.tar.gz
538+
key: nanopb-0.4.8.tar.gz
539+
- if: ${{ steps.download-nanopb.outcome == 'success' }}
540+
name: Save nanopb to cache
541+
id: cache-nanopb-save
542+
uses: actions/cache/save@v4
543+
env:
544+
cache-name: cache-node-modules
545+
with:
546+
path: ./nanopb-0.4.8.tar.gz
547+
key: nanopb-0.4.8.tar.gz
548+
- name: Install stable Nanopb
549+
run: |
445550
tar -xf nanopb-0.4.8.tar.gz
446551
# Copy files to WipperSnapper's src/nanopb directory
447552
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb
@@ -489,10 +594,31 @@ jobs:
489594
git clone --quiet https://github.com/arduino-libraries/Servo.git /home/runner/Arduino/libraries/Servo
490595
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
491596
git clone --quiet https://github.com/PaulStoffregen/OneWire.git /home/runner/Arduino/libraries/OneWire
492-
- name: Download and install stable Nanopb
597+
- name: Download stable Nanopb
598+
id: download-nanopb
599+
continue-on-error: true
493600
run: |
494-
# Download and extract nanopb
495601
wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz
602+
- if: ${{ failure() || steps.download-nanopb.outcome != 'success' }}
603+
name: Restore cached nanopb
604+
id: cache-nanopb-restore
605+
uses: actions/cache/restore@v4
606+
env:
607+
cache-name: cache-node-modules
608+
with:
609+
path: ./nanopb-0.4.8.tar.gz
610+
key: nanopb-0.4.8.tar.gz
611+
- if: ${{ steps.download-nanopb.outcome == 'success' }}
612+
name: Save nanopb to cache
613+
id: cache-nanopb-save
614+
uses: actions/cache/save@v4
615+
env:
616+
cache-name: cache-node-modules
617+
with:
618+
path: ./nanopb-0.4.8.tar.gz
619+
key: nanopb-0.4.8.tar.gz
620+
- name: Install stable Nanopb
621+
run: |
496622
tar -xf nanopb-0.4.8.tar.gz
497623
# Copy files to WipperSnapper's src/nanopb directory
498624
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb
@@ -528,10 +654,31 @@ jobs:
528654
run: |
529655
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
530656
git clone --quiet https://github.com/PaulStoffregen/OneWire.git /home/runner/Arduino/libraries/OneWire
531-
- name: Download and install stable Nanopb
657+
- name: Download stable Nanopb
658+
id: download-nanopb
659+
continue-on-error: true
532660
run: |
533-
# Download and extract nanopb
534661
wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz
662+
- if: ${{ failure() || steps.download-nanopb.outcome != 'success' }}
663+
name: Restore cached nanopb
664+
id: cache-nanopb-restore
665+
uses: actions/cache/restore@v4
666+
env:
667+
cache-name: cache-node-modules
668+
with:
669+
path: ./nanopb-0.4.8.tar.gz
670+
key: nanopb-0.4.8.tar.gz
671+
- if: ${{ steps.download-nanopb.outcome == 'success' }}
672+
name: Save nanopb to cache
673+
id: cache-nanopb-save
674+
uses: actions/cache/save@v4
675+
env:
676+
cache-name: cache-node-modules
677+
with:
678+
path: ./nanopb-0.4.8.tar.gz
679+
key: nanopb-0.4.8.tar.gz
680+
- name: Install stable Nanopb
681+
run: |
535682
tar -xf nanopb-0.4.8.tar.gz
536683
# Copy files to WipperSnapper's src/nanopb directory
537684
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb
@@ -603,10 +750,31 @@ jobs:
603750
git clone --quiet https://github.com/adafruit/Adafruit_TinyUSB_Arduino /home/runner/Arduino/libraries/Adafruit_TinyUSB_Arduino
604751
git clone --depth 1 --branch wippersnapper https://github.com/brentru/lvgl.git /home/runner/Arduino/libraries/lvgl
605752
git clone --depth 1 --branch development https://github.com/brentru/Adafruit_LvGL_Glue.git /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library
606-
- name: Download and install stable Nanopb
753+
- name: Download stable Nanopb
754+
id: download-nanopb
755+
continue-on-error: true
607756
run: |
608-
# Download and extract nanopb
609757
wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz
758+
- if: ${{ failure() || steps.download-nanopb.outcome != 'success' }}
759+
name: Restore cached nanopb
760+
id: cache-nanopb-restore
761+
uses: actions/cache/restore@v4
762+
env:
763+
cache-name: cache-node-modules
764+
with:
765+
path: ./nanopb-0.4.8.tar.gz
766+
key: nanopb-0.4.8.tar.gz
767+
- if: ${{ steps.download-nanopb.outcome == 'success' }}
768+
name: Save nanopb to cache
769+
id: cache-nanopb-save
770+
uses: actions/cache/save@v4
771+
env:
772+
cache-name: cache-node-modules
773+
with:
774+
path: ./nanopb-0.4.8.tar.gz
775+
key: nanopb-0.4.8.tar.gz
776+
- name: Install stable Nanopb
777+
run: |
610778
tar -xf nanopb-0.4.8.tar.gz
611779
# Copy files to WipperSnapper's src/nanopb directory
612780
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb
@@ -675,10 +843,31 @@ jobs:
675843
run: |
676844
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
677845
git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg
678-
- name: Download and install stable Nanopb
846+
- name: Download stable Nanopb
847+
id: download-nanopb
848+
continue-on-error: true
679849
run: |
680-
# Download and extract nanopb
681850
wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.8.tar.gz
851+
- if: ${{ failure() || steps.download-nanopb.outcome != 'success' }}
852+
name: Restore cached nanopb
853+
id: cache-nanopb-restore
854+
uses: actions/cache/restore@v4
855+
env:
856+
cache-name: cache-node-modules
857+
with:
858+
path: ./nanopb-0.4.8.tar.gz
859+
key: nanopb-0.4.8.tar.gz
860+
- if: ${{ steps.download-nanopb.outcome == 'success' }}
861+
name: Save nanopb to cache
862+
id: cache-nanopb-save
863+
uses: actions/cache/save@v4
864+
env:
865+
cache-name: cache-node-modules
866+
with:
867+
path: ./nanopb-0.4.8.tar.gz
868+
key: nanopb-0.4.8.tar.gz
869+
- name: Install stable Nanopb
870+
run: |
682871
tar -xf nanopb-0.4.8.tar.gz
683872
# Copy files to WipperSnapper's src/nanopb directory
684873
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb

‎examples/Wippersnapper_NoFS/.picow_rp2350_tinyusb.test.skip‎

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

‎examples/Wippersnapper_demo/.picow_rp2350_tinyusb.generate‎

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

‎examples/wippersnapper_debug/.picow_rp2350_tinyusb.test.skip‎

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.92
2+
version=1.0.0-beta.94
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 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
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 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

0 commit comments

Comments
 (0)