Skip to content

Commit def5bf8

Browse files
217heidai217heidai
committed
update
1 parent d3cca0c commit def5bf8

File tree

3 files changed

+24
-17
lines changed

3 files changed

+24
-17
lines changed

‎.github/workflows/LVGL-MicroPython.yml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
info:
21-
- '{ "BOARD": "ESP32_GENERIC", "BOARD_VARIANT": "SPIRAM", "FLASH": "4" }'
22-
- '{ "BOARD": "ESP32_GENERIC", "BOARD_VARIANT": "SPIRAM", "FLASH": "8" }'
23-
- '{ "BOARD": "ESP32_GENERIC", "BOARD_VARIANT": "SPIRAM", "FLASH": "16" }'
24-
- '{ "BOARD": "ESP32_GENERIC_S3", "BOARD_VARIANT": "SPIRAM_OCT", "FLASH": "4" }'
25-
- '{ "BOARD": "ESP32_GENERIC_S3", "BOARD_VARIANT": "SPIRAM_OCT", "FLASH": "8" }'
26-
- '{ "BOARD": "ESP32_GENERIC_S3", "BOARD_VARIANT": "SPIRAM_OCT", "FLASH": "16" }'
21+
- '{ "BOARD": "ESP32_GENERIC", "BOARD_VARIANT": "SPIRAM", "FLASH": "4", "DISPLAY": "st7735", "INDEV":"" }'
22+
- '{ "BOARD": "ESP32_GENERIC_S3", "BOARD_VARIANT": "SPIRAM_OCT", "FLASH": "8", "DISPLAY": "hx8369", "INDEV":"gt911" }'
23+
- '{ "BOARD": "ESP32_GENERIC_S3", "BOARD_VARIANT": "SPIRAM_OCT", "FLASH": "16", "DISPLAY": "gc9a01", "INDEV":"" }'
2724

2825
steps:
2926
- name: Checkout
@@ -44,15 +41,23 @@ jobs:
4441
id: compile
4542
run: |
4643
cd $LVGL
47-
python3 make.py esp32 BOARD=${{ fromJSON(matrix.info).BOARD }} BOARD_VARIANT=${{ fromJSON(matrix.info).BOARD_VARIANT }} --flash-size=${{ fromJSON(matrix.info).FLASH }} DISPLAY=rgb_display DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06
44+
if [${{ fromJSON(matrix.info).INDEV }} == ""]; then
45+
python3 make.py esp32 BOARD=${{ fromJSON(matrix.info).BOARD }} BOARD_VARIANT=${{ fromJSON(matrix.info).BOARD_VARIANT }} --flash-size=${{ fromJSON(matrix.info).FLASH }} DISPLAY=${{ fromJSON(matrix.info).DISPLAY }}
46+
else
47+
python3 make.py esp32 BOARD=${{ fromJSON(matrix.info).BOARD }} BOARD_VARIANT=${{ fromJSON(matrix.info).BOARD_VARIANT }} --flash-size=${{ fromJSON(matrix.info).FLASH }} DISPLAY=${{ fromJSON(matrix.info).DISPLAY }} INDEV=${{ fromJSON(matrix.info).INDEV }}
48+
fi
4849
echo "status=success" >> $GITHUB_OUTPUT
4950
echo "COMPILE_DATE=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
5051
5152
- name: Organize compiled firmware
5253
if: steps.compile.outputs.status == 'success' && !cancelled()
5354
run: |
5455
cd $LVGL/build
55-
mv lvgl_micropy_${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }}-${{ fromJSON(matrix.info).FLASH }}_FLASH.bin LVGL_${{ env.LVGL_VERSION }}-${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }}-N${{ fromJSON(matrix.info).FLASH }}-${{ env.COMPILE_DATE }}.bin
56+
if [${{ fromJSON(matrix.info).INDEV }} == ""]; then
57+
mv lvgl_micropy_${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }}-${{ fromJSON(matrix.info).FLASH }}_FLASH.bin LVGL_${{ env.LVGL_VERSION }}-${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }}-N${{ fromJSON(matrix.info).FLASH }}-${{ fromJSON(matrix.info).DISPLAY }}-${{ env.COMPILE_DATE }}.bin
58+
else
59+
mv lvgl_micropy_${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }}-${{ fromJSON(matrix.info).FLASH }}_FLASH.bin LVGL_${{ env.LVGL_VERSION }}-${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }}-N${{ fromJSON(matrix.info).FLASH }}-${{ fromJSON(matrix.info).DISPLAY }}-${{ fromJSON(matrix.info).INDEV }}-${{ env.COMPILE_DATE }}.bin
60+
fi
5661
5762
- name: Upload firmware to release
5863
if: steps.compile.outputs.status == 'success' && !cancelled()

