feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Additional sector position should not be changed at update.

Browse Source
This commit is contained in:
Dmitry
2018-07-10 10:17:35 +03:00
parent 9d609af54c
commit c9872c649e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/wear_levelling/WL_Flash.cpp
View File

@@ -362,7 +362,7 @@ esp_err_t WL_Flash::updateV1_V2()
WL_RESULT_CHECK(result); WL_RESULT_CHECK(result);
this->state.version = 2; this->state.version = 2;
this->state.pos = 0; //this->state.pos = 0;
this->state.crc = crc32::crc32_le(WL_CFG_CRC_CONST, (uint8_t *)&this->state, offsetof(wl_state_t, crc)); this->state.crc = crc32::crc32_le(WL_CFG_CRC_CONST, (uint8_t *)&this->state, offsetof(wl_state_t, crc));
this->state.device_id = esp_random(); this->state.device_id = esp_random();
memset(this->state.reserved, 0, sizeof(this->state.reserved)); memset(this->state.reserved, 0, sizeof(this->state.reserved));
@@ -389,15 +389,12 @@ esp_err_t WL_Flash::updateV1_V2()
WL_RESULT_CHECK(result); WL_RESULT_CHECK(result);
ESP_LOGI(TAG, "%s update result ver=%i, pos=%i", __func__, (uint32_t)this->state.version, (uint32_t)this->state.pos); ESP_LOGI(TAG, "%s update result ver=%i, pos=%i", __func__, (uint32_t)this->state.version, (uint32_t)this->state.pos);
memset(this->temp_buff, 0, this->cfg.wr_size); memset(this->temp_buff, 0, this->cfg.wr_size);
for (uint32_t i=0 ; i<= pos; i++) { for (uint32_t i=0 ; i<= pos; i++) {
this->fillOkBuff(i); this->fillOkBuff(i);
result = this->flash_drv->write(this->addr_state2 + sizeof(wl_state_t) + i * this->cfg.wr_size, this->temp_buff, this->cfg.wr_size); result = this->flash_drv->write(this->addr_state2 + sizeof(wl_state_t) + i * this->cfg.wr_size, this->temp_buff, this->cfg.wr_size);
WL_RESULT_CHECK(result); WL_RESULT_CHECK(result);
} }
this->state.pos = pos;
return result; return result;
} }