Merge pull request #1202 from espruino/ESP32

fix ESP32 'Not connected to the internet'
espruino · Jul 23, 2017 · 228e78c · 228e78c
2 parents 1b6838b + 10711c9
commit 228e78c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/libs/network/esp32/jswrap_esp32_network.c b/libs/network/esp32/jswrap_esp32_network.c
@@ -520,10 +520,15 @@ static void sendWifiCompletionCB(
   *g_jsCallback = NULL;
 } // End of sendWifiCompletionCB
 
+/*JSON{
+  "type":"init",
+  "generate":"jswrap_esp32_wifi_soft_init"
+}
+
 /**
  * Perform a soft initialization of ESP32 networking.
  */
-void esp32_wifi_soft_init() {
+void jswrap_esp32_wifi_soft_init() {
   JsNetwork net;
   networkCreate(&net, JSNETWORKTYPE_ESP32); // Set the network type to be ESP32
   networkState = NETWORKSTATE_ONLINE; // Set the global state of the networking to be online

diff --git a/libs/network/esp32/jswrap_esp32_network.h b/libs/network/esp32/jswrap_esp32_network.h
@@ -25,4 +25,4 @@ void jswrap_ESP32_ping(
 );
 
 void esp32_wifi_init();
-void esp32_wifi_soft_init();
+void jswrap_esp32_wifi_soft_init();
diff --git a/targets/esp32/jshardware.c b/targets/esp32/jshardware.c
@@ -141,21 +141,20 @@ void jshInit() {
  * Reset the Espruino environment.
  */
 void jshReset() {
-    jshResetDevices();
-    jshPinDefaultPullup() ;
-    UartReset();
-	RMTReset();
-	ADCReset();
-	SPIReset();
-	I2CReset();
+  jshResetDevices();
+  jshPinDefaultPullup() ;
+  UartReset();
+  RMTReset();
+  ADCReset();
+  SPIReset();
+  I2CReset();
 }
 
 /**
  * Re-init the ESP32 after a soft-reset
  */
 void jshSoftInit() {
-  //jsWarn(">> jshSoftInit()\n");
-  esp32_wifi_soft_init();
+  jswrap_esp32_wifi_soft_init();
 }
 
 /**