mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10590 from gemu2015/filemanagerfix 

fix esp32 download large files
This commit is contained in:
Theo Arends 2021-01-17 14:19:37 +01:00 committed by GitHub
parent f52f26f566 8c5d4ea26d
commit 0ca2750add
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tasmota/xdrv_50_filesystem.ino
View File

@ -402,6 +402,7 @@ void UFSDelete(void) {
* Web support * Web support
\*********************************************************************************************/ \*********************************************************************************************/
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER
const char UFS_WEB_DIR[] PROGMEM = const char UFS_WEB_DIR[] PROGMEM =
@ -459,6 +460,8 @@ void UfsDirectory(void) {
if (UfsDownloadFile(cp)) { if (UfsDownloadFile(cp)) {
// is directory // is directory
strcpy(ufs_path, cp); strcpy(ufs_path, cp);
} else {
return;
} }
} }
@ -588,7 +591,9 @@ void UfsListDir(char *path, uint8_t depth) {
} }
} }
#ifdef ESP32
#define ESP32_DOWNLOAD_TASK
#endif // ESP32
uint8_t UfsDownloadFile(char *file) { uint8_t UfsDownloadFile(char *file) {
File download_file; File download_file;
@ -609,7 +614,7 @@ uint8_t UfsDownloadFile(char *file) {
return 1; return 1;
} }
#ifdef ESP8266 #ifndef ESP32_DOWNLOAD_TASK
WiFiClient download_Client; WiFiClient download_Client;
uint32_t flen = download_file.size(); uint32_t flen = download_file.size();
@ -649,10 +654,10 @@ uint8_t UfsDownloadFile(char *file) {
} }
download_file.close(); download_file.close();
download_Client.stop(); download_Client.stop();
#endif // esp8266 #endif // ESP32_DOWNLOAD_TASK
#ifdef ESP32 #ifdef ESP32_DOWNLOAD_TASK
download_file.close(); download_file.close();
if (download_busy == true) { if (download_busy == true) {
@ -664,16 +669,16 @@ uint8_t UfsDownloadFile(char *file) {
char *path = (char*)malloc(128); char *path = (char*)malloc(128);
strcpy(path,file); strcpy(path,file);
xTaskCreatePinnedToCore(donload_task, "DT", 6000, (void*)path, 3, NULL, 1); xTaskCreatePinnedToCore(donload_task, "DT", 6000, (void*)path, 3, NULL, 1);
#endif // ESP32 #endif // ESP32_DOWNLOAD_TASK
return 0; return 0;
} }
#ifdef ESP32 #ifdef ESP32_DOWNLOAD_TASK
#ifndef DOWNLOAD_SIZE #ifndef DOWNLOAD_SIZE
#define DOWNLOAD_SIZE 4096 #define DOWNLOAD_SIZE 4096
#endif #endif // DOWNLOAD_SIZE
void donload_task(void *path) { void donload_task(void *path) {
File download_file; File download_file;
WiFiClient download_Client; WiFiClient download_Client;
@ -714,7 +719,7 @@ void donload_task(void *path) {
download_busy = false; download_busy = false;
vTaskDelete( NULL ); vTaskDelete( NULL );
} }
#endif // ESP32 #endif // ESP32_DOWNLOAD_TASK
bool UfsUploadFileOpen(const char* upload_filename) { bool UfsUploadFileOpen(const char* upload_filename) {