v0.3.9 res

MicroPython_BUILD/components/micropython/esp32/modules/inisetup.py

@@ -7,10 +7,10 @@ def setup():
 # This file is executed on every boot (including wake-boot from deepsleep)
 import sys
 sys.path[1] = '/flash/lib'
+from m5stack import lcd, speaker, buttonA, buttonB, buttonC
 
 # ---------- M5Cloud ------------
 if True:
-    from m5stack import lcd, buttonA, buttonB
     if buttonB.isPressed():
         lcd.println('On: OFF-LINE Mode', color=lcd.ORANGE)
     else:

MicroPython_BUILD/firmware/esp32/partitions_mpy.csv

@@ -5,5 +5,5 @@
 # -------------------------------------------------------
 nvs,            data, nvs,     0x9000,  24K,
 phy_init,       data, phy,     0xf000,  4K,
-MicroPython,    app,  factory, 0x10000, 1024K,
-internalfs,     data, spiffs,  ,        3008K,
+MicroPython,    app,  factory, 0x10000, 1664K,
+internalfs,     data, spiffs,  ,        2368K,

MicroPython_BUILD/firmware/esp32/sdkconfig

@@ -101,9 +101,21 @@ CONFIG_MICROPY_STACK_SIZE=20
 CONFIG_MICROPY_HEAP_SIZE=96
 CONFIG_MICROPY_THREAD_MAX_THREADS=4
 CONFIG_MICROPY_THREAD_STACK_SIZE=4
-CONFIG_MICROPY_USE_TELNET=
+CONFIG_MICROPY_USE_TELNET=y
 CONFIG_MICROPY_USE_WEBSERVER=
-CONFIG_MICROPY_USE_FTPSERVER=
+CONFIG_MICROPY_USE_FTPSERVER=y
+
+#
+# FTP Server Configuration
+#
+CONFIG_FTPSERVER_LOG_LEVEL=1
+CONFIG_FTPSERVER_LOG_LEVEL0=
+CONFIG_FTPSERVER_LOG_LEVEL1=y
+CONFIG_FTPSERVER_LOG_LEVEL2=
+CONFIG_FTPSERVER_LOG_LEVEL3=
+CONFIG_FTPSERVER_LOG_LEVEL4=
+CONFIG_MICROPY_FTPSERVER_TIMEOUT=300
+CONFIG_MICROPY_FTPSERVER_BUFFER_SIZE=1024
 
 #
 # Modules

MicroPython_BUILD/firmware/esp32_psram/partitions_mpy.csv

@@ -5,10 +5,5 @@
 # -------------------------------------------------------
 nvs,            data, nvs,     0x9000,  24K,
 phy_init,       data, phy,     0xf000,  4K,
-<<<<<<< HEAD
 MicroPython,    app,  factory, 0x10000, 1792K,
 internalfs,     data, spiffs,  ,        2240K,
-=======
-MicroPython,    app,  factory, 0x10000, 1536K,
-internalfs,     data, spiffs,  ,        1024K,
->>>>>>> master

MicroPython_BUILD/firmware/esp32_psram/sdkconfig

@@ -19,14 +19,9 @@ CONFIG_LOG_BOOTLOADER_LEVEL_WARN=y
 CONFIG_LOG_BOOTLOADER_LEVEL_INFO=
 CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG=
 CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE=
-<<<<<<< HEAD
 CONFIG_LOG_BOOTLOADER_LEVEL=2
-CONFIG_BOOTLOADER_VDDSDIO_BOOST=y
-=======
-CONFIG_LOG_BOOTLOADER_LEVEL=3
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V=
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
->>>>>>> master
 
 #
 # Security features
@@ -84,17 +79,17 @@ CONFIG_MONITOR_BAUD=115200
 #
 CONFIG_MICROPY_HW_BOARD_NAME="M5Stack"
 CONFIG_MICROPY_HW_MCU_NAME="ESP32"
-CONFIG_MICROPY_TIMEZONE="GMT0BST"
+CONFIG_MICROPY_TIMEZONE="UTC-8"
 CONFIG_MICROPY_USE_OTA=
 CONFIG_BOOT_SET_LED=-1
 
 #
 # System settings
 #
-CONFIG_MICRO_PY_LOG_LEVEL=2
+CONFIG_MICRO_PY_LOG_LEVEL=1
 CONFIG_MICRO_PY_LOG_LEVEL0=
-CONFIG_MICRO_PY_LOG_LEVEL1=
-CONFIG_MICRO_PY_LOG_LEVEL2=y
+CONFIG_MICRO_PY_LOG_LEVEL1=y
+CONFIG_MICRO_PY_LOG_LEVEL2=
 CONFIG_MICRO_PY_LOG_LEVEL3=
 CONFIG_MICRO_PY_LOG_LEVEL4=
 CONFIG_MICRO_PY_LOG_LEVEL5=
@@ -102,7 +97,7 @@ CONFIG_MICROPY_RX_BUFFER_SIZE=1080
 CONFIG_MICROPY_USE_TASK_WDT=y
 CONFIG_MICROPY_USE_BOTH_CORES=
 CONFIG_MICROPY_TASK_PRIORITY=5
-CONFIG_MICROPY_STACK_SIZE=32
+CONFIG_MICROPY_STACK_SIZE=20
 CONFIG_MICROPY_HEAP_SIZE=3072
 CONFIG_MICROPY_THREAD_MAX_THREADS=6
 CONFIG_MICROPY_THREAD_STACK_SIZE=6
@@ -136,14 +131,14 @@ CONFIG_MICROPY_USE_MDNS=y
 CONFIG_MICROPY_USE_CURL=y
 CONFIG_MICROPY_USE_CURL_TLS=y
 CONFIG_MICROPY_USE_CURLFTP=
-CONFIG_MICROPY_USE_SSH=y
+CONFIG_MICROPY_USE_SSH=
 CONFIG_MICROPY_USE_MQTT=y
 
 #
 # MQTT Configuration
 #
 CONFIG_MQTT_PROTOCOL_311=y
-CONFIG_MQTT_PRIORITY=5
+CONFIG_MQTT_PRIORITY=4
 CONFIG_MQTT_BUFFER_SIZE_BYTE=2048
 CONFIG_MQTT_MAX_PAYLOAD_SIZE=4094
 CONFIG_MQTT_LOG_LEVEL=1
@@ -457,12 +452,12 @@ CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
 # Log output
 #
 CONFIG_LOG_DEFAULT_LEVEL_NONE=
-CONFIG_LOG_DEFAULT_LEVEL_ERROR=
-CONFIG_LOG_DEFAULT_LEVEL_WARN=y
+CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
+CONFIG_LOG_DEFAULT_LEVEL_WARN=
 CONFIG_LOG_DEFAULT_LEVEL_INFO=
 CONFIG_LOG_DEFAULT_LEVEL_DEBUG=
 CONFIG_LOG_DEFAULT_LEVEL_VERBOSE=
-CONFIG_LOG_DEFAULT_LEVEL=2
+CONFIG_LOG_DEFAULT_LEVEL=1
 CONFIG_LOG_COLORS=y
 
 #