jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-29 05:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor zigbee TFS access

Browse Source
This commit is contained in:
Theo Arends 2020-12-17 17:20:49 +01:00
parent f243a01adf
commit abdfae5046
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tasmota/support_esp32.ino
View File

@ -198,28 +198,6 @@ void NvsInfo(void) {
nvs_stats.used_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) {
// NvmErase("zb");
#ifdef USE_TFS
TfsEraseFile("/zb", nSettingsLen);
#endif
}
void ZigbeeRead(uint8_t *pSettings, unsigned nSettingsLen) {
// NvmLoad("zb", "zigbee", pSettings, nSettingsLen);
#ifdef USE_TFS
TfsLoadFile("/zb", pSettings, nSettingsLen);
#endif
}
void ZigbeeWrite(const uint8_t *pSettings, unsigned nSettingsLen) {
// NvmSave("zb", "zigbee", pSettings, nSettingsLen);
#ifdef USE_TFS
TfsSaveFile("/zb", pSettings, nSettingsLen);
#endif
}
// //
// Flash memory mapping // Flash memory mapping
// //

16
tasmota/xdrv_23_zigbee_4_persistence.ino
View File

@ -304,7 +304,9 @@ void loadZigbeeDevices(bool dump_only = false) {
AddLog_P(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Cannot allocate 4KB buffer")); AddLog_P(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Cannot allocate 4KB buffer"));
return; return;
} }
ZigbeeRead(spi_buffer, z_spi_len); #ifdef USE_TFS
TfsLoadFile("/zb", spi_buffer, z_spi_len);
#endif
z_dev_start = spi_buffer; z_dev_start = spi_buffer;
#endif // ESP32 #endif // ESP32
Z_Flashentry flashdata; Z_Flashentry flashdata;
@ -367,7 +369,9 @@ void saveZigbeeDevices(void) {
ESP.flashRead(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE); ESP.flashRead(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
#endif // ESP8266 #endif // ESP8266
#ifdef ESP32 #ifdef ESP32
ZigbeeRead(spi_buffer, z_spi_len); #ifdef USE_TFS
TfsLoadFile("/zb", spi_buffer, z_spi_len);
#endif
#endif // ESP32 #endif // ESP32
Z_Flashentry *flashdata = (Z_Flashentry*)(spi_buffer + z_block_offset); Z_Flashentry *flashdata = (Z_Flashentry*)(spi_buffer + z_block_offset);
@ -385,7 +389,9 @@ void saveZigbeeDevices(void) {
AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data store in Flash (0x%08X - %d bytes)"), z_dev_start, buf_len); AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data store in Flash (0x%08X - %d bytes)"), z_dev_start, buf_len);
#endif // ESP8266 #endif // ESP8266
#ifdef ESP32 #ifdef ESP32
ZigbeeWrite(spi_buffer, z_spi_len); #ifdef USE_TFS
TfsSaveFile("/zb", spi_buffer, z_spi_len);
#endif
AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data saved in %s (%d bytes)"), PSTR("Flash"), buf_len); AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data saved in %s (%d bytes)"), PSTR("Flash"), buf_len);
#endif // ESP32 #endif // ESP32
free(spi_buffer); free(spi_buffer);
@ -419,7 +425,9 @@ void eraseZigbeeDevices(void) {
AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data erased in %s"), PSTR("Flash")); AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data erased in %s"), PSTR("Flash"));
#endif // ESP8266 #endif // ESP8266
#ifdef ESP32 #ifdef ESP32
ZigbeeErase(z_block_len); #ifdef USE_TFS
TfsEraseFile("/zb", z_block_len);
#endif
AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data erased (%d bytes)"), z_block_len); AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data erased (%d bytes)"), z_block_len);
#endif // ESP32 #endif // ESP32
} }