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

Merge pull request #16721 from s-hadinger/zigbee_v4_fs_priority

Browse Source 
Zigbee load from FS before EEPROM
This commit is contained in:
s-hadinger 2022-10-04 16:19:25 +02:00 committed by GitHub
commit 4b7dd06c46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_4c_devices.ino
View File

@ -355,19 +355,6 @@ bool loadZigbeeDevices(void) {
const char * storage_class = PSTR("");
uint32_t file_version = 4; // currently supporting v3 and v4
#ifdef USE_ZIGBEE_EEPROM
if (zigbee.eeprom_ready) {
f.init(ZIGB_NAME4); // try v4 first
if (!f.valid()) {
f.init(ZIGB_NAME2); // else try v2
if (f.valid()) { file_version = 2; } // v2 found
}
if (f.valid()) {
storage_class = PSTR("EEPROM");
}
}
#endif // USE_ZIGBEE_EEPROM
#ifdef USE_UFILESYS
File file;
if (!f.valid() && dfsp) {
@ -383,6 +370,19 @@ bool loadZigbeeDevices(void) {
}
#endif // USE_UFILESYS
#ifdef USE_ZIGBEE_EEPROM
if (!f.valid() && zigbee.eeprom_ready) {
f.init(ZIGB_NAME4); // try v4 first
if (!f.valid()) {
f.init(ZIGB_NAME2); // else try v2
if (f.valid()) { file_version = 2; } // v2 found
}
if (f.valid()) {
storage_class = PSTR("EEPROM");
}
}
#endif // USE_ZIGBEE_EEPROM
#ifdef ESP8266
if (!f.valid() && flash_valid()) {
// Read binary data from Flash