Skip to content
This repository was archived by the owner on Aug 23, 2024. It is now read-only.

Commit 4fb09b8

Browse files
0x1abin0x1abin
committed
v0.3.9
1 parent 63f2ae4 commit 4fb09b8

5 files changed

Lines changed: 1 addition & 11 deletions

File tree

‎MicroPython_BUILD/firmware/esp32/MicroPython.bin‎

35.3 KB
Binary file not shown.

‎MicroPython_BUILD/firmware/esp32/bootloader/bootloader.bin‎

144 Bytes
Binary file not shown.

‎MicroPython_BUILD/firmware/esp32/firmware.bin‎

35.3 KB
Binary file not shown.

‎MicroPython_BUILD/firmware/esp32/partitions_mpy.csv‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,5 @@
55
# -------------------------------------------------------
66
nvs, data, nvs, 0x9000, 24K,
77
phy_init, data, phy, 0xf000, 4K,
8-
<<<<<<< HEAD
98
MicroPython, app, factory, 0x10000, 1664K,
109
internalfs, data, spiffs, , 2368K,
11-
=======
12-
MicroPython, app, factory, 0x10000, 1408K,
13-
internalfs, data, spiffs, , 1024K,
14-
>>>>>>> master

‎MicroPython_BUILD/firmware/esp32/sdkconfig‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,9 @@ CONFIG_LOG_BOOTLOADER_LEVEL_WARN=y
1919
CONFIG_LOG_BOOTLOADER_LEVEL_INFO=
2020
CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG=
2121
CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE=
22-
<<<<<<< HEAD
2322
CONFIG_LOG_BOOTLOADER_LEVEL=2
24-
CONFIG_BOOTLOADER_VDDSDIO_BOOST=y
25-
=======
26-
CONFIG_LOG_BOOTLOADER_LEVEL=3
2723
CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V=
2824
CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
29-
>>>>>>> master
3025

3126
#
3227
# Security features
@@ -84,7 +79,7 @@ CONFIG_MONITOR_BAUD=115200
8479
#
8580
CONFIG_MICROPY_HW_BOARD_NAME="M5Stack"
8681
CONFIG_MICROPY_HW_MCU_NAME="ESP32"
87-
CONFIG_MICROPY_TIMEZONE="GMT0BST"
82+
CONFIG_MICROPY_TIMEZONE="UTC+8"
8883
CONFIG_MICROPY_USE_OTA=
8984
CONFIG_BOOT_SET_LED=-1
9085

0 commit comments

Comments
 (0)