From 581c172e8e925a62e63674de1a42969f42b839ba Mon Sep 17 00:00:00 2001
From: Andrey Klimov <anklimov@gmail.com>
Date: Fri, 22 Mar 2019 02:26:06 +0300
Subject: [PATCH] few ESP improvements

---
 lighthub/main.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/lighthub/main.cpp b/lighthub/main.cpp
index 3999c72..c206871 100644
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -582,18 +582,27 @@ void onInitialStateInitLAN() {
 #if defined(ARDUINO_ARCH_ESP8266) and defined(WIFI_MANAGER_DISABLE)
     if(!wifiInitialized) {
                 WiFi.mode(WIFI_STA);
-                debugSerial<<F("WIFI AP/Password:")<<QUOTE(ESP_WIFI_AP)<<F("/")<<QUOTE(ESP_WIFI_PWD);
+                debugSerial<<F("WIFI AP/Password:")<<QUOTE(ESP_WIFI_AP)<<F("/")<<QUOTE(ESP_WIFI_PWD)<<endl;
+
                 wifi_set_macaddr(STATION_IF,mac);
+                
                 WiFi.begin(QUOTE(ESP_WIFI_AP), QUOTE(ESP_WIFI_PWD));
+                int wifi_connection_wait = 10000;
+
+                while (WiFi.status() != WL_CONNECTED && wifi_connection_wait > 0) {
+                    delay(500);
+                    wifi_connection_wait -= 500;
+                    debugSerial<<".";
+                }
                 wifiInitialized = true;
             }
 #endif
 
-#ifdef ARDUINO_ARCH_ESP32
+#if defined(ARDUINO_ARCH_ESP32) and defined(WIFI_MANAGER_DISABLE)
     if(!wifiInitialized) {
     //    WiFi.mode(WIFI_STA);
         WiFi.disconnect();
-        debugSerial<<F("WIFI AP/Password:")<<QUOTE(ESP_WIFI_AP)<<F("/")<<QUOTE(ESP_WIFI_PWD);
+        debugSerial<<F("WIFI AP/Password:")<<QUOTE(ESP_WIFI_AP)<<F("/")<<QUOTE(ESP_WIFI_PWD)<<endl;
         WiFi.begin(QUOTE(ESP_WIFI_AP), QUOTE(ESP_WIFI_PWD));
 
         int wifi_connection_wait = 10000;
@@ -1381,6 +1390,7 @@ debugSerial<<endl;
 
 
 //    WDT_Disable( WDT ) ;
+#if defined(__SAM3X8E__)
 
     Serial.println(F("Reading 128 bits unique identifier") ) ;
     ReadUniqueID( UniqueID ) ;
@@ -1389,7 +1399,7 @@ debugSerial<<endl;
     for (byte b = 0 ; b < 4 ; b++)
       Serial.print ((unsigned int) UniqueID [b], HEX) ;
     Serial.println () ;
-
+#endif
 
 }