jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into idf-release/v3.3

Browse Source
This commit is contained in:
Me No Dev 2020-11-15 12:02:51 +02:00 committed by GitHub
commit cee7b4237c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/FFat/src/FFat.cpp
View File

@ -135,6 +135,21 @@ size_t F_Fat::totalBytes()
return tot_sect * sect_size; 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() size_t F_Fat::freeBytes()
{ {

1
libraries/FFat/src/FFat.h
View File

@ -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 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); bool format(bool full_wipe = FFAT_WIPE_QUICK, char* partitionLabel = (char*)FFAT_PARTITION_LABEL);
size_t totalBytes(); size_t totalBytes();
size_t usedBytes();
size_t freeBytes(); size_t freeBytes();
void end(); void end();
bool exists(const char* path); bool exists(const char* path);

11
libraries/WebServer/src/WebServer.cpp
View File

@ -313,11 +313,12 @@ void WebServer::handleClient() {
_contentLength = CONTENT_LENGTH_NOT_SET; _contentLength = CONTENT_LENGTH_NOT_SET;
_handleRequest(); _handleRequest();
if (_currentClient.connected()) { // Fix for issue with Chrome based browsers: https://github.com/espressif/arduino-esp32/issues/3652
_currentStatus = HC_WAIT_CLOSE; // if (_currentClient.connected()) {
_statusChange = millis(); // _currentStatus = HC_WAIT_CLOSE;
keepCurrentClient = true; // _statusChange = millis();
} // keepCurrentClient = true;
// }
} }
} else { // !_currentClient.available() } else { // !_currentClient.available()
if (millis() - _statusChange <= HTTP_MAX_DATA_WAIT) { if (millis() - _statusChange <= HTTP_MAX_DATA_WAIT) {

52
package/package_esp32_index.template.json
View File

@ -41,7 +41,7 @@
{ {
"packager": "esp32", "packager": "esp32",
"name": "esptool_py", "name": "esptool_py",
"version": "2.6.1" "version": "3.0.0"
}, },
{ {
"packager": "esp32", "packager": "esp32",
@ -102,49 +102,49 @@
}, },
{ {
"name": "esptool_py", "name": "esptool_py",
"version": "2.6.1", "version": "3.0.0",
"systems": [ "systems": [
{ {
"host": "i686-mingw32", "host": "i686-mingw32",
"url": "https://dl.espressif.com/dl/esptool-2.6.1-windows.zip", "url": "https://dl.espressif.com/dl/esptool-3.0.0.2-windows.zip",
"archiveFileName": "esptool-2.6.1-windows.zip", "archiveFileName": "esptool-3.0.0.2-windows.zip",
"checksum": "SHA-256:84cf0b369a7707fe566434faba148852fc464992111d5baa95b658b374802f96", "checksum": "SHA-256:b192bfc1545a3c92658ce586b4edcc2aca3f0ad4b3fa8417d658bc8a48f1387e",
"size": "3422445" "size": "3434736"
}, },
{ {
"host": "x86_64-apple-darwin", "host": "x86_64-apple-darwin",
"url": "https://dl.espressif.com/dl/esptool-2.6.1-macos.tar.gz", "url": "https://dl.espressif.com/dl/esptool-3.0.0.2-macos.tar.gz",
"archiveFileName": "esptool-2.6.1-macos.tar.gz", "archiveFileName": "esptool-3.0.0.2-macos.tar.gz",
"checksum": "SHA-256:f4eb758a301d6902cc9dfcd49d36345d2f075ad123da7cf8132d15cfb7533457", "checksum": "SHA-256:9213f46d5aa865558da4a2ef4218e87eef4782779128083c15ce2b3e4d07a1ea",
"size": "3837085" "size": "3849615"
}, },
{ {
"host": "x86_64-pc-linux-gnu", "host": "x86_64-pc-linux-gnu",
"url": "https://dl.espressif.com/dl/esptool-2.6.1-linux.tar.gz", "url": "https://dl.espressif.com/dl/esptool-3.0.0.2-linux.tar.gz",
"archiveFileName": "esptool-2.6.1-linux.tar.gz", "archiveFileName": "esptool-3.0.0.2-linux.tar.gz",
"checksum": "SHA-256:eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb", "checksum": "SHA-256:d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020",
"size": "44762" "size": "57526"
}, },
{ {
"host": "i686-pc-linux-gnu", "host": "i686-pc-linux-gnu",
"url": "https://dl.espressif.com/dl/esptool-2.6.1-linux.tar.gz", "url": "https://dl.espressif.com/dl/esptool-3.0.0.2-linux.tar.gz",
"archiveFileName": "esptool-2.6.1-linux.tar.gz", "archiveFileName": "esptool-3.0.0.2-linux.tar.gz",
"checksum": "SHA-256:eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb", "checksum": "SHA-256:d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020",
"size": "44762" "size": "57526"
}, },
{ {
"host": "arm-linux-gnueabihf", "host": "arm-linux-gnueabihf",
"url": "https://dl.espressif.com/dl/esptool-2.6.1-linux.tar.gz", "url": "https://dl.espressif.com/dl/esptool-3.0.0.2-linux.tar.gz",
"archiveFileName": "esptool-2.6.1-linux.tar.gz", "archiveFileName": "esptool-3.0.0.2-linux.tar.gz",
"checksum": "SHA-256:eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb", "checksum": "SHA-256:d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020",
"size": "44762" "size": "57526"
}, },
{ {
"host": "aarch64-linux-gnu", "host": "aarch64-linux-gnu",
"url": "https://dl.espressif.com/dl/esptool-2.6.1-linux.tar.gz", "url": "https://dl.espressif.com/dl/esptool-3.0.0.2-linux.tar.gz",
"archiveFileName": "esptool-2.6.1-linux.tar.gz", "archiveFileName": "esptool-3.0.0.2-linux.tar.gz",
"checksum": "SHA-256:eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb", "checksum": "SHA-256:d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020",
"size": "44762" "size": "57526"
} }
] ]
}, },