From 378b6ac0326008577bc13342f9cd093b5d62f388 Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Sun, 15 Nov 2020 08:46:23 +0200 Subject: [PATCH 1/3] Fix issue in webserver with Chrome based browsers https://github.com/espressif/arduino-esp32/issues/3652 --- libraries/WebServer/src/WebServer.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libraries/WebServer/src/WebServer.cpp b/libraries/WebServer/src/WebServer.cpp index 47e25239..35d31630 100644 --- a/libraries/WebServer/src/WebServer.cpp +++ b/libraries/WebServer/src/WebServer.cpp @@ -313,11 +313,12 @@ void WebServer::handleClient() { _contentLength = CONTENT_LENGTH_NOT_SET; _handleRequest(); - if (_currentClient.connected()) { - _currentStatus = HC_WAIT_CLOSE; - _statusChange = millis(); - keepCurrentClient = true; - } +// Fix for issue with Chrome based browsers: https://github.com/espressif/arduino-esp32/issues/3652 +// if (_currentClient.connected()) { +// _currentStatus = HC_WAIT_CLOSE; +// _statusChange = millis(); +// keepCurrentClient = true; +// } } } else { // !_currentClient.available() if (millis() - _statusChange <= HTTP_MAX_DATA_WAIT) { From d8b1fc81c03439d728f1cd469035e22a2f0380df Mon Sep 17 00:00:00 2001 From: lbernstone Date: Sat, 14 Nov 2020 23:48:21 -0700 Subject: [PATCH 2/3] Added usedBytes to match other filesystems (#4534) --- libraries/FFat/src/FFat.cpp | 15 +++++++++++++++ libraries/FFat/src/FFat.h | 1 + 2 files changed, 16 insertions(+) diff --git a/libraries/FFat/src/FFat.cpp b/libraries/FFat/src/FFat.cpp index 0d2b2cb2..6441dfca 100644 --- a/libraries/FFat/src/FFat.cpp +++ b/libraries/FFat/src/FFat.cpp @@ -135,6 +135,21 @@ size_t F_Fat::totalBytes() return tot_sect * sect_size; } +size_t F_Fat::usedBytes() +{ + FATFS *fs; + DWORD free_clust, used_sect, sect_size; + + BYTE pdrv = ff_diskio_get_pdrv_wl(_wl_handle); + char drv[3] = {(char)(48+pdrv), ':', 0}; + if ( f_getfree(drv, &free_clust, &fs) != FR_OK){ + return 0; + } + used_sect = (fs->n_fatent - 2 - free_clust) * fs->csize; + sect_size = CONFIG_WL_SECTOR_SIZE; + return used_sect * sect_size; +} + size_t F_Fat::freeBytes() { diff --git a/libraries/FFat/src/FFat.h b/libraries/FFat/src/FFat.h index a32c950b..ed20e23b 100644 --- a/libraries/FFat/src/FFat.h +++ b/libraries/FFat/src/FFat.h @@ -31,6 +31,7 @@ public: bool begin(bool formatOnFail=false, const char * basePath="/ffat", uint8_t maxOpenFiles=10, const char * partitionLabel = (char*)FFAT_PARTITION_LABEL); bool format(bool full_wipe = FFAT_WIPE_QUICK, char* partitionLabel = (char*)FFAT_PARTITION_LABEL); size_t totalBytes(); + size_t usedBytes(); size_t freeBytes(); void end(); bool exists(const char* path); From e41fb08b2ad4b6bb2810d5c48be1fc0ac2631293 Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Sun, 15 Nov 2020 08:53:07 +0200 Subject: [PATCH 3/3] Update esptool to work on BigSur --- package/package_esp32_index.template.json | 52 +++++++++++------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/package/package_esp32_index.template.json b/package/package_esp32_index.template.json index d680101e..fc5f095d 100644 --- a/package/package_esp32_index.template.json +++ b/package/package_esp32_index.template.json @@ -41,7 +41,7 @@ { "packager": "esp32", "name": "esptool_py", - "version": "2.6.1" + "version": "3.0.0" }, { "packager": "esp32", @@ -102,49 +102,49 @@ }, { "name": "esptool_py", - "version": "2.6.1", + "version": "3.0.0", "systems": [ { "host": "i686-mingw32", - "url": "https://dl.espressif.com/dl/esptool-2.6.1-windows.zip", - "archiveFileName": "esptool-2.6.1-windows.zip", - "checksum": "SHA-256:84cf0b369a7707fe566434faba148852fc464992111d5baa95b658b374802f96", - "size": "3422445" + "url": "https://dl.espressif.com/dl/esptool-3.0.0.2-windows.zip", + "archiveFileName": "esptool-3.0.0.2-windows.zip", + "checksum": "SHA-256:b192bfc1545a3c92658ce586b4edcc2aca3f0ad4b3fa8417d658bc8a48f1387e", + "size": "3434736" }, { "host": "x86_64-apple-darwin", - "url": "https://dl.espressif.com/dl/esptool-2.6.1-macos.tar.gz", - "archiveFileName": "esptool-2.6.1-macos.tar.gz", - "checksum": "SHA-256:f4eb758a301d6902cc9dfcd49d36345d2f075ad123da7cf8132d15cfb7533457", - "size": "3837085" + "url": "https://dl.espressif.com/dl/esptool-3.0.0.2-macos.tar.gz", + "archiveFileName": "esptool-3.0.0.2-macos.tar.gz", + "checksum": "SHA-256:9213f46d5aa865558da4a2ef4218e87eef4782779128083c15ce2b3e4d07a1ea", + "size": "3849615" }, { "host": "x86_64-pc-linux-gnu", - "url": "https://dl.espressif.com/dl/esptool-2.6.1-linux.tar.gz", - "archiveFileName": "esptool-2.6.1-linux.tar.gz", - "checksum": "SHA-256:eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb", - "size": "44762" + "url": "https://dl.espressif.com/dl/esptool-3.0.0.2-linux.tar.gz", + "archiveFileName": "esptool-3.0.0.2-linux.tar.gz", + "checksum": "SHA-256:d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020", + "size": "57526" }, { "host": "i686-pc-linux-gnu", - "url": "https://dl.espressif.com/dl/esptool-2.6.1-linux.tar.gz", - "archiveFileName": "esptool-2.6.1-linux.tar.gz", - "checksum": "SHA-256:eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb", - "size": "44762" + "url": "https://dl.espressif.com/dl/esptool-3.0.0.2-linux.tar.gz", + "archiveFileName": "esptool-3.0.0.2-linux.tar.gz", + "checksum": "SHA-256:d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020", + "size": "57526" }, { "host": "arm-linux-gnueabihf", - "url": "https://dl.espressif.com/dl/esptool-2.6.1-linux.tar.gz", - "archiveFileName": "esptool-2.6.1-linux.tar.gz", - "checksum": "SHA-256:eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb", - "size": "44762" + "url": "https://dl.espressif.com/dl/esptool-3.0.0.2-linux.tar.gz", + "archiveFileName": "esptool-3.0.0.2-linux.tar.gz", + "checksum": "SHA-256:d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020", + "size": "57526" }, { "host": "aarch64-linux-gnu", - "url": "https://dl.espressif.com/dl/esptool-2.6.1-linux.tar.gz", - "archiveFileName": "esptool-2.6.1-linux.tar.gz", - "checksum": "SHA-256:eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb", - "size": "44762" + "url": "https://dl.espressif.com/dl/esptool-3.0.0.2-linux.tar.gz", + "archiveFileName": "esptool-3.0.0.2-linux.tar.gz", + "checksum": "SHA-256:d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020", + "size": "57526" } ] },