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); 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) { diff --git a/package/package_esp32_index.template.json b/package/package_esp32_index.template.json index 7fd67e37..21956b93 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",