diff --git a/MicroPython_BUILD/BUILD.sh b/MicroPython_BUILD/BUILD.sh index 3ec9f81..a16bdf6 100755 --- a/MicroPython_BUILD/BUILD.sh +++ b/MicroPython_BUILD/BUILD.sh @@ -48,7 +48,7 @@ #======================= -TOOLS_VER=ver20180408.id +TOOLS_VER=ver20180412.id #======================= # ----------------------------- diff --git a/MicroPython_BUILD/components/micropython/esp32/mpversion.h b/MicroPython_BUILD/components/micropython/esp32/mpversion.h index 1d40833..f97137c 100644 --- a/MicroPython_BUILD/components/micropython/esp32/mpversion.h +++ b/MicroPython_BUILD/components/micropython/esp32/mpversion.h @@ -24,12 +24,12 @@ * THE SOFTWARE. */ -#define MICROPY_GIT_TAG "ESP32_LoBo_v3.2.7" -#define MICROPY_GIT_HASH "gf586f5e6" +#define MICROPY_GIT_TAG "ESP32_LoBo_v3.2.9" +#define MICROPY_GIT_HASH "gbae9709a" #define MICROPY_BUILD_DATE "2018-04-12" #define MICROPY_VERSION_MAJOR (3) #define MICROPY_VERSION_MINOR (2) -#define MICROPY_VERSION_MICRO (7) -#define MICROPY_VERSION_STRING "3.2.7" +#define MICROPY_VERSION_MICRO (9) +#define MICROPY_VERSION_STRING "3.2.9" #define MICROPY_CORE_VERSION "59dda71" #define MICROPY_CORE_DATE "2018-04-10" diff --git a/MicroPython_BUILD/components/micropython/extmod/vfs_native.c b/MicroPython_BUILD/components/micropython/extmod/vfs_native.c index 5374f37..4e1ffe7 100644 --- a/MicroPython_BUILD/components/micropython/extmod/vfs_native.c +++ b/MicroPython_BUILD/components/micropython/extmod/vfs_native.c @@ -712,6 +712,31 @@ STATIC void sdcard_print_info(const sdmmc_card_t* card, int mode) #endif } +//-------------------------------------------------------------- +static void _setPins(int8_t p1, int8_t p2, int8_t p3, int8_t p4) +{ + if (p1 >= 0) { + gpio_pad_select_gpio(p1); + gpio_set_direction(p1, GPIO_MODE_INPUT); + gpio_set_pull_mode(p1, GPIO_PULLUP_ONLY); + } + if (p2 >= 0) { + gpio_pad_select_gpio(p2); + gpio_set_direction(p2, GPIO_MODE_INPUT); + gpio_set_pull_mode(p2, GPIO_PULLUP_ONLY); + } + if (p3 >= 0) { + gpio_pad_select_gpio(p3); + gpio_set_direction(p3, GPIO_MODE_INPUT); + gpio_set_pull_mode(p3, GPIO_PULLUP_ONLY); + } + if (p4 >= 0) { + gpio_pad_select_gpio(p4); + gpio_set_direction(p4, GPIO_MODE_INPUT); + gpio_set_pull_mode(p4, GPIO_PULLUP_ONLY); + } +} + //------------------------- static void _sdcard_mount() { @@ -729,17 +754,9 @@ static void _sdcard_mount() sdspi_slot_config_t slot_config = SDSPI_SLOT_CONFIG_DEFAULT(); host.slot = VSPI_HOST; host.max_freq_khz = SDMMC_FREQ_HIGHSPEED; - slot_config.dma_channel = 2; - gpio_pad_select_gpio(sdcard_config.miso); - gpio_pad_select_gpio(sdcard_config.mosi); - gpio_pad_select_gpio(sdcard_config.clk); - gpio_pad_select_gpio(sdcard_config.cs); - gpio_set_direction(sdcard_config.miso, GPIO_MODE_INPUT); - gpio_set_pull_mode(sdcard_config.miso, GPIO_PULLUP_ONLY); - gpio_set_pull_mode(sdcard_config.clk, GPIO_PULLUP_ONLY); - gpio_set_pull_mode(sdcard_config.mosi, GPIO_PULLUP_ONLY); - gpio_set_pull_mode(sdcard_config.cs, GPIO_PULLUP_ONLY); + _setPins(sdcard_config.miso, sdcard_config.mosi, sdcard_config.clk, sdcard_config.cs); + slot_config.gpio_miso = sdcard_config.miso; slot_config.gpio_mosi = sdcard_config.mosi; slot_config.gpio_sck = sdcard_config.clk; @@ -750,12 +767,7 @@ static void _sdcard_mount() sdmmc_host_t host = SDMMC_HOST_DEFAULT(); sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT(); host.max_freq_khz = SDMMC_FREQ_HIGHSPEED; - gpio_pad_select_gpio(2); - gpio_pad_select_gpio(14); - gpio_pad_select_gpio(15); - gpio_set_pull_mode(2, GPIO_PULLUP_ONLY); - gpio_set_pull_mode(14, GPIO_PULLUP_ONLY); - gpio_set_pull_mode(15, GPIO_PULLUP_ONLY); + _setPins(2, 14, 15, 13); if (sdcard_config.mode == 2) { // Use 1-line SD mode host.flags = SDMMC_HOST_FLAG_1BIT; @@ -763,12 +775,7 @@ static void _sdcard_mount() } else { // Use 4-line SD mode - gpio_pad_select_gpio(4); - gpio_pad_select_gpio(12); - gpio_pad_select_gpio(13); - gpio_set_pull_mode(4, GPIO_PULLUP_ONLY); - gpio_set_pull_mode(12, GPIO_PULLUP_ONLY); - gpio_set_pull_mode(13, GPIO_PULLUP_ONLY); + _setPins(4, 12, -1, -1); } ret = esp_vfs_fat_sdmmc_mount(VFS_NATIVE_SDCARD_MOUNT_POINT, &host, &slot_config, &mount_config, &sdmmc_card); } diff --git a/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32.zip b/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32.zip index c20cb74..f6342c3 100644 Binary files a/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32.zip and b/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32.zip differ diff --git a/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_all.zip b/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_all.zip index e978184..452bbad 100644 Binary files a/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_all.zip and b/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_all.zip differ diff --git a/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_ota.zip b/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_ota.zip index c08d857..4e18c82 100644 Binary files a/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_ota.zip and b/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_ota.zip differ diff --git a/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_psram.zip b/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_psram.zip index 5d459ba..47cd533 100644 Binary files a/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_psram.zip and b/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_psram.zip differ diff --git a/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_psram_all.zip b/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_psram_all.zip index 328ed73..bc0c719 100644 Binary files a/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_psram_all.zip and b/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_psram_all.zip differ diff --git a/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_psram_ota.zip b/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_psram_ota.zip index a3bc5bd..cfd70fd 100644 Binary files a/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_psram_ota.zip and b/MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_psram_ota.zip differ diff --git a/MicroPython_BUILD/firmware/esp32/MicroPython.bin b/MicroPython_BUILD/firmware/esp32/MicroPython.bin index 1a12da5..85538bd 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 676b7ad..a6d8ceb 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_all/MicroPython.bin b/MicroPython_BUILD/firmware/esp32_all/MicroPython.bin index 1cb6a40..219894b 100644 Binary files a/MicroPython_BUILD/firmware/esp32_all/MicroPython.bin and b/MicroPython_BUILD/firmware/esp32_all/MicroPython.bin differ diff --git a/MicroPython_BUILD/firmware/esp32_all/bootloader/bootloader.bin b/MicroPython_BUILD/firmware/esp32_all/bootloader/bootloader.bin index 6c5a701..3c84786 100644 Binary files a/MicroPython_BUILD/firmware/esp32_all/bootloader/bootloader.bin and b/MicroPython_BUILD/firmware/esp32_all/bootloader/bootloader.bin differ diff --git a/MicroPython_BUILD/firmware/esp32_ota/MicroPython.bin b/MicroPython_BUILD/firmware/esp32_ota/MicroPython.bin index 99e4b98..5c3ddda 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 a62a5c9..9e5e22d 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_psram/MicroPython.bin b/MicroPython_BUILD/firmware/esp32_psram/MicroPython.bin index bd9b24f..3657223 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 7d8ceb0..cfea437 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 7abf957..878eeb7 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 f51181f..4ad4fa0 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 8d1a236..568d884 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 20b155a..ec8d9f5 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/Tools/esp-idf.tar.xz b/Tools/esp-idf.tar.xz index 5985094..e11f698 100644 Binary files a/Tools/esp-idf.tar.xz and b/Tools/esp-idf.tar.xz differ