Merge pull request #533 from jeremypoulter/wifi_connection-issue

Re-work of the network manager

Author: glynhudson

platformio.ini

@@ -38,7 +38,7 @@ lib_deps =
   jeremypoulter/[email protected]
   jeremypoulter/[email protected]
   jeremypoulter/[email protected]
-  jeremypoulter/[email protected].2
+  jeremypoulter/[email protected].3
   matth-x/[email protected]
   matth-x/[email protected]
 lib_ignore = WebSockets ; ArduinoOcpp: don't compile built-in WS library
@@ -60,6 +60,8 @@ debug_flags =
   #-D ENABLE_DEBUG_TESLA_CLIENT
   #-D ENABLE_DEBUG_LIMIT
   #-D ENABLE_PROFILE
+  #-D ENABLE_NOISY_PROFILE
+  #-D ENABLE_DEBUG_MICROTASKS
 src_build_flags =
 #  -D ARDUINOJSON_USE_LONG_LONG
 #  -D ENABLE_ASYNC_WIFI_SCAN
@@ -114,13 +116,13 @@ build_flags =
   ${common.build_flags}
 #upload_port = openevse.local
 upload_speed = 921600
-monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 board_build.partitions = ${common.build_partitions}
 #platform_packages =
 #  ; use a special branch
 #  framework-arduinoespressif32 @ https://github.com/marcovannoord/arduino-esp32.git#idf-release/v4.0
 #    platformio/framework-arduinoespressif32 @ ~3.10006.0
+monitor_speed = 115200
 monitor_filters =
   esp32_exception_decoder
 
@@ -248,7 +250,6 @@ build_flags =
   -D DEBUG_PORT=Serial
   -D RAPI_PORT=Serial2
   -D ENABLE_WIRED_ETHERNET
-  -D RANDOM_SEED_CHANNEL=1
 # https://github.com/espressif/arduino-esp32/blob/master/libraries/WiFi/examples/ETH_LAN8720/ETH_LAN8720.ino
 
 [env:openevse_esp32-gateway-f]
@@ -266,7 +267,7 @@ build_flags =
   -D DEBUG_PORT=Serial
   -D RAPI_PORT=Serial2
   -D ENABLE_WIRED_ETHERNET
-  -D RANDOM_SEED_CHANNEL=1
+  -D RESET_ETH_PHY_ON_BOOT=1
   -D RX2=16
   -D TX2=32
 board_build.extra_flags = "-DARDUINO_ESP32_GATEWAY=\'F\'"
@@ -278,7 +279,6 @@ upload_speed = 921600
 extends = env:openevse_esp32-gateway-f
 build_flags =
   ${env:openevse_esp32-gateway-f.build_flags}
-  -D RESET_ETH_PHY_ON_BOOT=1
 board_build.extra_flags = "-DARDUINO_ESP32_GATEWAY=\'E\'"
 
 [env:openevse_esp32-gateway-e_dev]
@@ -309,7 +309,6 @@ build_flags =
   -D DEBUG_PORT=Serial
   -D RAPI_PORT=Serial2
   -D ENABLE_WIRED_ETHERNET
-  -D RANDOM_SEED_CHANNEL=1
   -D RESET_ETH_PHY_ON_BOOT=1
 upload_speed = 921600
 

src/app_config.cpp

@@ -1,6 +1,7 @@
 #include "emonesp.h"
 #include "espal.h"
 #include "divert.h"
+#include "net_manager.h"
 #include "mqtt.h"
 #include "ocpp.h"
 #include "tesla_client.h"
@@ -393,3 +394,6 @@ config_reset() {
   LittleFS.format();
   config_load_settings();
 }
+
+
+

src/emonesp.h

@@ -51,7 +51,7 @@
 #endif
 
 #ifndef WIFI_CLIENT_RETRY_TIMEOUT
-#define WIFI_CLIENT_RETRY_TIMEOUT (5 * 60 * 1000)
+#define WIFI_CLIENT_RETRY_TIMEOUT           (10 * 1000)
 #endif
 
 #ifndef WIFI_CLIENT_DISCONNECTS_BEFORE_AP
@@ -61,11 +61,15 @@
 // Used to change the ADC channel used for seeding the rndom number generator
 // Should be set to an unconnected pin
 #ifndef RANDOM_SEED_CHANNEL
-#if WIFI_BUTTON != 0 && (!defined(WIFI_LED) || WIFI_LED != 0)
-#define RANDOM_SEED_CHANNEL 0
-#else
-#define RANDOM_SEED_CHANNEL 1
-#endif
+  #ifdef ESP32
+    #define RANDOM_SEED_CHANNEL 14
+  #else
+    #if WIFI_BUTTON != 0 && (!defined(WIFI_LED) || WIFI_LED != 0)
+      #define RANDOM_SEED_CHANNEL 0
+    #else
+      #define RANDOM_SEED_CHANNEL 1
+    #endif
+  #endif
 #endif
 
 #ifndef HAL_ID_ENCODING_BASE

src/input.cpp

@@ -186,10 +186,10 @@ void input_setup()
     {
       case OPENEVSE_WIFI_MODE_AP:
       case OPENEVSE_WIFI_MODE_AP_DEFAULT:
-        net_wifi_turn_on_ap();
+        net.wifiTurnOnAp();
         break;
       case OPENEVSE_WIFI_MODE_CLIENT:
-        net_wifi_turn_off_ap();
+        net.wifiTurnOffAp();
         break;
     }
   });

src/main.cpp

@@ -70,6 +70,8 @@ Scheduler scheduler(evse);
 ManualOverride manual(evse);
 DivertTask divert(evse);
 
+NetManagerTask net(lcd, ledManager, timeManager);
+
 RapiSender &rapiSender = evse.getSender();
 
 unsigned long Timer1; // Timer for events once every 30 seconds
@@ -137,7 +139,7 @@ void setup()
   ledManager.begin(evse);
 
   // Initialise the WiFi
-  net_setup();
+  net.begin();
   DBUGF("After net_setup: %d", ESPAL.getFreeHeap());
 
   // Initialise Mongoose networking library
@@ -177,7 +179,6 @@ loop() {
   Profile_End(Mongoose, 10);
 
   web_server_loop();
-  net_loop();
   ota_loop();
   rapiSender.loop();
 
@@ -216,7 +217,7 @@ loop() {
     }
   }
 
-  if(net_is_connected())
+  if(net.isConnected())
   {
     if (config_tesla_enabled()) {
       teslaClient.loop();
@@ -288,7 +289,7 @@ class SystemRestart : public MicroTasks::Alarm
     void Trigger()
     {
       DBUGLN("Restarting...");
-      net_wifi_disconnect();
+      net.wifiStop();
       ESPAL.reset();
     }
 } systemRestartAlarm;
@@ -336,4 +337,4 @@ void handle_serial()
       DEBUG_PORT.printf("{\"code\":200,\"msg\":\"%s\"}\n", config_modified ? "done" : "no change");
     }
   }
-}
+}

src/mqtt.cpp

@@ -271,7 +271,7 @@ mqtt_connect()
     doc["id"] = ESPAL.getLongId();
     doc["name"] = esp_hostname;
     doc["mqtt"] = mqtt_topic;
-    doc["http"] = "http://"+ipaddress+"/";
+    doc["http"] = "http://"+net.getIp()+"/";
 
     // Once connected, publish an announcement..
     String announce = "";