‎.github/workflows/MicroPython.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,26 +75,28 @@ jobs:
7575
make submodules
7676
make V=1 BOARD=${{ fromJSON(matrix.info).BOARD }} BOARD_VARIANT=${{ fromJSON(matrix.info).BOARD_VARIANT }}
7777
echo "status=success" >> $GITHUB_OUTPUT
78-
echo "COMPILE_DATE=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
78+
echo "OUTPUT=$($MICROPYTHON/ports/esp32/build-${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }})" >> $GITHUB_ENV
79+
echo "FIREMWARE=$(MicroPython_${{ env.MICROPYTHON_VERSION }}-${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }}-N${{ fromJSON(matrix.info).FLASH }}.bin)" >> $GITHUB_ENV
7980
8081
- name: Organize compiled firmware
82+
id: firmware
8183
if: steps.compile.outputs.status == 'success' && !cancelled()
8284
run: |
83-
cd $MICROPYTHON/ports/esp32/build-${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }}
84-
mv firmware.bin MicroPython_${{ env.MICROPYTHON_VERSION }}-${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }}-N${{ fromJSON(matrix.info).FLASH }}-${{ env.COMPILE_DATE }}.bin
85+
cd ${{ env.OUTPUT }}
86+
mv firmware.bin ${{ env.FIREMWARE }}
8587
8688
- name: Upload firmware to release
8789
if: steps.compile.outputs.status == 'success' && !cancelled()
8890
uses: svenstaro/upload-release-action@v2
8991
with:
9092
repo_token: ${{ secrets.GITHUB_TOKEN }}
91-
file: ${{ env.MICROPYTHON }}/ports/esp32/build-${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }}/MicroPython_${{ env.MICROPYTHON_VERSION }}-${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }}-N${{ fromJSON(matrix.info).FLASH }}-${{ env.COMPILE_DATE }}.bin
92-
asset_name: MicroPython_${{ env.MICROPYTHON_VERSION }}-${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }}-N${{ fromJSON(matrix.info).FLASH }}-${{ env.COMPILE_DATE }}.bin
93+
file: ${{ env.OUTPUT }}/${{ env.FIREMWARE }}
94+
asset_name: ${{ env.FIREMWARE }}
9395
tag: MicroPython-${{ env.MICROPYTHON_VERSION }}
9496
body: |
9597
### MicroPython Firmware For ESP32
96-
1. ESP32-NX: ESP32、ESP32-WROOM、ESP32-WROVER、ESP32-SOLO、ESP32-PICO、ESP32-MINI with SPIRAM and xMib Flash
97-
2. ESP32-S3-NX: ESP32-S3、ESP32-S3-WROOM、ESP32-S3-MINI with Octal-SPIRAM and xMib Flash
98+
1. ESP32_GENERIC-SPIRAM-Nx: ESP32、ESP32-WROOM、ESP32-WROVER、ESP32-SOLO、ESP32-PICO、ESP32-MINI with SPIRAM and xMib Flash
99+
2. ESP32_GENERIC_S3-SPIRAM_OCT-Nx: ESP32-S3、ESP32-S3-WROOM、ESP32-S3-MINI with Octal-SPIRAM and xMib Flash
98100
overwrite: true
99101

100102
Delete_Workflow:

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ MicroPython、LVGL firmware for ESP32.
66
MicroPython: v1.24.1
77
ESP-IDF: v5.2.2
88
### Board
9-
1. ESP32-NX: ESP32、ESP32-WROOM、ESP32-WROVER、ESP32-SOLO、ESP32-PICO、ESP32-MINI with SPIRAM and xMib Flash
10-
2. ESP32-S3-NX: ESP32-S3、ESP32-S3-WROOM、ESP32-S3-MINI with Octal-SPIRAM and xMib Flash
9+
1. ESP32_GENERIC-SPIRAM-Nx: ESP32、ESP32-WROOM、ESP32-WROVER、ESP32-SOLO、ESP32-PICO、ESP32-MINI with SPIRAM and xMib Flash
10+
2. ESP32_GENERIC_S3-SPIRAM_OCT-Nx: ESP32-S3、ESP32-S3-WROOM、ESP32-S3-MINI with Octal-SPIRAM and xMib Flash
1111

1212
## [LVGL-MicroPython](https://github.com/kdschlosser/lvgl_micropython)
1313
A modified LVGL binding for Micropython.

0 commit comments

Comments
 (0)