Skip to content

Commit b44341d

Browse files
committed
fix MicroPython Compiler
1 parent 1053b3a commit b44341d

File tree

6 files changed

+4
-26
lines changed

6 files changed

+4
-26
lines changed

.github/workflows/MicroPython.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
cd ${{env.ESPIDF}}
4646
git checkout ${{env.ESPIDF_VERSION}}
4747
git submodule update --init --recursive
48+
./install.sh
4849
4950
- name: Clone MicroPython
5051
run: |
@@ -58,15 +59,12 @@ jobs:
5859
wget -P ${{env.MICROPYTHON}}/ports/esp32/modules https://raw.githubusercontent.com/Josverl/micropython-stubs/main/mip/typing.py
5960
wget -P ${{env.MICROPYTHON}}/ports/esp32/modules https://raw.githubusercontent.com/micropython/micropython-lib/master/python-stdlib/logging/logging.py
6061
wget -P ${{env.MICROPYTHON}}/ports/esp32/modules https://raw.githubusercontent.com/micropython/micropython-lib/master/micropython/drivers/storage/sdcard/sdcard.py
61-
rm -rf ${{env.MICROPYTHON}}/ports/esp32/boards/${{fromJSON(matrix.info).BOARD}}/mpconfigboard.cmake
6262
rm -rf ${{env.MICROPYTHON}}/ports/esp32/boards/${{fromJSON(matrix.info).BOARD}}/sdkconfig.board
63-
mv config/micropython/${{fromJSON(matrix.info).BOARD}}.mpconfigboard ${{env.MICROPYTHON}}/ports/esp32/boards/${{fromJSON(matrix.info).BOARD}}/mpconfigboard.cmake
6463
mv config/micropython/N${{fromJSON(matrix.info).FLASH}}.sdkconfig ${{env.MICROPYTHON}}/ports/esp32/boards/${{fromJSON(matrix.info).BOARD}}/sdkconfig.board
6564
6665
- name: Compile the firmware
6766
id: compile
6867
run: |
69-
./${{env.ESPIDF}}/install.sh esp32
7068
source ${{env.ESPIDF}}/export.sh
7169
cd ${{env.MICROPYTHON}}
7270
make -C mpy-cross

config/micropython/ESP32_GENERIC.mpconfigboard

Lines changed: 0 additions & 7 deletions
This file was deleted.

config/micropython/ESP32_GENERIC_S3.mpconfigboard

Lines changed: 0 additions & 10 deletions
This file was deleted.

config/micropython/N16.sdkconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
22
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
3-
CONFIG_ESPTOOLPY_AFTER_NORESET=y
43

54
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
65
CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
76
CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
87
CONFIG_PARTITION_TABLE_CUSTOM=y
9-
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MiB.csv"
8+
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MiBplus.csv"

config/micropython/N4.sdkconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
22
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
3-
CONFIG_ESPTOOLPY_AFTER_NORESET=y
43

54
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
65
CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
76
CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
87
CONFIG_PARTITION_TABLE_CUSTOM=y
9-
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MiB.csv"
8+
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MiBplus.csv"

config/micropython/N8.sdkconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
22
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
3-
CONFIG_ESPTOOLPY_AFTER_NORESET=y
43

54
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
65
CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
76
CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
87
CONFIG_PARTITION_TABLE_CUSTOM=y
9-
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"
8+
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MiBplus.csv"

0 commit comments

Comments
 (0)