Skip to content

Commit 09b84cc

Browse files
217heidai217heidai
committed
update
1 parent 2c3c748 commit 09b84cc

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

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

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,44 +31,41 @@ jobs:
3131
sudo apt-get update -y
3232
sudo apt-get install -y build-essential libffi-dev git pkg-config
3333
sudo apt-get install -y git wget flex bison gperf python3 python3-venv cmake ninja-build ccache libffi-dev libssl-dev dfu-util libusb-1.0-0 python-is-python3 pip
34-
sudo timedatectl set-timezone "$TZ"
34+
sudo timedatectl set-timezone "${{env.TZ}}"
3535
3636
- name: Clone LVGL
3737
run: |
38-
git clone --depth=1 $LVGL_REPO $LVGL
38+
git clone --depth=1 ${{env.LVGL_REPO}} ${{env.LVGL}}
3939
4040
- name: Compile the firmware
4141
id: compile
4242
run: |
43-
cd $LVGL
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-
echo "COMPILE_DATE=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
47-
echo "OUTPUT="
43+
echo "COMPILE_DATE=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
44+
cd ${{env.LVGL}}
45+
if [${{fromJSON(matrix.info).INDEV}} == ""]; then
46+
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}}
47+
echo "FIREMWARE=LVGL-${{fromJSON(matrix.info).BOARD}}_${{fromJSON(matrix.info).BOARD_VARIANT}}_N${{fromJSON(matrix.info).FLASH}}_${{fromJSON(matrix.info).DISPLAY}}-${{env.LVGL_VERSION}}-${{env.COMPILE_DATE}}.bin" >> $GITHUB_ENV
4848
else
49-
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 }}
50-
echo "COMPILE_DATE=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
49+
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}}
50+
echo "FIREMWARE=LVGL-${{fromJSON(matrix.info).BOARD}}_${{fromJSON(matrix.info).BOARD_VARIANT}}_N${{fromJSON(matrix.info).FLASH}}_${{fromJSON(matrix.info).DISPLAY}}_${{fromJSON(matrix.info).INDEV}}-${{env.LVGL_VERSION}}-${{env.COMPILE_DATE}}.bin" >> $GITHUB_ENV
5151
fi
52+
echo "OUTPUT=${{env.LVGL}}/build" >> $GITHUB_ENV
53+
echo "FIREMWARE_ORIGIN=lvgl_micropy_${{fromJSON(matrix.info).BOARD}}-${{fromJSON(matrix.info).BOARD_VARIANT}}-${{fromJSON(matrix.info).FLASH}}_FLASH.bin" >> $GITHUB_ENV
5254
echo "status=success" >> $GITHUB_OUTPUT
5355
5456
- name: Organize compiled firmware
5557
if: steps.compile.outputs.status == 'success' && !cancelled()
5658
run: |
57-
cd $LVGL/build
58-
if [${{ fromJSON(matrix.info).INDEV }} == ""]; then
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 }}-${{ env.COMPILE_DATE }}.bin
60-
else
61-
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
62-
fi
59+
mv ${{env.OUTPUT}}/${{env.FIREMWARE_ORIGIN}} ${{env.OUTPUT}}/${{env.FIREMWARE}}
6360
6461
- name: Upload firmware to release
6562
if: steps.compile.outputs.status == 'success' && !cancelled()
6663
uses: svenstaro/upload-release-action@v2
6764
with:
68-
repo_token: ${{ secrets.GITHUB_TOKEN }}
69-
file: ${{ env.LVGL }}/build/LVGL_${{ env.LVGL_VERSION }}-${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }}-N${{ fromJSON(matrix.info).FLASH }}-${{ env.COMPILE_DATE }}.bin
70-
asset_name: LVGL_${{ env.LVGL_VERSION }}-${{ fromJSON(matrix.info).BOARD }}-${{ fromJSON(matrix.info).BOARD_VARIANT }}-N${{ fromJSON(matrix.info).FLASH }}-${{ env.COMPILE_DATE }}.bin
71-
tag: LVGL-MicroPython-${{ env.LVGL_VERSION }}
65+
repo_token: ${{secrets.GITHUB_TOKEN}}
66+
file: ${{env.OUTPUT}}/${{env.FIREMWARE}}
67+
asset_name: ${{env.FIREMWARE}}
68+
tag: LVGL-MicroPython-${{env.LVGL_VERSION}}
7269
body: |
7370
### LVGL & MicroPython Firmware For ESP32
7471
[LVGL-MicroPython](https://github.com/kdschlosser/lvgl_micropython)

‎.github/workflows/MicroPython.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ env:
1010
ESPIDF: esp-idf
1111
ESPIDF_REPO: https://github.com/espressif/esp-idf.git
1212
ESPIDF_VERSION: v5.2.2
13+
TZ: Asia/Shanghai
1314

1415
jobs:
1516
MicroPython_ESP32:
@@ -36,6 +37,7 @@ jobs:
3637
sudo apt-get update -y
3738
sudo apt-get install -y build-essential libffi-dev git pkg-config
3839
sudo apt-get install -y git wget flex bison gperf python3 python3-venv cmake ninja-build ccache libffi-dev libssl-dev dfu-util libusb-1.0-0 python-is-python3 pip
40+
sudo timedatectl set-timezone "${{env.TZ}}"
3941
4042
- name: Clone ESP-IDF
4143
run: |
@@ -66,6 +68,7 @@ jobs:
6668
- name: Compile the firmware
6769
id: compile
6870
run: |
71+
echo "COMPILE_DATE=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
6972
source ${{env.ESPIDF}}/export.sh
7073
cd ${{env.MICROPYTHON}}
7174
make -C mpy-cross
@@ -74,13 +77,14 @@ jobs:
7477
make V=1 BOARD=${{fromJSON(matrix.info).BOARD}} BOARD_VARIANT=${{fromJSON(matrix.info).BOARD_VARIANT}}
7578
echo "status=success" >> $GITHUB_OUTPUT
7679
echo "OUTPUT=${{env.MICROPYTHON}}/ports/esp32/build-${{fromJSON(matrix.info).BOARD}}-${{fromJSON(matrix.info).BOARD_VARIANT}}" >> $GITHUB_ENV
77-
echo "FIREMWARE=MicroPython-${{fromJSON(matrix.info).BOARD}}_${{fromJSON(matrix.info).BOARD_VARIANT}}_N${{fromJSON(matrix.info).FLASH}}-${{env.MICROPYTHON_VERSION}}.bin" >> $GITHUB_ENV
80+
echo "FIREMWARE_ORIGIN=firmware.bin" >> $GITHUB_ENV
81+
echo "FIREMWARE=MicroPython-${{fromJSON(matrix.info).BOARD}}_${{fromJSON(matrix.info).BOARD_VARIANT}}_N${{fromJSON(matrix.info).FLASH}}-${{env.MICROPYTHON_VERSION}}-${{env.COMPILE_DATE}}.bin" >> $GITHUB_ENV
7882
7983
- name: Organize compiled firmware
8084
id: firmware
8185
if: steps.compile.outputs.status == 'success' && !cancelled()
8286
run: |
83-
mv ${{env.OUTPUT}}/firmware.bin ${{env.OUTPUT}}/${{env.FIREMWARE}}
87+
mv ${{env.OUTPUT}}/${{env.FIREMWARE_ORIGIN}} ${{env.OUTPUT}}/${{env.FIREMWARE}}
8488
8589
- name: Upload firmware to release
8690
if: steps.compile.outputs.status == 'success' && !cancelled()
@@ -92,8 +96,8 @@ jobs:
9296
tag: MicroPython-${{env.MICROPYTHON_VERSION}}
9397
body: |
9498
### MicroPython Firmware For ESP32
95-
1. ESP32_GENERIC_SPIRAM_Nx: ESP32、ESP32-WROOM、ESP32-WROVER、ESP32-SOLO、ESP32-PICO、ESP32-MINI with SPIRAM and xMib Flash
96-
2. ESP32_GENERIC_S3_SPIRAM_OCT_Nx: ESP32-S3、ESP32-S3-WROOM、ESP32-S3-MINI with Octal-SPIRAM and xMib Flash
99+
1. ESP32_GENERIC_SPIRAM_Nx: ESP32、ESP32-WROOM、ESP32-WROVER、ESP32-SOLO、ESP32-PICO、ESP32-MINI with SPIRAM and xMiB Flash
100+
2. ESP32_GENERIC_S3_SPIRAM_OCT_Nx: ESP32-S3、ESP32-S3-WROOM、ESP32-S3-MINI with Octal-SPIRAM and xMiB Flash
97101
overwrite: true
98102

99103
Delete_Workflow:

‎README.md‎

Lines changed: 3 additions & 4 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_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
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.
@@ -16,7 +16,6 @@ LVGL: v9.1.0
1616
MicroPython: v1.23.0
1717
ESP-IDF: v5.2.0
1818
## Board
19-
* [ ] ESP32-WROVER-B-N4R8
20-
* [ ] ESP32-WROVER-E-N16R8
19+
* [x] ESP32-WROVER-B-N4R8
2120
* [x] ESP32-S3-N8R8
2221
* [x] ESP32-S3-N16R8

0 commit comments

Comments
 (0)