Merge pull request #7 from meshtastic/dev-wifi

Bringing in the API changes
meshtastic · Sep 20, 2020 · 468ad39 · 468ad39
2 parents 3412ecf + 5cbe06c
commit 468ad39
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 5 deletions.
diff --git a/proto b/proto
diff --git a/src/esp32/WiFiServerAPI.cpp b/src/esp32/WiFiServerAPI.cpp
@@ -44,7 +44,7 @@ WiFiServerPort::WiFiServerPort() : WiFiServer(MESHTASTIC_PORTNUM) {}
 
 void WiFiServerPort::init()
 {
-    DEBUG_MSG("Listening on TCP port %d\n", MESHTASTIC_PORTNUM);
+    DEBUG_MSG("API server sistening on TCP port %d\n", MESHTASTIC_PORTNUM);
     begin();
 }
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -37,12 +37,12 @@
 #include "SPILock.h"
 #include "graphics/Screen.h"
 #include "main.h"
+#include "meshwifi/meshhttp.h"
+#include "meshwifi/meshwifi.h"
 #include "sleep.h"
 #include "timing.h"
 #include <OneButton.h>
 #include <Wire.h>
-#include "meshwifi/meshwifi.h"
-#include "meshwifi/meshhttp.h"
 // #include <driver/rtc_io.h>
 
 #ifndef NO_ESP32
@@ -395,6 +395,8 @@ void loop()
     userButtonAlt.tick();
 #endif
 
+    loopWifi();
+
     // Show boot screen for first 3 seconds, then switch to normal operation.
     static bool showingBootScreen = true;
     if (showingBootScreen && (timing::millis() > 3000)) {

diff --git a/src/meshwifi/meshwifi.cpp b/src/meshwifi/meshwifi.cpp
@@ -1,5 +1,6 @@
 #include "meshwifi.h"
 #include "NodeDB.h"
+#include "WiFiServerAPI.h"
 #include "configuration.h"
 #include "main.h"
 #include "meshwifi/meshhttp.h"
@@ -9,6 +10,7 @@
 static void WiFiEvent(WiFiEvent_t event);
 
 DNSServer dnsServer;
+static WiFiServerPort *apiPort;
 
 bool isWifiAvailable()
 {
@@ -96,6 +98,23 @@ void initWifi()
         DEBUG_MSG("Not using WIFI\n");
 }
 
+/// Perform idle loop processing required by the wifi layer
+void loopWifi()
+{
+    // FIXME, once we have coroutines - just use a coroutine instead of this nasty loopWifi()
+    if (apiPort)
+        apiPort->loop();
+}
+
+static void initApiServer()
+{
+    // Start API server on port 4403
+    if (!apiPort) {
+        apiPort = new WiFiServerPort();
+        apiPort->init();
+    }
+}
+
 static void WiFiEvent(WiFiEvent_t event)
 {
     DEBUG_MSG("************ [WiFi-event] event: %d ************\n", event);
@@ -131,6 +150,7 @@ static void WiFiEvent(WiFiEvent_t event)
 
         // Start web server
         initWebServer();
+        initApiServer();
 
         break;
     case SYSTEM_EVENT_STA_LOST_IP:
@@ -154,6 +174,7 @@ static void WiFiEvent(WiFiEvent_t event)
 
         // Start web server
         initWebServer();
+        initApiServer();
 
         break;
     case SYSTEM_EVENT_AP_STOP:

diff --git a/src/meshwifi/meshwifi.h b/src/meshwifi/meshwifi.h
@@ -11,6 +11,10 @@
 
 void initWifi();
 void deinitWifi();
+
+/// Perform idle loop processing required by the wifi layer
+void loopWifi();
+
 bool isWifiAvailable();
 
 void handleDNSResponse();

diff --git a/src/nrf52/wifi-nrf52.cpp b/src/nrf52/wifi-nrf52.cpp
@@ -10,4 +10,7 @@ bool isWifiAvailable()
     return false;
 }
 
-void handleWebResponse() {}
+void handleWebResponse() {}
+
+/// Perform idle loop processing required by the wifi layer
+void loopWifi() {}