Skip to content

Commit 1922364

Browse files
authored
Merge pull request #502 from brentru/migrate-to-bsp-3
Migrate from Arduino ESP32 Core 2.x to 3.x, IDF 5.1
2 parents 74aa016 + 62c7d1f commit 1922364

File tree

64 files changed

+233
-241
lines changed

Some content is hidden

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

64 files changed

+233
-241
lines changed

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

Lines changed: 70 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ jobs:
3636
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
3737
- uses: actions/checkout@v2
3838
with:
39-
repository: adafruit/ci-arduino
39+
repository: brentru/ci-arduino
4040
path: ci
4141
- name: Install CI-Arduino
4242
run: bash ci/actions_install.sh
4343
- name: Install extra Arduino libraries
4444
run: |
4545
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
46-
git clone --quiet https://github.com/PaulStoffregen/OneWire.git /home/runner/Arduino/libraries/OneWire
46+
git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg
4747
git clone --quiet https://github.com/adafruit/Adafruit_HX8357_Library.git /home/runner/Arduino/libraries/Adafruit_HX8357_Library
4848
git clone --quiet https://github.com/adafruit/Adafruit_ILI9341.git /home/runner/Arduino/libraries/Adafruit_ILI9341
4949
git clone --quiet https://github.com/adafruit/Adafruit_STMPE610.git /home/runner/Arduino/libraries/Adafruit_STMPE610
5050
git clone --quiet https://github.com/adafruit/Adafruit-ST7735-Library.git /home/runner/Arduino/libraries/Adafruit-ST7735-Library
5151
git clone --quiet https://github.com/adafruit/Adafruit_TouchScreen.git /home/runner/Arduino/libraries/Adafruit_TouchScreen
52-
git clone --depth 1 --branch v8.2.0 https://github.com/lvgl/lvgl.git /home/runner/Arduino/libraries/lvgl
52+
git clone --depth 1 --branch wippersnapper https://github.com/brentru/lvgl.git /home/runner/Arduino/libraries/lvgl
5353
git clone --depth 1 --branch development https://github.com/brentru/Adafruit_LvGL_Glue.git /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library
5454
- name: List all files in Adafruit_LittlevGL_Glue_Library folder
5555
run: |
@@ -98,7 +98,7 @@ jobs:
9898
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
9999
- uses: actions/checkout@v2
100100
with:
101-
repository: adafruit/ci-arduino
101+
repository: brentru/ci-arduino
102102
path: ci
103103
- name: Checkout Board Definitions
104104
uses: actions/checkout@v2
@@ -110,12 +110,15 @@ jobs:
110110
- name: Install extra Arduino libraries
111111
run: |
112112
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
113-
git clone --quiet https://github.com/PaulStoffregen/OneWire.git /home/runner/Arduino/libraries/OneWire
113+
git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg
114114
- name: Install Dependencies
115115
run: |
116116
pip3 install esptool
117117
- name: build ESP32 platforms
118118
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
119+
- name: Check artifacts
120+
run: |
121+
ls examples/Wippersnapper_demo/build/*
119122
- name: Rename build artifacts to reflect the platform name
120123
run: |
121124
mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bin
@@ -329,6 +332,68 @@ jobs:
329332
path: |
330333
wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip
331334
335+
build-esp32sx-dev:
336+
name: Build WipperSnapper ESP32-Sx DEV BUILDS
337+
runs-on: ubuntu-latest
338+
strategy:
339+
fail-fast: false
340+
matrix:
341+
arduino-platform: ["feather_esp32s2_dev", "feather_esp32s2_tft_dev",
342+
"feather_esp32s2_reverse_tft_dev", "feather_esp32s3_dev",
343+
"feather_esp32s3_4mbflash_2mbpsram_dev", "feather_esp32s3_tft_dev",
344+
"feather_esp32s3_reverse_tft_dev"]
345+
steps:
346+
- uses: actions/setup-python@v1
347+
with:
348+
python-version: '3.x'
349+
- uses: actions/checkout@v2
350+
- name: Get WipperSnapper version
351+
run: |
352+
git fetch --prune --unshallow --tags
353+
git describe --dirty --tags
354+
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
355+
- uses: actions/checkout@v2
356+
with:
357+
repository: brentru/ci-arduino
358+
path: ci
359+
- name: Install CI-Arduino
360+
run: bash ci/actions_install.sh
361+
- name: Install extra Arduino libraries
362+
run: |
363+
git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
364+
git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg
365+
git clone --quiet https://github.com/adafruit/Adafruit_HX8357_Library.git /home/runner/Arduino/libraries/Adafruit_HX8357_Library
366+
git clone --quiet https://github.com/adafruit/Adafruit_ILI9341.git /home/runner/Arduino/libraries/Adafruit_ILI9341
367+
git clone --quiet https://github.com/adafruit/Adafruit_STMPE610.git /home/runner/Arduino/libraries/Adafruit_STMPE610
368+
git clone --quiet https://github.com/adafruit/Adafruit-ST7735-Library.git /home/runner/Arduino/libraries/Adafruit-ST7735-Library
369+
git clone --quiet https://github.com/adafruit/Adafruit_TouchScreen.git /home/runner/Arduino/libraries/Adafruit_TouchScreen
370+
git clone --depth 1 --branch wippersnapper https://github.com/brentru/lvgl.git /home/runner/Arduino/libraries/lvgl
371+
git clone --depth 1 --branch development https://github.com/brentru/Adafruit_LvGL_Glue.git /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library
372+
- name: List all files in Adafruit_LittlevGL_Glue_Library folder
373+
run: |
374+
ls /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library
375+
- name: Copy lv_conf.h file in Adafruit_LittlevGL_Glue_Library to the arduino library folder
376+
run: |
377+
cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries
378+
- name: Build for ESP32-SX
379+
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
380+
- name: list
381+
run: |
382+
ls
383+
ls examples/*/build/
384+
- name: Rename build artifacts to reflect the platform name
385+
run: |
386+
mv examples/*/build/*/wippersnapper_debug.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
387+
mv examples/*/build/*/wippersnapper_debug.ino.bin wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin
388+
- name: upload build artifacts
389+
uses: actions/upload-artifact@v3
390+
with:
391+
name: build-files-dev
392+
path: |
393+
wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
394+
wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin
395+
396+
332397
333398
clang_and_doxy:
334399
runs-on: ubuntu-latest

README.md

Lines changed: 1 addition & 1 deletion

examples/Wippersnapper_NoFS/.DS_Store

0 Bytes
Binary file not shown.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

0 commit comments

Comments
 (0)