Update to SDK 1.4 (esp8266#908)

Author: igrr

cores/esp8266/core_esp8266_main.cpp

@@ -31,7 +31,7 @@ extern "C" {
 #include "user_interface.h"
 #include "cont.h"
 }
-#define LOOP_TASK_PRIORITY 0
+#define LOOP_TASK_PRIORITY 1
 #define LOOP_QUEUE_SIZE    1
 
 #define OPTIMISTIC_YIELD_TIME_US 16000
@@ -80,7 +80,7 @@ extern "C" void esp_yield() {
 }
 
 extern "C" void esp_schedule() {
-    system_os_post(LOOP_TASK_PRIORITY, 0, 0);
+    ets_post(LOOP_TASK_PRIORITY, 0, 0);
 }
 
 extern "C" void __yield() {
@@ -152,7 +152,7 @@ extern "C" void user_init(void) {
 
     cont_init(&g_cont);
 
-    system_os_task(loop_task,
+    ets_task(loop_task,
         LOOP_TASK_PRIORITY, g_loop_queue,
         LOOP_QUEUE_SIZE);
 

cores/esp8266/core_esp8266_phy.c

@@ -231,6 +231,13 @@ static uint8_t phy_init_data[128] =
     // force_freq_offset
     // signed, unit is 8kHz
     [113] = 0,
+
+    // rf_cal_use_flash
+    // 0: RF init no RF CAL, using all RF CAL data in flash, it takes about 2ms for RF init
+    // 1: RF init only do TX power control CAL, others using RF CAL data in flash , it takes about 20ms for RF init
+    // 2: RF init no RF CAL, using all RF CAL data in flash, it takes about 2ms for RF init  (same as 0?!)
+    // 3: RF init do all RF CAL, it takes about 200ms for RF init
+    [114] = 2
 };
 
 extern int __real_register_chipv6_phy(uint8_t* init_data);

tools/sdk/changelog.txt

@@ -1,3 +1,83 @@
+esp_iot_sdk_v1.4.0_15_09_18 Release Note
+----------------------------------------
+Resolved Issues(Bugs below are eligible for Bug Bounty Program):
+1.Espconn may fail to download big chunk of data(FOTA).
+2.Invalid TCP data sent issue.
+3.Fatal exceptions occur when change WiFi mode in WiFi scan callback.
+4.WiFi compatibility problem of special network card.
+5.Deep sleep may appear high current under certain circumstances.
+
+Optimization:
+1. Add a new method to check memory leaks (API : system_show_malloc).
+2. Add print information when exception happens.
+3. Resolve the problem of os_timer_disarm.
+4. Optimize  DHCP server, add API to set up the lease time of DHCP server. More details are in the “Added APIs”.
+5. Add event “EVENT_STAMODE_DHCP_TIMEOUT” for the DHCP timeout handling mechanism.
+6. Optimize handling of the reception of data and ZWP message.
+7. Add new APIs to support SSL bidirectional authentication. More details are in the “Added APIs”.
+8. Add new APIs to set up SSL certificates and encryption keys.   API espconn_secure_set_default_certificate  and  espconn_secure_set_default_private_key should be called to set SSL certificate and secure key, if ESP8266 runs as SSL server. More details are in the “Added APIs”.
+9. Optimize the process of FOTA (firmware upgrade through WiFi.
+10. Optimize mDNS, and resolve the problem that in certain case the ESP8266 softAP can not work in the sta+AP mode.
+11. Release mesh as a lib in the esp_iot_sdk, and do not provide SDK of the mesh version any more.
+12. Optimize mesh’s handling of UDP packets.
+13. Optimize checking of the validity of the mesh API’s parameters.
+14. Add an API to set up the largest hop of mesh. For detailed information, go to mesh instructions.
+15. Optimize the process of powering up and booting to shorten booting time by 20 ms.
+16. Optimize the function of automatic frequency offset calibration.
+17. Optimize the function of sniffer.
+18. Strengthen reliability of the checking of beacon timeout.
+19.Optimize Wi-Fi event mechanism, and add event “ EVENT_SOFTAPMODE_PROBEREQRECVED”, and reason for a failed connection.
+20. Optimize Wi-Fi callback function and strengthen reliability of the software.
+21. Add the function of data transferring between stations in the soft-AP mode.
+22. Update SmartConfig to the version of 2.5.1.
+
+23.Update esp_init_data_default.bin. Please use the newest esp_init_data_default.bin when burning.
+
+24.Modify the espconn pointer in the receive callback of UDP. Parameters  remote_ip and remote_port in it are the remote IP and port set by espconn_create. If users want to obtain IP and ports of the current sender, please call espconn_get_connection_info to get relevant information.
+
+
+Added APIs:
+1.System API
+system_show_malloc : for checking memory leak, to print the memory usage.
+2.DHCP server lease time related APIs
+wifi_softap_set_dhcps_lease_time：set ESP8266 softAP DHCP server lease time.
+wifi_softap_get_dhcps_lease_time：check ESP8266 softAP DHCP server lease time.
+wifi_softap_reset_dhcps_lease_time：reset ESP8266 softAP DHCP server lease time which is 120 minutes by default.
+3.wifi_station_dhcpc_set_maxtry：set the maximum number that ESP8266 station DHCP client will try to reconnect to the AP.
+4.Force sleep APIs
+wifi_fpm_open：enable force sleep function.
+wifi_fpm_close：disable force sleep function.
+wifi_fpm_do_sleep：force ESP8266 enter sleep mode.
+wifi_fpm_do_wakeup：wake ESP8266 up from force sleep.
+wifi_fpm_set_sleep_type：set sleep type of force sleep function.
+wifi_fpm_get_sleep_type：get sleep type of force sleep function.
+5.Send packet freedom APIs (to send user-define 802.11 packets)
+wifi_register_send_pkt_freedom_cb：register a callback for sending user-define 802.11 packets.
+wifi_unregister_send_pkt_freedom_cb：unregister the callback for sending user-define 802.11 packets.
+wifi_send_pkt_freedom：send user-define 802.11 packet.
+6.RFID LOCP APIs
+wifi_rfid_locp_recv_open：enable RFID LOCP to receive WDS packets.
+wifi_rfid_locp_recv_close：disable RFID LOCP.
+wifi_register_rfid_locp_recv_cb：register a callback of receiving WDS packets.
+wifi_unregister_rfid_locp_recv_cb：unregister the callback of receiving WDS packets.
+7.Rate Control APIs
+wifi_set_user_fixed_rate：set the fixed rate and mask of sending data from ESP8266
+wifi_get_user_fixed_rate：check the fixed rate and mask of ESP8266
+wifi_set_user_sup_rate：set the rate range supported by ESP8266 to limit the rate of sending packets from other devices.
+wifi_set_user_rate_limit：limit the rate of sending data from ESP8266.
+wifi_set_user_limit_rate_mask：set the interfaces of ESP8266 whose rate of sending packets is limited by wifi_set_user_rate_limit.
+wifi_get_user_limit_rate_mask：get the interfaces of ESP8266 whose rate of sending packets is limited by wifi_set_user_rate_limit.
+8.Espconn APIs
+espconn_sendto：send UDP data.
+espconn_secure_cert_req_enable：enable certificates verification function when ESP8266 runs as SSL client.
+espconn_secure_cert_req_disable：disable certificates verification function when ESP8266 runs as SSL client.
+espconn_secure_set_default_certificate：set the certificate when ESP8266 runs as SSL server.
+espconn_secure_set_default_private_key：set the encryption key when ESP8266 runs as SSL server.
+9.SmartConfig API
+smartconfig_set_type: set the protocol type of SmartConfig.
+
+
+
 esp_iot_sdk_v1.3.0_15_08_10_p1 Release Note
 ----------------------------------------
 

tools/sdk/include/espconn.h

@@ -14,13 +14,15 @@ typedef void (* espconn_reconnect_callback)(void *arg, sint8 err);
 #define ESPCONN_TIMEOUT    -3    /* Timeout.                 */
 #define ESPCONN_RTE        -4    /* Routing problem.         */
 #define ESPCONN_INPROGRESS  -5    /* Operation in progress    */
+#define ESPCONN_MAXNUM		-7	 /* Total number exceeds the set maximum*/
 
 #define ESPCONN_ABRT       -8    /* Connection aborted.      */
 #define ESPCONN_RST        -9    /* Connection reset.        */
 #define ESPCONN_CLSD       -10   /* Connection closed.       */
 #define ESPCONN_CONN       -11   /* Not connected.           */
 
 #define ESPCONN_ARG        -12   /* Illegal argument.        */
+#define ESPCONN_IF		   -14	 /* UDP send error			 */
 #define ESPCONN_ISCONN     -15   /* Already connected.       */
 
 #define ESPCONN_HANDSHAKE  -28   /* ssl handshake failed	 */
@@ -289,6 +291,17 @@ sint8 espconn_send(struct espconn *espconn, uint8 *psent, uint16 length);
 
 sint8 espconn_sent(struct espconn *espconn, uint8 *psent, uint16 length);
 
+/******************************************************************************
+ * FunctionName : espconn_sendto
+ * Description  : send data for UDP
+ * Parameters   : espconn -- espconn to set for UDP
+ *                psent -- data to send
+ *                length -- length of data to send
+ * Returns      : error
+*******************************************************************************/
+
+sint16 espconn_sendto(struct espconn *espconn, uint8 *psent, uint16 length);
+
 /******************************************************************************
  * FunctionName : espconn_regist_connectcb
  * Description  : used to specify the function that should be called when
@@ -502,6 +515,51 @@ bool espconn_secure_ca_enable(uint8 level, uint8 flash_sector );
 
 bool espconn_secure_ca_disable(uint8 level);
 
+
+/******************************************************************************
+ * FunctionName : espconn_secure_cert_req_enable
+ * Description  : enable the client 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_cert_req_enable(uint8 level, uint8 flash_sector );
+
+/******************************************************************************
+ * FunctionName : espconn_secure_ca_disable
+ * Description  : disable the client 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_cert_req_disable(uint8 level);
+
+/******************************************************************************
+ * FunctionName : espconn_secure_set_default_certificate
+ * Description  : Load the certificates in memory depending on compile-time
+ * 				  and user options.
+ * Parameters   : certificate -- Load the certificate
+ *				  length -- Load the certificate length
+ * Returns      : result true or false
+*******************************************************************************/
+
+bool espconn_secure_set_default_certificate(const uint8* certificate, uint16 length);
+
+/******************************************************************************
+ * FunctionName : espconn_secure_set_default_private_key
+ * Description  : Load the key in memory depending on compile-time
+ * 				  and user options.
+ * Parameters   : private_key -- Load the key
+ *				  length -- Load the key length
+ * Returns      : result true or false
+*******************************************************************************/
+
+bool espconn_secure_set_default_private_key(const uint8* private_key, uint16 length);
+
 /******************************************************************************
  * FunctionName : espconn_secure_accept
  * Description  : The function given as the listen

tools/sdk/include/ets_sys.h

@@ -145,11 +145,9 @@ inline uint32_t ETS_INTR_PENDING(void)
     ETS_INTR_DISABLE(ETS_SLC_INUM)
 
 
-void *pvPortMalloc(size_t xWantedSize) __attribute__((malloc, alloc_size(1)));
-void *pvPortRealloc(void* ptr, size_t xWantedSize) __attribute__((alloc_size(2)));
-void pvPortFree(void *ptr);
-void *vPortMalloc(size_t xWantedSize) __attribute__((malloc, alloc_size(1)));
-void vPortFree(void *ptr);
+void *pvPortMalloc(size_t xWantedSize, const char* file, int line) __attribute__((malloc, alloc_size(1)));
+void *pvPortRealloc(void* ptr, size_t xWantedSize, const char* file, int line) __attribute__((alloc_size(2)));
+void vPortFree(void *ptr, const char* file, int line);
 void *ets_memcpy(void *dest, const void *src, size_t n);
 void *ets_memset(void *s, int c, size_t n);
 void ets_timer_arm_new(ETSTimer *a, int b, int c, int isMstimer);
@@ -174,5 +172,8 @@ void ets_intr_lock();
 void ets_intr_unlock();
 int ets_vsnprintf(char * s, size_t n, const char * format, va_list arg)  __attribute__ ((format (printf, 3, 0)));
 int ets_vprintf(const char * format, va_list arg) __attribute__ ((format (printf, 1, 0)));
+bool ets_task(ETSTask task, uint8 prio, ETSEvent *queue, uint8 qlen);
+bool ets_post(uint8 prio, ETSSignal sig, ETSParam par);
+
 
 #endif /* _ETS_SYS_H */

tools/sdk/include/mem.h

@@ -1,13 +1,27 @@
 #ifndef __MEM_H__
 #define __MEM_H__
 
-//void *pvPortMalloc( size_t xWantedSize );
-//void vPortFree( void *pv );
-//void *pvPortZalloc(size_t size);
+#ifndef MEMLEAK_DEBUG
+#define os_free(s)        vPortFree(s, "", 0)
+#define os_malloc(s)      pvPortMalloc(s, "", 0)
+#define os_calloc(s)      pvPortCalloc(s, "", 0);
+#define os_realloc(p, s)  pvPortRealloc(p, s, "", 0)
+#define os_zalloc(s)      pvPortZalloc(s, "", 0)
+#else
+#define os_free(s) \
+do{\
+	const char *file = mem_debug_file;\
+    vPortFree(s, file, __LINE__);\
+}while(0)
 
-#define os_malloc   pvPortMalloc
-#define os_free     vPortFree
-#define os_zalloc   pvPortZalloc
-#define os_realloc  pvPortRealloc
+#define os_malloc(s) ({const char *file = mem_debug_file; pvPortMalloc(s, file, __LINE__);})
 
+#define os_calloc(s) ({const char *file = mem_debug_file; pvPortCalloc(s, file, __LINE__);})
+
+#define os_realloc(p, s) ({const char *file = mem_debug_file; pvPortRealloc(p, s, file, __LINE__);})
+
+#define os_zalloc(s) ({const char *file = mem_debug_file; pvPortZalloc(s, file, __LINE__);})
 #endif
+
+#endif
+

tools/sdk/include/mesh.h

@@ -0,0 +1,61 @@
+#ifndef __LWIP_API_MESH_H__
+#define __LWIP_API_MESH_H__
+
+#include "ip_addr.h"
+#include "user_interface.h"
+#include "espconn.h"
+
+typedef void (* espconn_mesh_callback)();
+
+enum mesh_type {
+	MESH_CLOSE = 0,
+    MESH_LOCAL,
+    MESH_ONLINE,
+    MESH_NONE = 0xFF
+};
+
+enum mesh_status {
+    MESH_DISABLE = 0,
+    MESH_WIFI_CONN,
+    MESH_NET_CONN,
+    MESH_LOCAL_AVAIL,
+    MESH_ONLINE_AVAIL
+};
+
+enum mesh_node_type {
+	MESH_NODE_PARENT = 0,
+	MESH_NODE_CHILD,
+	MESH_NODE_ALL
+};
+
+bool espconn_mesh_local_addr(struct ip_addr *ip);
+bool espconn_mesh_get_node_info(enum mesh_node_type type,
+		                        uint8_t **info, uint8_t *count);
+bool espconn_mesh_get_router(struct station_config *router);
+bool espconn_mesh_set_router(struct station_config *router);
+bool espconn_mesh_encrypt_init(AUTH_MODE mode, uint8_t *passwd, uint8_t passwd_len);
+bool espconn_mesh_set_ssid_prefix(uint8_t *prefix, uint8_t prefix_len);
+bool espconn_mesh_set_max_hops(uint8_t max_hops);
+
+char * espconn_json_find_section(const char *pbuf, u16 len, const char *section);
+
+sint8 espconn_mesh_connect(struct espconn *usr_esp);
+sint8 espconn_mesh_disconnect(struct espconn *usr_esp);
+sint8 espconn_mesh_get_status();
+sint8 espconn_mesh_sent(struct espconn *usr_esp, uint8 *pdata, uint16 len);
+
+uint8 espconn_mesh_get_max_hops();
+uint8 espconn_mesh_layer(struct ip_addr *ip);
+uint32_t user_json_get_value(const char *pbuffer, uint16_t buf_len,
+		                     const uint8_t *json_key);
+
+void espconn_mesh_enable(espconn_mesh_callback enable_cb, enum mesh_type type);
+void espconn_mesh_disable(espconn_mesh_callback disable_cb);
+void espconn_mesh_init();
+void espconn_mesh_init_group_list(uint8_t *dev_mac, uint16_t dev_count);
+void espconn_mesh_set_dev_type(uint8_t dev_type);
+void espconn_mesh_setup_timer(os_timer_t *timer, uint32_t time,
+                              os_timer_func_t cb, void *arg, bool repeat);
+
+#endif
+

tools/sdk/include/smartconfig.h

@@ -17,6 +17,7 @@ typedef enum {
 typedef enum {
     SC_TYPE_ESPTOUCH = 0,
     SC_TYPE_AIRKISS,
+	SC_TYPE_ESPTOUCH_AIRKISS,
 } sc_type;
 
 typedef void (*sc_callback_t)(sc_status status, void *pdata);
@@ -25,5 +26,6 @@ const char *smartconfig_get_version(void);
 bool smartconfig_start(sc_callback_t cb, ...);
 bool smartconfig_stop(void);
 bool esptouch_set_timeout(uint8 time_s); //15s~255s, offset:45s
+bool smartconfig_set_type(sc_type type);
 
 #endif