diff --git a/components/esp8266/lib/VERSION b/components/esp8266/lib/VERSION index 6f895875..dd0d99be 100644 --- a/components/esp8266/lib/VERSION +++ b/components/esp8266/lib/VERSION @@ -1,10 +1,10 @@ gwen: - crypto: 137694e + crypto: a6e02f7 espnow: 137694e - core: ef2df9d - net80211: 52dd0c7 - pp: 137694e + core: a6e02f7 + net80211: a6e02f7 + pp: a6e02f7 pwm: 0181338 smartconfig:9ec59b5 - wpa: 68ec0eb + wpa: a6e02f7 wps: 137694e \ No newline at end of file diff --git a/components/esp8266/lib/libcore.a b/components/esp8266/lib/libcore.a index 4eab507c..dfd50bd2 100644 Binary files a/components/esp8266/lib/libcore.a and b/components/esp8266/lib/libcore.a differ diff --git a/components/esp8266/lib/libcrypto.a b/components/esp8266/lib/libcrypto.a index 0b88f17c..ad1b5fc5 100644 Binary files a/components/esp8266/lib/libcrypto.a and b/components/esp8266/lib/libcrypto.a differ diff --git a/components/esp8266/lib/libnet80211.a b/components/esp8266/lib/libnet80211.a index 290887ab..bb4b9606 100644 Binary files a/components/esp8266/lib/libnet80211.a and b/components/esp8266/lib/libnet80211.a differ diff --git a/components/esp8266/lib/libpp.a b/components/esp8266/lib/libpp.a index 899e01be..0d1abe81 100644 Binary files a/components/esp8266/lib/libpp.a and b/components/esp8266/lib/libpp.a differ diff --git a/components/esp8266/lib/libwpa.a b/components/esp8266/lib/libwpa.a index 37e96efa..b39ff96f 100644 Binary files a/components/esp8266/lib/libwpa.a and b/components/esp8266/lib/libwpa.a differ diff --git a/components/spi_flash/src/spi_flash.c b/components/spi_flash/src/spi_flash.c index cb630399..668afe9c 100644 --- a/components/spi_flash/src/spi_flash.c +++ b/components/spi_flash/src/spi_flash.c @@ -121,7 +121,6 @@ typedef struct { uint8_t dummy_bits; } spi_cmd_t; -extern bool spi_flash_erase_sector_check(uint32_t); extern uint32_t esp_get_time(); bool IRAM_ATTR spi_user_cmd(spi_cmd_dir_t mode, spi_cmd_t *p_cmd); @@ -131,7 +130,6 @@ uint8_t en25q16x_read_sfdp(); extern void pp_soft_wdt_stop(void); extern void pp_soft_wdt_restart(void); -extern bool protect_flag ; esp_spi_flash_chip_t flashchip = { 0x1640ef, @@ -412,12 +410,6 @@ esp_err_t IRAM_ATTR spi_flash_erase_sector(size_t sec) { FLASH_INTR_DECLARE(c_tmp); - if (protect_flag == true) - { - if (false == spi_flash_erase_sector_check(sec)) - return ESP_ERR_FLASH_OP_FAIL; - } - esp_err_t ret; if (spi_flash_check_wr_protect() == false) { @@ -897,9 +889,7 @@ esp_err_t IRAM_ATTR spi_flash_erase_range(size_t start_address, size_t size) return ESP_ERR_FLASH_OP_FAIL; } - if ((protect_flag == true - && false == spi_flash_erase_sector_check(start_address)) - || spi_flash_check_wr_protect() == false) { + if (spi_flash_check_wr_protect() == false) { return ESP_ERR_FLASH_OP_FAIL; }