Merge pull request #16719 from s-hadinger/zigbee_zbbridge_fix_v4

Zigbee urgent fix for zbv4
This commit is contained in:
s-hadinger 2022-10-04 15:07:49 +02:00 committed by GitHub
commit 8944e6026d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -458,7 +458,7 @@ void saveZigbeeDevices(void) {
// TODO can we prioritize filesystem instead of eeprom? // TODO can we prioritize filesystem instead of eeprom?
#ifdef USE_ZIGBEE_EEPROM #ifdef USE_ZIGBEE_EEPROM
if (!f.valid() && zigbee.eeprom_ready) { if (!f.valid() && zigbee.eeprom_ready) {
f.init(ZIGB_NAME2); f.init(ZIGB_NAME4);
storage_class = PSTR("EEPROM"); storage_class = PSTR("EEPROM");
} }
#endif #endif
@ -506,7 +506,7 @@ 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);
Z_Flashentry *flashdata = (Z_Flashentry*)(spi_buffer + z_block_offset); Z_Flashentry *flashdata = (Z_Flashentry*)(spi_buffer + z_block_offset);
flashdata->name = ZIGB_NAME2; // v2 flashdata->name = ZIGB_NAME4; // v4
flashdata->len = buf_len; flashdata->len = buf_len;
flashdata->start = 0; flashdata->start = 0;