Skip to content

Commit 2fd7b8c

Browse files
brentrubrentru
authored
Merge branch 'main' into add-spi-tft
2 parents f1a4e87 + d2bef1d commit 2fd7b8c

12 files changed

+726
-65
lines changed

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

Lines changed: 101 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,20 @@ jobs:
5555
- uses: actions/checkout@v4
5656
- name: Get WipperSnapper version
5757
run: |
58-
git fetch --prune --unshallow --tags
59-
git describe --dirty --tags
60-
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
58+
git remote add adafruit https://github.com/adafruit/Adafruit_Wippersnapper_Arduino.git || true
59+
git fetch --prune --unshallow --all --tags
60+
WS_VERSION="unknown"
61+
if git describe --dirty --tags >/dev/null 2>&1; then
62+
WS_VERSION=$(git describe --dirty --tags)
63+
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
64+
else
65+
# Fallback for forks: 1.0.0-{owner}-{short-sha}
66+
REPO_OWNER=$(echo $GITHUB_REPOSITORY | cut -d'/' -f1)
67+
SHORT_SHA=$(git rev-parse --short HEAD)
68+
WS_VERSION="1.0.0-${REPO_OWNER}-${SHORT_SHA}"
69+
echo >>$GITHUB_ENV WS_VERSION="1.0.0-${REPO_OWNER}-${SHORT_SHA}"
70+
fi
71+
echo "WS_VERSION: $WS_VERSION"
6172
- uses: actions/checkout@v4
6273
with:
6374
repository: adafruit/ci-arduino
@@ -264,9 +275,17 @@ jobs:
264275
- uses: actions/checkout@v4
265276
- name: Get WipperSnapper version
266277
run: |
267-
git fetch --prune --unshallow --tags
268-
git describe --dirty --tags
269-
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
278+
git remote add adafruit https://github.com/adafruit/Adafruit_Wippersnapper_Arduino.git || true
279+
git fetch --prune --unshallow --all --tags
280+
if git describe --dirty --tags >/dev/null 2>&1; then
281+
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
282+
else
283+
# Fallback for forks: 1.0.0-{owner}-{short-sha}
284+
REPO_OWNER=$(echo $GITHUB_REPOSITORY | cut -d'/' -f1)
285+
SHORT_SHA=$(git rev-parse --short HEAD)
286+
echo >>$GITHUB_ENV WS_VERSION="1.0.0-${REPO_OWNER}-${SHORT_SHA}"
287+
fi
288+
echo "WS_VERSION: $WS_VERSION"
270289
- uses: actions/checkout@v4
271290
with:
272291
repository: adafruit/ci-arduino
@@ -372,9 +391,17 @@ jobs:
372391
- uses: actions/checkout@v4
373392
- name: Get WipperSnapper version
374393
run: |
375-
git fetch --prune --unshallow --tags
376-
git describe --dirty --tags
377-
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
394+
git remote add adafruit https://github.com/adafruit/Adafruit_Wippersnapper_Arduino.git || true
395+
git fetch --prune --unshallow --all --tags
396+
if git describe --dirty --tags >/dev/null 2>&1; then
397+
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
398+
else
399+
# Fallback for forks: 1.0.0-{owner}-{short-sha}
400+
REPO_OWNER=$(echo $GITHUB_REPOSITORY | cut -d'/' -f1)
401+
SHORT_SHA=$(git rev-parse --short HEAD)
402+
echo >>$GITHUB_ENV WS_VERSION="1.0.0-${REPO_OWNER}-${SHORT_SHA}"
403+
fi
404+
echo "WS_VERSION: $WS_VERSION"
378405
- uses: actions/checkout@v4
379406
with:
380407
repository: adafruit/ci-arduino
@@ -422,7 +449,7 @@ jobs:
422449
mv nanopb/pb.h src/nanopb/nanopb.pb.h
423450
- name: Install Dependencies
424451
run: |
425-
pip install esptool
452+
pip install esptool==4.6
426453
- name: build ESP32 platforms
427454
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
428455
- name: Check artifacts
@@ -464,10 +491,10 @@ jobs:
464491
run: |
465492
echo ${{ steps.get_board_json.outputs.boardJson }}
466493
echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }}
467-
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge-bin \
468-
--flash-mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
469-
--flash-freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
470-
--flash-size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
494+
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \
495+
--flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
496+
--flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
497+
--flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
471498
-o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \
472499
${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \
473500
0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \
@@ -510,9 +537,17 @@ jobs:
510537
- uses: actions/checkout@v4
511538
- name: Get WipperSnapper version
512539
run: |
513-
git fetch --prune --unshallow --tags
514-
git describe --dirty --tags
515-
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
540+
git remote add adafruit https://github.com/adafruit/Adafruit_Wippersnapper_Arduino.git || true
541+
git fetch --prune --unshallow --all --tags
542+
if git describe --dirty --tags >/dev/null 2>&1; then
543+
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
544+
else
545+
# Fallback for forks: 1.0.0-{owner}-{short-sha}
546+
REPO_OWNER=$(echo $GITHUB_REPOSITORY | cut -d'/' -f1)
547+
SHORT_SHA=$(git rev-parse --short HEAD)
548+
echo >>$GITHUB_ENV WS_VERSION="1.0.0-${REPO_OWNER}-${SHORT_SHA}"
549+
fi
550+
echo "WS_VERSION: $WS_VERSION"
516551
- uses: actions/checkout@v4
517552
with:
518553
repository: adafruit/ci-arduino
@@ -592,9 +627,17 @@ jobs:
592627
- uses: actions/checkout@v4
593628
- name: Get WipperSnapper version
594629
run: |
595-
git fetch --prune --unshallow --tags
596-
git describe --dirty --tags
597-
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
630+
git remote add adafruit https://github.com/adafruit/Adafruit_Wippersnapper_Arduino.git || true
631+
git fetch --prune --unshallow --all --tags
632+
if git describe --dirty --tags >/dev/null 2>&1; then
633+
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
634+
else
635+
# Fallback for forks: 1.0.0-{owner}-{short-sha}
636+
REPO_OWNER=$(echo $GITHUB_REPOSITORY | cut -d'/' -f1)
637+
SHORT_SHA=$(git rev-parse --short HEAD)
638+
echo >>$GITHUB_ENV WS_VERSION="1.0.0-${REPO_OWNER}-${SHORT_SHA}"
639+
fi
640+
echo "WS_VERSION: $WS_VERSION"
598641
- uses: actions/checkout@v4
599642
with:
600643
repository: adafruit/ci-arduino
@@ -671,9 +714,17 @@ jobs:
671714
- uses: actions/checkout@v4
672715
- name: Get WipperSnapper version
673716
run: |
674-
git fetch --prune --unshallow --tags
675-
git describe --dirty --tags
676-
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
717+
git remote add adafruit https://github.com/adafruit/Adafruit_Wippersnapper_Arduino.git || true
718+
git fetch --prune --unshallow --all --tags
719+
if git describe --dirty --tags >/dev/null 2>&1; then
720+
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
721+
else
722+
# Fallback for forks: 1.0.0-{owner}-{short-sha}
723+
REPO_OWNER=$(echo $GITHUB_REPOSITORY | cut -d'/' -f1)
724+
SHORT_SHA=$(git rev-parse --short HEAD)
725+
echo >>$GITHUB_ENV WS_VERSION="1.0.0-${REPO_OWNER}-${SHORT_SHA}"
726+
fi
727+
echo "WS_VERSION: $WS_VERSION"
677728
- uses: actions/checkout@v4
678729
with:
679730
repository: adafruit/ci-arduino
@@ -768,9 +819,17 @@ jobs:
768819
- uses: actions/checkout@v4
769820
- name: Get WipperSnapper version
770821
run: |
771-
git fetch --prune --unshallow --tags
772-
git describe --dirty --tags
773-
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
822+
git remote add adafruit https://github.com/adafruit/Adafruit_Wippersnapper_Arduino.git || true
823+
git fetch --prune --unshallow --all --tags
824+
if git describe --dirty --tags >/dev/null 2>&1; then
825+
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
826+
else
827+
# Fallback for forks: 1.0.0-{owner}-{short-sha}
828+
REPO_OWNER=$(echo $GITHUB_REPOSITORY | cut -d'/' -f1)
829+
SHORT_SHA=$(git rev-parse --short HEAD)
830+
echo >>$GITHUB_ENV WS_VERSION="1.0.0-${REPO_OWNER}-${SHORT_SHA}"
831+
fi
832+
echo "WS_VERSION: $WS_VERSION"
774833
- uses: actions/checkout@v4
775834
with:
776835
repository: adafruit/ci-arduino
@@ -870,9 +929,17 @@ jobs:
870929
- uses: actions/checkout@v4
871930
- name: Get WipperSnapper version
872931
run: |
873-
git fetch --prune --unshallow --tags
874-
git describe --dirty --tags
875-
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
932+
git remote add adafruit https://github.com/adafruit/Adafruit_Wippersnapper_Arduino.git || true
933+
git fetch --prune --unshallow --all --tags
934+
if git describe --dirty --tags >/dev/null 2>&1; then
935+
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
936+
else
937+
# Fallback for forks: 1.0.0-{owner}-{short-sha}
938+
REPO_OWNER=$(echo $GITHUB_REPOSITORY | cut -d'/' -f1)
939+
SHORT_SHA=$(git rev-parse --short HEAD)
940+
echo >>$GITHUB_ENV WS_VERSION="1.0.0-${REPO_OWNER}-${SHORT_SHA}"
941+
fi
942+
echo "WS_VERSION: $WS_VERSION"
876943
- uses: actions/checkout@v4
877944
with:
878945
repository: adafruit/ci-arduino
@@ -920,7 +987,7 @@ jobs:
920987
mv nanopb/pb.h src/nanopb/nanopb.pb.h
921988
- name: Install Dependencies
922989
run: |
923-
pip3 install esptool
990+
pip3 install esptool==4.6
924991
- name: build ESP32 platforms
925992
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
926993
- name: Check artifacts
@@ -964,10 +1031,10 @@ jobs:
9641031
run: |
9651032
echo ${{ steps.get_board_json.outputs.boardJson }}
9661033
echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }}
967-
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge-bin \
968-
--flash-mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
969-
--flash-freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
970-
--flash-size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
1034+
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \
1035+
--flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
1036+
--flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
1037+
--flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
9711038
-o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \
9721039
${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \
9731040
0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ You will need a **free** [Adafruit IO](https://io.adafruit.com) account to use W
2020

2121
|Platform| MCU(s) |
2222
|--|--|
23-
|[ESP32-x](https://github.com/espressif/arduino-esp32)| ESP32, ESP32-Sx, ESP32-C3 |
23+
|[ESP32-x](https://github.com/espressif/arduino-esp32)| ESP32, ESP32-Sx, ESP32-C3, ESP32-C6 |
2424
|[ESP8266](https://github.com/esp8266/Arduino)| ESP8266 |
2525
|[RP2040](https://github.com/earlephilhower/arduino-pico)| RP2040 MCU w/WiFi (i.e: Pico W) |
2626
|[RP2350](https://github.com/earlephilhower/arduino-pico)| RP2350 MCU w/WiFi (i.e: Pico 2W) |

‎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
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

0 commit comments

Comments
 (0)