diff --git a/MicroPython_BUILD/components/micropython/esp32/modcurl.c b/MicroPython_BUILD/components/micropython/esp32/modcurl.c index b56941d..63db367 100644 --- a/MicroPython_BUILD/components/micropython/esp32/modcurl.c +++ b/MicroPython_BUILD/components/micropython/esp32/modcurl.c @@ -415,9 +415,7 @@ STATIC mp_obj_t curl_sendmail(size_t n_args, const mp_obj_t *pos_args, mp_map_t else quickmail_set_debug_log(mailobj, NULL); const char* errmsg = NULL; - MP_THREAD_GIL_EXIT(); errmsg = quickmail_protocol_send(mailobj, mail_server, mail_port, mail_protocol, user, pass); - MP_THREAD_GIL_ENTER(); // Cleanup quickmail_destroy(mailobj); diff --git a/MicroPython_BUILD/components/micropython/esp32/mpversion.h b/MicroPython_BUILD/components/micropython/esp32/mpversion.h index 1820aab..5760e36 100644 --- a/MicroPython_BUILD/components/micropython/esp32/mpversion.h +++ b/MicroPython_BUILD/components/micropython/esp32/mpversion.h @@ -1,8 +1,8 @@ // MicroPython version info -#define MICROPY_GIT_TAG "ESP32_LoBo_v3.1.3" +#define MICROPY_GIT_TAG "ESP32_LoBo_v3.1.4" #define MICROPY_GIT_HASH "g2ddee729" -#define MICROPY_BUILD_DATE "2017-01-13" +#define MICROPY_BUILD_DATE "2017-01-14" #define MICROPY_VERSION_MAJOR (3) #define MICROPY_VERSION_MINOR (1) -#define MICROPY_VERSION_MICRO (3) -#define MICROPY_VERSION_STRING "3.1.3" +#define MICROPY_VERSION_MICRO (4) +#define MICROPY_VERSION_STRING "3.1.4" diff --git a/MicroPython_BUILD/components/micropython/extmod/vfs_native.c b/MicroPython_BUILD/components/micropython/extmod/vfs_native.c index 04d0b72..4c02754 100644 --- a/MicroPython_BUILD/components/micropython/extmod/vfs_native.c +++ b/MicroPython_BUILD/components/micropython/extmod/vfs_native.c @@ -881,6 +881,39 @@ STATIC mp_obj_t native_vfs_umount(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(native_vfs_umount_obj, native_vfs_umount); +//------------------ +int internalUmount() +{ + int res = 0; + if (native_vfs_mounted[VFS_NATIVE_TYPE_SPIFLASH]) { + #if MICROPY_USE_SPIFFS + res = esp_vfs_spiffs_unregister("internalfs"); + if (res) res = 0; + #else + if (s_wl_handle != WL_INVALID_HANDLE) res = wl_unmount(s_wl_handle); + if (res) res = 0; + #endif + native_vfs_mounted[VFS_NATIVE_TYPE_SPIFLASH] = false; + } + return res; +} + +//----------------- +int externalUmount() +{ + int res = 0; + if (native_vfs_mounted[VFS_NATIVE_TYPE_SDCARD]) { + esp_vfs_fat_sdmmc_unmount(); + if (res) res = 0; + #if defined(CONFIG_SDCARD_MODE1) + sdspi_host_deinit(); + #endif + native_vfs_mounted[VFS_NATIVE_TYPE_SDCARD] = false; + } + + return res; +} + //------------------------------------- int mount_vfs(int type, char *chdir_to) @@ -913,38 +946,6 @@ int mount_vfs(int type, char *chdir_to) return 0; } -//------------------ -int internalUmount() -{ - int res = 0; - if (native_vfs_mounted[VFS_NATIVE_TYPE_SPIFLASH]) { - #if MICROPY_USE_SPIFFS - res = esp_vfs_spiffs_unregister(NULL); - if (res) res = 0; - #else - if (s_wl_handle != WL_INVALID_HANDLE) res = wl_unmount(s_wl_handle); - if (res) res = 0; - #endif - } - return res; -} - -//----------------- -int externalUmount() -{ - int res = 0; - if (native_vfs_mounted[VFS_NATIVE_TYPE_SDCARD]) { - esp_vfs_fat_sdmmc_unmount(); - if (res) res = 0; - #if defined(CONFIG_SDCARD_MODE1) - sdspi_host_deinit(); - #endif - } - - return res; -} - - //=============================================================== STATIC const mp_rom_map_elem_t native_vfs_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_mkfs), MP_ROM_PTR(&native_vfs_mkfs_obj) }, diff --git a/MicroPython_BUILD/firmware/MicroPython_LoBo_Firmwares.zip b/MicroPython_BUILD/firmware/MicroPython_LoBo_Firmwares.zip index 641e3ea..0209089 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 41220ed..1ed0048 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 324485c..95486fb 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_ota/MicroPython.bin b/MicroPython_BUILD/firmware/esp32_ota/MicroPython.bin index 4091a9c..5ffd24b 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 6b7c4e8..876f366 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/partitions_mpy.bin b/MicroPython_BUILD/firmware/esp32_ota/partitions_mpy.bin index cea3bc1..f6e93f0 100644 Binary files a/MicroPython_BUILD/firmware/esp32_ota/partitions_mpy.bin and b/MicroPython_BUILD/firmware/esp32_ota/partitions_mpy.bin differ diff --git a/MicroPython_BUILD/firmware/esp32_ota/partitions_mpy.csv b/MicroPython_BUILD/firmware/esp32_ota/partitions_mpy.csv index 7292f6a..48e0d8d 100644 --- a/MicroPython_BUILD/firmware/esp32_ota/partitions_mpy.csv +++ b/MicroPython_BUILD/firmware/esp32_ota/partitions_mpy.csv @@ -6,6 +6,6 @@ nvs, data, nvs, 0x9000, 16K, otadata, data, ota, 0xd000, 8K, phy_init, data, phy, 0xf000, 4K, -MicroPython_1, app, ota_0, 0x10000, 1280K, -MicroPython_2, app, ota_1, , 1280K, +MicroPython_1, app, ota_0, 0x10000, 1344K, +MicroPython_2, app, ota_1, , 1344K, internalfs, data, spiffs, , 1024K, diff --git a/MicroPython_BUILD/firmware/esp32_psram/MicroPython.bin b/MicroPython_BUILD/firmware/esp32_psram/MicroPython.bin index c6ba19e..3a43555 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 70d3913..8ba34a2 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_all/MicroPython.bin b/MicroPython_BUILD/firmware/esp32_psram_all/MicroPython.bin index 32f98d8..6c02f7e 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 25e6397..2cd39c2 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_ota/MicroPython.bin b/MicroPython_BUILD/firmware/esp32_psram_ota/MicroPython.bin index ce4805c..4388f94 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 559fa80..d9ba6bf 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/partitions_mpy.bin b/MicroPython_BUILD/firmware/esp32_psram_ota/partitions_mpy.bin index b7381da..abf0568 100644 Binary files a/MicroPython_BUILD/firmware/esp32_psram_ota/partitions_mpy.bin and b/MicroPython_BUILD/firmware/esp32_psram_ota/partitions_mpy.bin differ diff --git a/MicroPython_BUILD/firmware/esp32_psram_ota/partitions_mpy.csv b/MicroPython_BUILD/firmware/esp32_psram_ota/partitions_mpy.csv index ecf2463..d678431 100644 --- a/MicroPython_BUILD/firmware/esp32_psram_ota/partitions_mpy.csv +++ b/MicroPython_BUILD/firmware/esp32_psram_ota/partitions_mpy.csv @@ -6,6 +6,6 @@ nvs, data, nvs, 0x9000, 16K, otadata, data, ota, 0xd000, 8K, phy_init, data, phy, 0xf000, 4K, -MicroPython_1, app, ota_0, 0x10000, 1408K, -MicroPython_2, app, ota_1, , 1408K, +MicroPython_1, app, ota_0, 0x10000, 1472K, +MicroPython_2, app, ota_1, , 1472K, internalfs, data, spiffs, , 1024K,