diff --git a/hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_main.cpp b/hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_main.cpp index b67543f8b..3423d70a1 100644 --- a/hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_main.cpp +++ b/hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_main.cpp @@ -128,12 +128,18 @@ extern "C" { void user_init(void) { uart_div_modify(0, UART_CLK_FREQ / (74480)); - system_rtc_mem_read(0, &resetInfo, sizeof(struct rst_info)); - if(resetInfo.reason == REASON_WDT_RST || resetInfo.reason == REASON_EXCEPTION_RST) { - os_printf("Last Reset:\n - flag=%d\n - Fatal exception (%d):\n - epc1=0x%08x,epc2=0x%08x,epc3=0x%08x,excvaddr=0x%08x,depc=0x%08x\n", resetInfo.reason, resetInfo.exccause, resetInfo.epc1, resetInfo.epc2, resetInfo.epc3, resetInfo.excvaddr, resetInfo.depc); + struct rst_info *rtc_info = system_get_rst_info(); + os_printf("Last reset reason: 0x%02X\n", rtc_info->reason); + + if (rtc_info->reason == REASON_WDT_RST || + rtc_info->reason == REASON_EXCEPTION_RST || + rtc_info->reason == REASON_SOFT_WDT_RST) { + if (rtc_info->reason == REASON_EXCEPTION_RST) { + os_printf("Fatal exception (%d):\n", rtc_info->exccause); + } + os_printf("epc1=0x%08x, epc2=0x%08x, epc3=0x%08x, excvaddr=0x%08x, depc=0x%08x\n", + rtc_info->epc1, rtc_info->epc2, rtc_info->epc3, rtc_info->excvaddr, rtc_info->depc); } - struct rst_info info = { 0 }; - system_rtc_mem_write(0, &info, sizeof(struct rst_info)); uart_div_modify(0, UART_CLK_FREQ / (115200)); diff --git a/hardware/esp8266com/esp8266/tools/sdk/changelog.txt b/hardware/esp8266com/esp8266/tools/sdk/changelog.txt index 185750669..9f2ad6bf8 100644 --- a/hardware/esp8266com/esp8266/tools/sdk/changelog.txt +++ b/hardware/esp8266com/esp8266/tools/sdk/changelog.txt @@ -1,3 +1,35 @@ +esp_iot_sdk_v1.1.2_15_06_16_p1 Release Note +------------------------------------------- +Here is a patch based on SDK_v1.1.2 resolved issue that "wifi_station_scan" cause loss of wireless connectivity. + +Please replace them in esp_iot_sdk/lib folder. + +Sorry for the inconvenience. + + + + +esp_iot_sdk_v1.1.2_15_06_12 Release Note +------------------------------------------- + +Optimization: +1. support certificate issuer verification for SSL +2. Update SPI driver, support overlap mode + +Add APIs: +1. wifi_station_set_hostname : set ESP8266 station DHCP hostname +2. wifi_station_get_hostname : get ESP8266 station DHCP hostname +3. spi_flash_set_read_func :set user specified reading SPI function on overlap mode +4. espconn_secure_ca_disable : disable SSL CA verify +5. espconn_secure_ca_enable : enable SSL CA verify + +Add Documentation: +1. SPI overlap introduction: \esp_iot_sdk\document, sorry that it has only Chinese version now,we will add English version of this documentation ASAP. +2. SSL introduction: \esp_iot_sdk\document + + + + esp_iot_sdk_v1.1.1_15_06_05 Release Note ------------------------------------------- diff --git a/hardware/esp8266com/esp8266/tools/sdk/include/espconn.h b/hardware/esp8266com/esp8266/tools/sdk/include/espconn.h index a85c82392..82212103b 100644 --- a/hardware/esp8266com/esp8266/tools/sdk/include/espconn.h +++ b/hardware/esp8266com/esp8266/tools/sdk/include/espconn.h @@ -23,6 +23,9 @@ typedef void (* espconn_reconnect_callback)(void *arg, sint8 err); #define ESPCONN_ARG -12 /* Illegal argument. */ #define ESPCONN_ISCONN -15 /* Already connected. */ +#define ESPCONN_HANDSHAKE -28 /* ssl handshake failed */ +#define ESPCONN_PROTO_MSG -61 /* ssl application invalid */ + /** Protocol family and type of the espconn */ enum espconn_type { ESPCONN_INVALID = 0, @@ -455,6 +458,28 @@ bool espconn_secure_set_size(uint8 level, uint16 size); sint16 espconn_secure_get_size(uint8 level); +/****************************************************************************** + * FunctionName : espconn_secure_ca_enable + * Description : enable the certificate authenticate and set the flash sector + * as client or server + * Parameters : level -- set for client or server + * 1: client,2:server,3:client and server + * flash_sector -- flash sector for save certificate + * Returns : result true or false +*******************************************************************************/ + +bool espconn_secure_ca_enable(uint8 level, uint8 flash_sector ); + +/****************************************************************************** + * FunctionName : espconn_secure_ca_disable + * Description : disable the certificate authenticate as client or server + * Parameters : level -- set for client or server + * 1: client,2:server,3:client and server + * Returns : result true or false +*******************************************************************************/ + +bool espconn_secure_ca_disable(uint8 level); + /****************************************************************************** * FunctionName : espconn_secure_accept * Description : The function given as the listen diff --git a/hardware/esp8266com/esp8266/tools/sdk/include/spi_flash.h b/hardware/esp8266com/esp8266/tools/sdk/include/spi_flash.h index 347e1b920..bb920fef5 100644 --- a/hardware/esp8266com/esp8266/tools/sdk/include/spi_flash.h +++ b/hardware/esp8266com/esp8266/tools/sdk/include/spi_flash.h @@ -30,4 +30,12 @@ SpiFlashOpResult spi_flash_erase_sector(uint16 sec); SpiFlashOpResult spi_flash_write(uint32 des_addr, uint32 *src_addr, uint32 size); SpiFlashOpResult spi_flash_read(uint32 src_addr, uint32 *des_addr, uint32 size); +typedef SpiFlashOpResult (* user_spi_flash_read)( + SpiFlashChip *spi, + uint32 src_addr, + uint32 *des_addr, + uint32 size); + +void spi_flash_set_read_func(user_spi_flash_read read); + #endif diff --git a/hardware/esp8266com/esp8266/tools/sdk/lib/libjson.a b/hardware/esp8266com/esp8266/tools/sdk/lib/libjson.a index e8fa9d8da..5b35fba2c 100644 Binary files a/hardware/esp8266com/esp8266/tools/sdk/lib/libjson.a and b/hardware/esp8266com/esp8266/tools/sdk/lib/libjson.a differ diff --git a/hardware/esp8266com/esp8266/tools/sdk/lib/liblwip.a b/hardware/esp8266com/esp8266/tools/sdk/lib/liblwip.a index a6c42f9e9..c956810ea 100644 Binary files a/hardware/esp8266com/esp8266/tools/sdk/lib/liblwip.a and b/hardware/esp8266com/esp8266/tools/sdk/lib/liblwip.a differ diff --git a/hardware/esp8266com/esp8266/tools/sdk/lib/libmain.a b/hardware/esp8266com/esp8266/tools/sdk/lib/libmain.a index 90caec3de..14af9b0bc 100644 Binary files a/hardware/esp8266com/esp8266/tools/sdk/lib/libmain.a and b/hardware/esp8266com/esp8266/tools/sdk/lib/libmain.a differ diff --git a/hardware/esp8266com/esp8266/tools/sdk/lib/libnet80211.a b/hardware/esp8266com/esp8266/tools/sdk/lib/libnet80211.a index 648852e52..14a1d09d3 100644 Binary files a/hardware/esp8266com/esp8266/tools/sdk/lib/libnet80211.a and b/hardware/esp8266com/esp8266/tools/sdk/lib/libnet80211.a differ diff --git a/hardware/esp8266com/esp8266/tools/sdk/lib/libpp.a b/hardware/esp8266com/esp8266/tools/sdk/lib/libpp.a index e42233ab3..9238f6c53 100644 Binary files a/hardware/esp8266com/esp8266/tools/sdk/lib/libpp.a and b/hardware/esp8266com/esp8266/tools/sdk/lib/libpp.a differ diff --git a/hardware/esp8266com/esp8266/tools/sdk/lib/libsmartconfig.a b/hardware/esp8266com/esp8266/tools/sdk/lib/libsmartconfig.a index 03f296fd9..7fb8490a7 100644 Binary files a/hardware/esp8266com/esp8266/tools/sdk/lib/libsmartconfig.a and b/hardware/esp8266com/esp8266/tools/sdk/lib/libsmartconfig.a differ diff --git a/hardware/esp8266com/esp8266/tools/sdk/lib/libssl.a b/hardware/esp8266com/esp8266/tools/sdk/lib/libssl.a index 1608d8484..add670e37 100644 Binary files a/hardware/esp8266com/esp8266/tools/sdk/lib/libssl.a and b/hardware/esp8266com/esp8266/tools/sdk/lib/libssl.a differ diff --git a/hardware/esp8266com/esp8266/tools/sdk/lib/libupgrade.a b/hardware/esp8266com/esp8266/tools/sdk/lib/libupgrade.a index d0d2d5bda..e0dda74eb 100644 Binary files a/hardware/esp8266com/esp8266/tools/sdk/lib/libupgrade.a and b/hardware/esp8266com/esp8266/tools/sdk/lib/libupgrade.a differ diff --git a/hardware/esp8266com/esp8266/tools/sdk/lib/libwpa.a b/hardware/esp8266com/esp8266/tools/sdk/lib/libwpa.a index c6f1bb620..b5a513509 100644 Binary files a/hardware/esp8266com/esp8266/tools/sdk/lib/libwpa.a and b/hardware/esp8266com/esp8266/tools/sdk/lib/libwpa.a differ diff --git a/hardware/esp8266com/esp8266/tools/sdk/version b/hardware/esp8266com/esp8266/tools/sdk/version index 1aeff03a8..d3b2eb935 100644 --- a/hardware/esp8266com/esp8266/tools/sdk/version +++ b/hardware/esp8266com/esp8266/tools/sdk/version @@ -1 +1 @@ -1.1.1_15_06_05 \ No newline at end of file +1.1.2_15_06_16_p1 \ No newline at end of file