diff --git a/MicroPython_BUILD/.gitignore b/MicroPython_BUILD/.gitignore index ab24ac9..872a37c 100644 --- a/MicroPython_BUILD/.gitignore +++ b/MicroPython_BUILD/.gitignore @@ -22,6 +22,7 @@ build/ patches/ +partitions_mpy.csv sdkconfig sdkconfig.old _sdkconfig.saved diff --git a/MicroPython_BUILD/components/micropython/extmod/utime_mphal.c b/MicroPython_BUILD/components/micropython/extmod/utime_mphal.c index 51dd835..9f97feb 100644 --- a/MicroPython_BUILD/components/micropython/extmod/utime_mphal.c +++ b/MicroPython_BUILD/components/micropython/extmod/utime_mphal.c @@ -36,24 +36,34 @@ #include "py/runtime.h" #include "extmod/utime_mphal.h" -//---------------------------------------------- -STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) { +//------------------------------------------------------------------ +STATIC mp_obj_t time_sleep(mp_uint_t n_args, const mp_obj_t *args) { #if MICROPY_PY_BUILTINS_FLOAT - uint32_t t = mp_hal_delay_ms((mp_uint_t)(1000 * mp_obj_get_float(seconds_o))); + uint32_t t = mp_hal_delay_ms((mp_uint_t)(1000 * mp_obj_get_float(args[0]))); #else - uint32_t t = mp_hal_delay_ms(1000 * mp_obj_get_int(seconds_o)); + uint32_t t = mp_hal_delay_ms(1000 * mp_obj_get_int(args[0])); #endif - return MP_OBJ_NEW_SMALL_INT(t); + if ((n_args > 1) && (mp_obj_is_true(args[1]))) { + #if MICROPY_PY_BUILTINS_FLOAT + return mp_obj_new_float((float)t / 1000.0); + #else + return MP_OBJ_NEW_SMALL_INT(t); + #endif + } + return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_1(mp_utime_sleep_obj, time_sleep); +MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_utime_sleep_obj, 1, 2, time_sleep); -//------------------------------------------- -STATIC mp_obj_t time_sleep_ms(mp_obj_t arg) { - mp_int_t ms = mp_obj_get_int(arg); +//--------------------------------------------------------------------- +STATIC mp_obj_t time_sleep_ms(mp_uint_t n_args, const mp_obj_t *args) { + mp_int_t ms = mp_obj_get_int(args[0]); uint32_t t = mp_hal_delay_ms(ms); - return MP_OBJ_NEW_SMALL_INT(t); + if ((n_args > 1) && (mp_obj_is_true(args[1]))) { + return MP_OBJ_NEW_SMALL_INT(t); + } + return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_1(mp_utime_sleep_ms_obj, time_sleep_ms); +MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_utime_sleep_ms_obj, 1, 2, time_sleep_ms); //------------------------------------------- STATIC mp_obj_t time_sleep_us(mp_obj_t arg) { diff --git a/MicroPython_BUILD/components/micropython/extmod/utime_mphal.h b/MicroPython_BUILD/components/micropython/extmod/utime_mphal.h index 087a52b..bc517e9 100644 --- a/MicroPython_BUILD/components/micropython/extmod/utime_mphal.h +++ b/MicroPython_BUILD/components/micropython/extmod/utime_mphal.h @@ -29,8 +29,8 @@ #include "py/obj.h" -MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_sleep_obj); -MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_sleep_ms_obj); +MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_utime_sleep_obj); +MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_utime_sleep_ms_obj); MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_sleep_us_obj); MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_ticks_ms_obj); MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_ticks_us_obj); diff --git a/MicroPython_BUILD/firmware/MicroPython_LoBo_Firmwares.zip b/MicroPython_BUILD/firmware/MicroPython_LoBo_Firmwares.zip index 49e3e64..20327c9 100644 Binary files a/MicroPython_BUILD/firmware/MicroPython_LoBo_Firmwares.zip and b/MicroPython_BUILD/firmware/MicroPython_LoBo_Firmwares.zip differ diff --git a/MicroPython_BUILD/firmware/esp32/MicroPython.bin b/MicroPython_BUILD/firmware/esp32/MicroPython.bin index ff3fb38..b21926c 100644 Binary files a/MicroPython_BUILD/firmware/esp32/MicroPython.bin and b/MicroPython_BUILD/firmware/esp32/MicroPython.bin differ diff --git a/MicroPython_BUILD/firmware/esp32/bootloader/bootloader.bin b/MicroPython_BUILD/firmware/esp32/bootloader/bootloader.bin index 1ca4a0c..3d208e0 100644 Binary files a/MicroPython_BUILD/firmware/esp32/bootloader/bootloader.bin and b/MicroPython_BUILD/firmware/esp32/bootloader/bootloader.bin differ diff --git a/MicroPython_BUILD/firmware/esp32/flash.sh b/MicroPython_BUILD/firmware/esp32/flash.sh index f691430..39e917a 100755 --- a/MicroPython_BUILD/firmware/esp32/flash.sh +++ b/MicroPython_BUILD/firmware/esp32/flash.sh @@ -1,2 +1,2 @@ #!/bin/bash -esptool.py --chip esp32 --port /dev/ttyUSB1 --baud 921600 --before default_reset --after no_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 bootloader/bootloader.bin 0xf000 phy_init_data.bin 0x10000 MicroPython.bin 0x8000 partitions_mpy.bin +esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 --before default_reset --after no_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 bootloader/bootloader.bin 0xf000 phy_init_data.bin 0x10000 MicroPython.bin 0x8000 partitions_mpy.bin diff --git a/MicroPython_BUILD/firmware/esp32_ota/MicroPython.bin b/MicroPython_BUILD/firmware/esp32_ota/MicroPython.bin index cb06014..bfbe393 100644 Binary files a/MicroPython_BUILD/firmware/esp32_ota/MicroPython.bin and b/MicroPython_BUILD/firmware/esp32_ota/MicroPython.bin differ diff --git a/MicroPython_BUILD/firmware/esp32_ota/bootloader/bootloader.bin b/MicroPython_BUILD/firmware/esp32_ota/bootloader/bootloader.bin index bddf2b3..68f786d 100644 Binary files a/MicroPython_BUILD/firmware/esp32_ota/bootloader/bootloader.bin and b/MicroPython_BUILD/firmware/esp32_ota/bootloader/bootloader.bin differ diff --git a/MicroPython_BUILD/firmware/esp32_ota/flash.sh b/MicroPython_BUILD/firmware/esp32_ota/flash.sh index f691430..39e917a 100755 --- a/MicroPython_BUILD/firmware/esp32_ota/flash.sh +++ b/MicroPython_BUILD/firmware/esp32_ota/flash.sh @@ -1,2 +1,2 @@ #!/bin/bash -esptool.py --chip esp32 --port /dev/ttyUSB1 --baud 921600 --before default_reset --after no_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 bootloader/bootloader.bin 0xf000 phy_init_data.bin 0x10000 MicroPython.bin 0x8000 partitions_mpy.bin +esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 --before default_reset --after no_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 bootloader/bootloader.bin 0xf000 phy_init_data.bin 0x10000 MicroPython.bin 0x8000 partitions_mpy.bin diff --git a/MicroPython_BUILD/firmware/esp32_psram/MicroPython.bin b/MicroPython_BUILD/firmware/esp32_psram/MicroPython.bin index ab26745..024a8cf 100644 Binary files a/MicroPython_BUILD/firmware/esp32_psram/MicroPython.bin and b/MicroPython_BUILD/firmware/esp32_psram/MicroPython.bin differ diff --git a/MicroPython_BUILD/firmware/esp32_psram/bootloader/bootloader.bin b/MicroPython_BUILD/firmware/esp32_psram/bootloader/bootloader.bin index 6b9112b..f44475e 100644 Binary files a/MicroPython_BUILD/firmware/esp32_psram/bootloader/bootloader.bin and b/MicroPython_BUILD/firmware/esp32_psram/bootloader/bootloader.bin differ diff --git a/MicroPython_BUILD/firmware/esp32_psram/flash.sh b/MicroPython_BUILD/firmware/esp32_psram/flash.sh index f691430..39e917a 100755 --- a/MicroPython_BUILD/firmware/esp32_psram/flash.sh +++ b/MicroPython_BUILD/firmware/esp32_psram/flash.sh @@ -1,2 +1,2 @@ #!/bin/bash -esptool.py --chip esp32 --port /dev/ttyUSB1 --baud 921600 --before default_reset --after no_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 bootloader/bootloader.bin 0xf000 phy_init_data.bin 0x10000 MicroPython.bin 0x8000 partitions_mpy.bin +esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 --before default_reset --after no_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 bootloader/bootloader.bin 0xf000 phy_init_data.bin 0x10000 MicroPython.bin 0x8000 partitions_mpy.bin diff --git a/MicroPython_BUILD/firmware/esp32_psram_all/MicroPython.bin b/MicroPython_BUILD/firmware/esp32_psram_all/MicroPython.bin index 5c29ab0..4f370ff 100644 Binary files a/MicroPython_BUILD/firmware/esp32_psram_all/MicroPython.bin and b/MicroPython_BUILD/firmware/esp32_psram_all/MicroPython.bin differ diff --git a/MicroPython_BUILD/firmware/esp32_psram_all/bootloader/bootloader.bin b/MicroPython_BUILD/firmware/esp32_psram_all/bootloader/bootloader.bin index 02497ba..22f09ce 100644 Binary files a/MicroPython_BUILD/firmware/esp32_psram_all/bootloader/bootloader.bin and b/MicroPython_BUILD/firmware/esp32_psram_all/bootloader/bootloader.bin differ diff --git a/MicroPython_BUILD/firmware/esp32_psram_all/flash.sh b/MicroPython_BUILD/firmware/esp32_psram_all/flash.sh index f691430..39e917a 100755 --- a/MicroPython_BUILD/firmware/esp32_psram_all/flash.sh +++ b/MicroPython_BUILD/firmware/esp32_psram_all/flash.sh @@ -1,2 +1,2 @@ #!/bin/bash -esptool.py --chip esp32 --port /dev/ttyUSB1 --baud 921600 --before default_reset --after no_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 bootloader/bootloader.bin 0xf000 phy_init_data.bin 0x10000 MicroPython.bin 0x8000 partitions_mpy.bin +esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 --before default_reset --after no_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 bootloader/bootloader.bin 0xf000 phy_init_data.bin 0x10000 MicroPython.bin 0x8000 partitions_mpy.bin diff --git a/MicroPython_BUILD/firmware/esp32_psram_ota/MicroPython.bin b/MicroPython_BUILD/firmware/esp32_psram_ota/MicroPython.bin index a17fbb3..fc77ac0 100644 Binary files a/MicroPython_BUILD/firmware/esp32_psram_ota/MicroPython.bin and b/MicroPython_BUILD/firmware/esp32_psram_ota/MicroPython.bin differ diff --git a/MicroPython_BUILD/firmware/esp32_psram_ota/bootloader/bootloader.bin b/MicroPython_BUILD/firmware/esp32_psram_ota/bootloader/bootloader.bin index 67f69a8..23e71ae 100644 Binary files a/MicroPython_BUILD/firmware/esp32_psram_ota/bootloader/bootloader.bin and b/MicroPython_BUILD/firmware/esp32_psram_ota/bootloader/bootloader.bin differ diff --git a/MicroPython_BUILD/firmware/esp32_psram_ota/flash.sh b/MicroPython_BUILD/firmware/esp32_psram_ota/flash.sh index f691430..39e917a 100755 --- a/MicroPython_BUILD/firmware/esp32_psram_ota/flash.sh +++ b/MicroPython_BUILD/firmware/esp32_psram_ota/flash.sh @@ -1,2 +1,2 @@ #!/bin/bash -esptool.py --chip esp32 --port /dev/ttyUSB1 --baud 921600 --before default_reset --after no_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 bootloader/bootloader.bin 0xf000 phy_init_data.bin 0x10000 MicroPython.bin 0x8000 partitions_mpy.bin +esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 --before default_reset --after no_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 bootloader/bootloader.bin 0xf000 phy_init_data.bin 0x10000 MicroPython.bin 0x8000 partitions_mpy.bin diff --git a/MicroPython_BUILD/partitions_mpy.csv b/MicroPython_BUILD/partitions_mpy.csv deleted file mode 100644 index 44b67dd..0000000 --- a/MicroPython_BUILD/partitions_mpy.csv +++ /dev/null @@ -1,9 +0,0 @@ -# ------------------------------------------------------- -# - Partition layout generaded by BUILD.sh script - -# ------------------------------------------------------- -# Name, Type, SubType, Offset, Size, Flags -# ------------------------------------------------------- -nvs, data, nvs, 0x9000, 24K, -phy_init, data, phy, 0xf000, 4K, -MicroPython, app, factory, 0x10000, 1920K, -internalfs, data, spiffs, , 1024K, diff --git a/MicroPython_BUILD/sdkconfig.fw_psram_all b/MicroPython_BUILD/sdkconfig.fw_psram_all index 1ef8aff..935b42a 100644 --- a/MicroPython_BUILD/sdkconfig.fw_psram_all +++ b/MicroPython_BUILD/sdkconfig.fw_psram_all @@ -31,7 +31,7 @@ CONFIG_FLASH_ENCRYPTION_ENABLED= # # Serial flasher config # -CONFIG_ESPTOOLPY_PORT="/dev/ttyUSB1" +CONFIG_ESPTOOLPY_PORT="/dev/ttyUSB0" CONFIG_ESPTOOLPY_BAUD_115200B= CONFIG_ESPTOOLPY_BAUD_230400B= CONFIG_ESPTOOLPY_BAUD_921600B=y @@ -122,7 +122,7 @@ CONFIG_MICROPY_PY_FRAMEBUF=y CONFIG_MICROPY_PY_USE_BTREE=y CONFIG_MICROPY_USE_WEBSOCKETS=y CONFIG_MICROPY_USE_GSM=y -CONFIG_MICROPY_USE_ETHERNET=y +CONFIG_MICROPY_USE_ETHERNET= CONFIG_MICROPY_USE_MDNS=y CONFIG_MICROPY_USE_CURL=y CONFIG_MICROPY_USE_CURL_TLS=y