jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 21:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SPIFFS filesystem

Browse Source 
Fix enabling SPIFFS filesystem (#10121)
This commit is contained in:
Theo Arends 2020-12-16 12:01:10 +01:00
parent a0250055ef
commit 88b3de0138
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tasmota/support_command.ino
View File

@ -2068,6 +2068,9 @@ void CmndDriver(void)
void CmndInfo(void) { void CmndInfo(void) {
NvsInfo(); NvsInfo();
#ifdef USE_TFS
TfsInfo();
#endif
ResponseCmndDone(); ResponseCmndDone();
} }

4
tasmota/support_esp32.ino
View File

@ -194,8 +194,8 @@ void QPCWrite(const void *pSettings, unsigned nSettingsLen) {
void NvsInfo(void) { void NvsInfo(void) {
nvs_stats_t nvs_stats; nvs_stats_t nvs_stats;
nvs_get_stats(NULL, &nvs_stats); nvs_get_stats(NULL, &nvs_stats);
AddLog_P(LOG_LEVEL_INFO, PSTR("INF: NVS Used %d, Free %d, Total %d, Namspaces %d"), AddLog_P(LOG_LEVEL_INFO, PSTR("NVS: Used %d/%d entries, NameSpaces %d"),
nvs_stats.used_entries, nvs_stats.free_entries, nvs_stats.total_entries, nvs_stats.namespace_count); nvs_stats.used_entries, nvs_stats.total_entries, nvs_stats.namespace_count);
} }
void ZigbeeErase(unsigned nSettingsLen) { void ZigbeeErase(unsigned nSettingsLen) {

13
tasmota/support_filesystem.ino
View File

@ -23,15 +23,9 @@
#ifdef ESP32 #ifdef ESP32
#define USE_TFS
#ifdef USE_SCRIPT
#undef USE_TFS
#endif // USE_SCRIPT
#ifdef USE_TFS #ifdef USE_TFS
//#define USE_LITTLEFS // LittleFS not tested yet //#define USE_LITTLEFS // LittleFS not tested yet as currently ESP8266 only
//#define USE_FFAT // FFat minimal 983k partition (4096 sector size) - tested //#define USE_FFAT // FFat minimal 983k partition (4096 sector size) - tested
#define USE_SPIFFS // SPIFFS - tested #define USE_SPIFFS // SPIFFS - tested
@ -64,7 +58,6 @@ bool TfsInit(void) {
} }
} }
AddLog_P(LOG_LEVEL_INFO, PSTR("TFS: Mounted")); AddLog_P(LOG_LEVEL_INFO, PSTR("TFS: Mounted"));
// TfsInfo();
FsMounted = 2; // true FsMounted = 2; // true
return true; return true;
} }
@ -130,10 +123,12 @@ bool TfsLoadFile(const char *fname, uint8_t *buf, uint32_t len) {
} }
void TfsInfo(void) { void TfsInfo(void) {
if (!TfsInit()) { return; }
uint32_t total_bytes = TASMOTA_FS.totalBytes();
#ifdef USE_SPIFFS #ifdef USE_SPIFFS
uint32_t used_bytes = TASMOTA_FS.usedBytes(); uint32_t used_bytes = TASMOTA_FS.usedBytes();
#endif // USE_SPIFFS #endif // USE_SPIFFS
uint32_t total_bytes = TASMOTA_FS.totalBytes();
#ifdef USE_FFAT #ifdef USE_FFAT
uint32_t used_bytes = total_bytes - TASMOTA_FS.freeBytes(); uint32_t used_bytes = total_bytes - TASMOTA_FS.freeBytes();
#endif // USE_FFAT #endif // USE_FFAT

6
tasmota/tasmota_globals.h
View File

@ -107,6 +107,12 @@ String EthernetMacAddress(void);
#define ARDUINO_CORE_RELEASE ARDUINO_ESP32_RELEASE #define ARDUINO_CORE_RELEASE ARDUINO_ESP32_RELEASE
#endif // ARDUINO_ESP32_RELEASE #endif // ARDUINO_ESP32_RELEASE
#define USE_TFS
#ifdef USE_SCRIPT
#undef USE_TFS
#endif // USE_SCRIPT
// Hardware has no ESP32 // Hardware has no ESP32
#undef USE_TUYA_DIMMER #undef USE_TUYA_DIMMER
#undef USE_PWM_DIMMER #undef USE_PWM_DIMMER