espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-08-06 15:15:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ota_erase_rf_cal' into 'release/v2.x.x'

Browse Source 
fix: ota erase rf cal sector

See merge request sdk/ESP8266_RTOS_SDK!359
This commit is contained in:
Wu Jian Gang
2018-08-10 16:25:45 +08:00
parent 55ba83269f de56c9eadd
commit 610b763210
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/ota_demo/ota/local_ota.c
View File

@ -73,14 +73,14 @@ static bool OUT_OF_RANGE(uint16 erase_sec)
spi_size_map == FLASH_SIZE_16M_MAP_512_512 || spi_size_map == FLASH_SIZE_16M_MAP_512_512 ||
spi_size_map == FLASH_SIZE_32M_MAP_512_512) { spi_size_map == FLASH_SIZE_32M_MAP_512_512) {
start_sec = (system_upgrade_userbin_check() == USER_BIN2) ? 1 : 129; start_sec = (system_upgrade_userbin_check() == USER_BIN2) ? 1 : 129;
sec_num = 123; sec_num = SYSTEM_BIN_MAP_512_512_MAX_SECTOR;
} else if (spi_size_map == FLASH_SIZE_16M_MAP_1024_1024 || } else if (spi_size_map == FLASH_SIZE_16M_MAP_1024_1024 ||
spi_size_map == FLASH_SIZE_32M_MAP_1024_1024) { spi_size_map == FLASH_SIZE_32M_MAP_1024_1024) {
start_sec = (system_upgrade_userbin_check() == USER_BIN2) ? 1 : 257; start_sec = (system_upgrade_userbin_check() == USER_BIN2) ? 1 : 257;
sec_num = 251; sec_num = SYSTEM_BIN_MAP_1024_1024_MAX_SECTOR;
} else { } else {
start_sec = (system_upgrade_userbin_check() == USER_BIN2) ? 1 : 65; start_sec = (system_upgrade_userbin_check() == USER_BIN2) ? 1 : 65;
sec_num = 59; sec_num = SYSTEM_BIN_NO_MAP_MAX_SECTOR;
} }
if ((erase_sec >= start_sec) && (erase_sec <= (start_sec + sec_num))) { if ((erase_sec >= start_sec) && (erase_sec <= (start_sec + sec_num))) {
@ -233,14 +233,14 @@ void system_upgrade_init(void)
spi_size_map == FLASH_SIZE_16M_MAP_512_512 || spi_size_map == FLASH_SIZE_16M_MAP_512_512 ||
spi_size_map == FLASH_SIZE_32M_MAP_512_512) { spi_size_map == FLASH_SIZE_32M_MAP_512_512) {
user_bin2_start = 129; user_bin2_start = 129;
upgrade->fw_bin_sec_num = 123; upgrade->fw_bin_sec_num = SYSTEM_BIN_MAP_512_512_MAX_SECTOR;
} else if (spi_size_map == FLASH_SIZE_16M_MAP_1024_1024 || } else if (spi_size_map == FLASH_SIZE_16M_MAP_1024_1024 ||
spi_size_map == FLASH_SIZE_32M_MAP_1024_1024) { spi_size_map == FLASH_SIZE_32M_MAP_1024_1024) {
user_bin2_start = 257; user_bin2_start = 257;
upgrade->fw_bin_sec_num = 251; upgrade->fw_bin_sec_num = SYSTEM_BIN_MAP_1024_1024_MAX_SECTOR;
} else { } else {
user_bin2_start = 65; user_bin2_start = 65;
upgrade->fw_bin_sec_num = 59; upgrade->fw_bin_sec_num = SYSTEM_BIN_NO_MAP_MAX_SECTOR;
} }
upgrade->fw_bin_sec = (system_upgrade_userbin_check() == USER_BIN1) ? user_bin2_start : user_bin1_start; upgrade->fw_bin_sec = (system_upgrade_userbin_check() == USER_BIN1) ? user_bin2_start : user_bin1_start;

4
include/espressif/upgrade.h
View File

@ -59,6 +59,10 @@ extern "C" {
#define UPGRADE_FW_BIN1 0x00 /**< firmware, user1.bin */ #define UPGRADE_FW_BIN1 0x00 /**< firmware, user1.bin */
#define UPGRADE_FW_BIN2 0x01 /**< firmware, user2.bin */ #define UPGRADE_FW_BIN2 0x01 /**< firmware, user2.bin */
#define SYSTEM_BIN_NO_MAP_MAX_SECTOR 58
#define SYSTEM_BIN_MAP_512_512_MAX_SECTOR 122
#define SYSTEM_BIN_MAP_1024_1024_MAX_SECTOR 250
/** /**
* @brief Callback of upgrading firmware through WiFi. * @brief Callback of upgrading firmware through WiFi.
* *