Merge pull request #680 from Links2004/esp8266

igrr · igrr · commit 6e2f15719ac0 · 2015-08-10T18:46:26.000+03:00
esp_iot_sdk_v1.3.0_15_08_10_p1
diff --git a/cores/esp8266/Esp.cpp b/cores/esp8266/Esp.cpp
@@ -100,7 +100,7 @@ void EspClass::wdtDisable(void)
 
 void EspClass::wdtFeed(void)
 {
-
+    system_soft_wdt_feed();
 }
 
 extern "C" void esp_yield();
diff --git a/tools/sdk/changelog.txt b/tools/sdk/changelog.txt
@@ -1,3 +1,15 @@
+esp_iot_sdk_v1.3.0_15_08_10_p1 Release Note
+----------------------------------------
+
+Here is a patch based on esp_iot_sdk_v1.3.0 (non-OS SDK) resolved issue that if there are 2 connections, one is normal TCP connection, the other is SSL connection, it may cause memory leak.
+
+Download and unzip the attachment, replace the lib in esp_iot_sdk/lib folder.
+
+Please do not set the same priority for two different tasks when using system_os_task.
+
+Sorry for the inconvenience.
+
+
 esp_iot_sdk_v1.3.0_15_08_08 Release Note
 ----------------------------------------
 
diff --git a/tools/sdk/lib/libssl.a b/tools/sdk/lib/libssl.a
diff --git a/tools/sdk/version b/tools/sdk/version
@@ -1 +1 @@
-1.3.0
+1.3.0_15_08_10_p1

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ void EspClass::wdtDisable(void)`
`100`	`100`
`101`	`101`	`void EspClass::wdtFeed(void)`
`102`	`102`	`{`
`103`		`-`
	`103`	`+ system_soft_wdt_feed();`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`extern "C" void esp_yield();`