Skip to content

Commit 99a4e83

Browse files
committed
chore: merges main.
2 parents f37a860 + 243a4e0 commit 99a4e83

File tree

295 files changed

+25697
-749814
lines changed

Some content is hidden

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

295 files changed

+25697
-749814
lines changed

.github/workflows/build-platformio-macos.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,18 @@ jobs:
3737
3838
3939
40+
41+
42+
43+
44+
45+
46+
47+
48+
49+
50+
51+
4052
4153
4254
@@ -50,21 +62,16 @@ jobs:
5062
run: pip install --upgrade platformio
5163

5264
- name: Build PlatformIO env:ESP32-Rev1toRev4
53-
working-directory: ./Platformio
5465
run: pio run -e esp32-Rev1toRev4
5566

5667
- name: Build PlatformIO env:ESP32_testboard-Rev1toRev4
57-
working-directory: ./Platformio
5868
run: pio run -e esp32_testboard-Rev1toRev4
5969

6070
- name: Build PlatformIO env:ESP32-S3-Rev5andHigher
61-
working-directory: ./Platformio
6271
run: pio run -e esp32-s3-Rev5andHigher
6372

6473
- name: Build PlatformIO env:ESP32-S3_testboard-Rev5andHigher
65-
working-directory: ./Platformio
6674
run: pio run -e esp32-s3_testboard-Rev5andHigher
6775

6876
- name: Build PlatformIO env:macOS
69-
working-directory: ./Platformio
7077
run: pio run -e macOS

.github/workflows/build-platformio-ubuntu.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,18 @@ jobs:
3737
3838
3939
40+
41+
42+
43+
44+
45+
46+
47+
48+
49+
50+
51+
4052
4153
4254
@@ -50,21 +62,16 @@ jobs:
5062
run: pip install --upgrade platformio
5163

5264
- name: Build PlatformIO env:ESP32-Rev1toRev4
53-
working-directory: ./Platformio
5465
run: pio run -e esp32-Rev1toRev4
5566

5667
- name: Build PlatformIO env:ESP32_testboard-Rev1toRev4
57-
working-directory: ./Platformio
5868
run: pio run -e esp32_testboard-Rev1toRev4
5969

6070
- name: Build PlatformIO env:ESP32-S3-Rev5andHigher
61-
working-directory: ./Platformio
6271
run: pio run -e esp32-s3-Rev5andHigher
6372

6473
- name: Build PlatformIO env:ESP32-S3_testboard-Rev5andHigher
65-
working-directory: ./Platformio
6674
run: pio run -e esp32-s3_testboard-Rev5andHigher
6775

6876
- name: Build PlatformIO env:linux_64bit
69-
working-directory: ./Platformio
7077
run: pio run -e linux_64bit

.github/workflows/build-platformio-windows.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,19 @@ jobs:
3434
install: >-
3535
mingw-w64-${{matrix.env}}-gcc
3636
mingw-w64-${{matrix.env}}-SDL2
37+
# mingw-w64-${{matrix.env}}-SDL2_image
38+
- name: Install MSYS2 MINGW64 SDL2_image
39+
if: ${{matrix.sys == 'mingw64'}}
40+
uses: msys2/setup-msys2@v2
41+
with:
42+
msystem: ${{matrix.sys}}
43+
install: >-
3744
mingw-w64-${{matrix.env}}-SDL2_image
45+
- name: Install MSYS2 MINGW32 SDL2_image
46+
if: ${{matrix.sys == 'mingw32'}}
47+
shell: msys2 {0}
48+
run: |
49+
pacman --noconfirm -U https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-SDL2_image-2.8.8-1-any.pkg.tar.zst
3850
- name: Add paths mingw64
3951
if: ${{matrix.sys == 'mingw64'}}
4052
run: |
@@ -50,27 +62,21 @@ jobs:
5062
run: pip install --upgrade platformio
5163

5264
- name: Build PlatformIO env:ESP32-Rev1toRev4
53-
working-directory: ./Platformio
5465
run: pio run -e esp32-Rev1toRev4
5566

5667
- name: Build PlatformIO env:ESP32_testboard-Rev1toRev4
57-
working-directory: ./Platformio
5868
run: pio run -e esp32_testboard-Rev1toRev4
5969

6070
- name: Build PlatformIO env:ESP32-S3-Rev5andHigher
61-
working-directory: ./Platformio
6271
run: pio run -e esp32-s3-Rev5andHigher
6372

6473
- name: Build PlatformIO env:ESP32-S3_testboard-Rev5andHigher
65-
working-directory: ./Platformio
6674
run: pio run -e esp32-s3_testboard-Rev5andHigher
6775

6876
- name: Build PlatformIO env:windows_64bit
6977
if: ${{matrix.sys == 'mingw64'}}
70-
working-directory: ./Platformio
7178
run: pio run -e windows_64bit
7279

7380
- name: Build PlatformIO env:windows_32bit
7481
if: ${{matrix.sys == 'mingw32'}}
75-
working-directory: ./Platformio
7682
run: pio run -e windows_32bit
File renamed without changes.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,4 @@
5151
"cinttypes": "cpp",
5252
"typeinfo": "cpp"
5353
},
54-
"cmake.sourceDirectory": "${workspaceFolder}/.pio/libdeps/esp32/Adafruit BusIO"
5554
}

CAD/Button Grid.stl

-1.87 MB
Binary file not shown.

CAD/Case.stl

-2.1 MB
Binary file not shown.

CAD/Color Button.stl

-358 KB
Binary file not shown.
-1.71 MB
Binary file not shown.

0 commit comments

Comments
 (0)