GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-06-06 02:36:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix OTA update size not accurate on ESP32

Browse Source 
Use proper function to get partition size instead of guessing doing wrong calculation
This commit is contained in:
Luc 2019-08-10 20:25:47 +02:00
parent 7bc15e1bd9
commit 6fc6df1577
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
esp3d/configuration.h
View File

@ -99,13 +99,13 @@
//ESP_SPIFFS_FILESYSTEM 0 //ESP_SPIFFS_FILESYSTEM 0
//ESP_FAT_FILESYSTEM 1 //ESP_FAT_FILESYSTEM 1
//ESP_LITTLEFS_FILESYSTEM 2 //Not Yet implemented //ESP_LITTLEFS_FILESYSTEM 2 //Not Yet implemented
#define FILESYSTEM_FEATURE ESP_SPIFFS_FILESYSTEM #define FILESYSTEM_FEATURE ESP_FAT_FILESYSTEM
//DIRECT_PIN_FEATURE: allow to access pin using ESP201 command //DIRECT_PIN_FEATURE: allow to access pin using ESP201 command
#define DIRECT_PIN_FEATURE #define DIRECT_PIN_FEATURE
//TIMESTAMP_FEATURE: set time system //TIMESTAMP_FEATURE: set time system
#define TIMESTAMP_FEATURE //#define TIMESTAMP_FEATURE
//FILESYSTEM_TIMESTAMP_FEATURE: allow to get last write time from FILESYSTEM files //FILESYSTEM_TIMESTAMP_FEATURE: allow to get last write time from FILESYSTEM files
//#define FILESYSTEM_TIMESTAMP_FEATURE //#define FILESYSTEM_TIMESTAMP_FEATURE

2
esp3d/src/include/version.h
View File

@ -22,7 +22,7 @@
#define _VERSION_ESP3D_H #define _VERSION_ESP3D_H
//version and sources location //version and sources location
#define FW_VERSION "3.0.0.a10" #define FW_VERSION "3.0.0.a11"
#define REPOSITORY "https://github.com/luc-github/ESP3D" #define REPOSITORY "https://github.com/luc-github/ESP3D"
#endif //_VERSION_ESP3D_H #endif //_VERSION_ESP3D_H

5
esp3d/src/modules/filesystem/esp_filesystem.cpp
View File

@ -144,7 +144,10 @@ size_t ESP_FileSystem::max_update_size()
#if defined (ARDUINO_ARCH_ESP32) #if defined (ARDUINO_ARCH_ESP32)
//Is OTA available ? //Is OTA available ?
if (esp_ota_get_running_partition()) { if (esp_ota_get_running_partition()) {
flashsize = ESP.getFreeSketchSpace() + ESP.getSketchSize(); const esp_partition_t* partition = esp_ota_get_next_update_partition(NULL);
if (partition){
flashsize = partition->size;
}
} else { } else {
flashsize = 0; flashsize = 0;
} }