Skip to content

Commit cee7b42

Browse files
me-no-devme-no-dev
authored
Merge branch 'master' into idf-release/v3.3
2 parents 954df2f + e41fb08 commit cee7b42

File tree

4 files changed

+48
-31
lines changed

4 files changed

+48
-31
lines changed

Diff for: ‎libraries/FFat/src/FFat.cpp

+15
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,21 @@ size_t F_Fat::totalBytes()
135135
return tot_sect * sect_size;
136136
}
137137

138+
size_t F_Fat::usedBytes()
139+
{
140+
FATFS *fs;
141+
DWORD free_clust, used_sect, sect_size;
142+
143+
BYTE pdrv = ff_diskio_get_pdrv_wl(_wl_handle);
144+
char drv[3] = {(char)(48+pdrv), ':', 0};
145+
if ( f_getfree(drv, &free_clust, &fs) != FR_OK){
146+
return 0;
147+
}
148+
used_sect = (fs->n_fatent - 2 - free_clust) * fs->csize;
149+
sect_size = CONFIG_WL_SECTOR_SIZE;
150+
return used_sect * sect_size;
151+
}
152+
138153
size_t F_Fat::freeBytes()
139154
{
140155

Diff for: ‎libraries/FFat/src/FFat.h

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ class F_Fat : public FS
3131
bool begin(bool formatOnFail=false, const char * basePath="/ffat", uint8_t maxOpenFiles=10, const char * partitionLabel = (char*)FFAT_PARTITION_LABEL);
3232
bool format(bool full_wipe = FFAT_WIPE_QUICK, char* partitionLabel = (char*)FFAT_PARTITION_LABEL);
3333
size_t totalBytes();
34+
size_t usedBytes();
3435
size_t freeBytes();
3536
void end();
3637
bool exists(const char* path);

Diff for: ‎libraries/WebServer/src/WebServer.cpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -313,11 +313,12 @@ void WebServer::handleClient() {
313313
_contentLength = CONTENT_LENGTH_NOT_SET;
314314
_handleRequest();
315315

316-
if (_currentClient.connected()) {
317-
_currentStatus = HC_WAIT_CLOSE;
318-
_statusChange = millis();
319-
keepCurrentClient = true;
320-
}
316+
// Fix for issue with Chrome based browsers: https://github.com/espressif/arduino-esp32/issues/3652
317+
// if (_currentClient.connected()) {
318+
// _currentStatus = HC_WAIT_CLOSE;
319+
// _statusChange = millis();
320+
// keepCurrentClient = true;
321+
// }
321322
}
322323
} else { // !_currentClient.available()
323324
if (millis() - _statusChange <= HTTP_MAX_DATA_WAIT) {

Diff for: ‎package/package_esp32_index.template.json

+26-26
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
{
4242
"packager": "esp32",
4343
"name": "esptool_py",
44-
"version": "2.6.1"
44+
"version": "3.0.0"
4545
},
4646
{
4747
"packager": "esp32",
@@ -102,49 +102,49 @@
102102
},
103103
{
104104
"name": "esptool_py",
105-
"version": "2.6.1",
105+
"version": "3.0.0",
106106
"systems": [
107107
{
108108
"host": "i686-mingw32",
109-
"url": "https://dl.espressif.com/dl/esptool-2.6.1-windows.zip",
110-
"archiveFileName": "esptool-2.6.1-windows.zip",
111-
"checksum": "SHA-256:84cf0b369a7707fe566434faba148852fc464992111d5baa95b658b374802f96",
112-
"size": "3422445"
109+
"url": "https://dl.espressif.com/dl/esptool-3.0.0.2-windows.zip",
110+
"archiveFileName": "esptool-3.0.0.2-windows.zip",
111+
"checksum": "SHA-256:b192bfc1545a3c92658ce586b4edcc2aca3f0ad4b3fa8417d658bc8a48f1387e",
112+
"size": "3434736"
113113
},
114114
{
115115
"host": "x86_64-apple-darwin",
116-
"url": "https://dl.espressif.com/dl/esptool-2.6.1-macos.tar.gz",
117-
"archiveFileName": "esptool-2.6.1-macos.tar.gz",
118-
"checksum": "SHA-256:f4eb758a301d6902cc9dfcd49d36345d2f075ad123da7cf8132d15cfb7533457",
119-
"size": "3837085"
116+
"url": "https://dl.espressif.com/dl/esptool-3.0.0.2-macos.tar.gz",
117+
"archiveFileName": "esptool-3.0.0.2-macos.tar.gz",
118+
"checksum": "SHA-256:9213f46d5aa865558da4a2ef4218e87eef4782779128083c15ce2b3e4d07a1ea",
119+
"size": "3849615"
120120
},
121121
{
122122
"host": "x86_64-pc-linux-gnu",
123-
"url": "https://dl.espressif.com/dl/esptool-2.6.1-linux.tar.gz",
124-
"archiveFileName": "esptool-2.6.1-linux.tar.gz",
125-
"checksum": "SHA-256:eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb",
126-
"size": "44762"
123+
"url": "https://dl.espressif.com/dl/esptool-3.0.0.2-linux.tar.gz",
124+
"archiveFileName": "esptool-3.0.0.2-linux.tar.gz",
125+
"checksum": "SHA-256:d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020",
126+
"size": "57526"
127127
},
128128
{
129129
"host": "i686-pc-linux-gnu",
130-
"url": "https://dl.espressif.com/dl/esptool-2.6.1-linux.tar.gz",
131-
"archiveFileName": "esptool-2.6.1-linux.tar.gz",
132-
"checksum": "SHA-256:eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb",
133-
"size": "44762"
130+
"url": "https://dl.espressif.com/dl/esptool-3.0.0.2-linux.tar.gz",
131+
"archiveFileName": "esptool-3.0.0.2-linux.tar.gz",
132+
"checksum": "SHA-256:d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020",
133+
"size": "57526"
134134
},
135135
{
136136
"host": "arm-linux-gnueabihf",
137-
"url": "https://dl.espressif.com/dl/esptool-2.6.1-linux.tar.gz",
138-
"archiveFileName": "esptool-2.6.1-linux.tar.gz",
139-
"checksum": "SHA-256:eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb",
140-
"size": "44762"
137+
"url": "https://dl.espressif.com/dl/esptool-3.0.0.2-linux.tar.gz",
138+
"archiveFileName": "esptool-3.0.0.2-linux.tar.gz",
139+
"checksum": "SHA-256:d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020",
140+
"size": "57526"
141141
},
142142
{
143143
"host": "aarch64-linux-gnu",
144-
"url": "https://dl.espressif.com/dl/esptool-2.6.1-linux.tar.gz",
145-
"archiveFileName": "esptool-2.6.1-linux.tar.gz",
146-
"checksum": "SHA-256:eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb",
147-
"size": "44762"
144+
"url": "https://dl.espressif.com/dl/esptool-3.0.0.2-linux.tar.gz",
145+
"archiveFileName": "esptool-3.0.0.2-linux.tar.gz",
146+
"checksum": "SHA-256:d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020",
147+
"size": "57526"
148148
}
149149
]
150150
},

0 commit comments

Comments
 (0)