Merge 701bc0a837 into d46a6f092a

Wifi_NINA.cpp

@@ -21,7 +21,7 @@
 #include "defines.h"
 
 #ifdef WIFI_NINA
-//#include <vector>
+#include <vector>
 #include <SPI.h>
 #ifndef ARDUINO_GIGA
 #include <WifiNINA.h>
@@ -49,8 +49,8 @@
 #else
 #warning "WiFiNINA has no SPI port or pin allocations for this archiecture yet!"
 #endif
-#define MAX_CLIENTS 4
-/*class NetworkClient {
+
+class NetworkClient {
 public:
   NetworkClient(WiFiClient c) {
     wifi = c;
@@ -73,9 +73,9 @@ public:
   };
  WiFiClient wifi;
   bool inUse = true;
-};*/
+};
 
-//static std::vector<NetworkClient> clients; // a list to hold all clients
+static std::vector<NetworkClient> clients; // a list to hold all clients
 static WiFiServer *server = NULL;
 static RingStream *outboundRing = new RingStream(10240);
 static bool APmode = false;
@@ -149,7 +149,7 @@ bool WifiNINA::setup(const char *SSid,
     }
     if (WiFi.status() == WL_CONNECTED) {
       // String ip_str = sprintf("%xl", WiFi.localIP());
-      DIAG(F("Wifi STA IP %d.%d.%d.%d"), WiFi.localIP()[0], WiFi.localIP()[1],WiFi.localIP()[2],WiFi.localIP()[3]);
+      DIAG(F("Wifi STA IP %d.%d.%d.%d"), WiFi.localIP()[0], WiFi.localIP()[1],WiFi.localIP()[2],WiFi.localIP()[3],WiFi.localIP()[4],WiFi.localIP()[5]);
       wifiUp = true;
     } else {
       DIAG(F("Could not connect to Wifi SSID %s"),SSid);
@@ -164,7 +164,7 @@ bool WifiNINA::setup(const char *SSid,
       }
       if (WiFi.status() == WL_CONNECTED) {
   ip = WiFi.localIP();
-  DIAG(F("Wifi STA IP 2nd try %d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
+  DIAG(F("Wifi STA IP 2nd try %s"), ip);
   wifiUp = true;
       } else {
 	DIAG(F("Wifi STA mode FAIL. Will revert to AP mode"));
@@ -184,7 +184,7 @@ bool WifiNINA::setup(const char *SSid,
         strMac += String(mac[i], HEX);
       }
 
-      DIAG(F("MAC address: %x:%x:%x:%x:%x:%x"), mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+      DIAG(F("MAC address: %x:%x:%x:%x:%X;%x"), mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
       strMac.remove(0,9);
       strMac.replace(":","");
@@ -200,7 +200,7 @@ bool WifiNINA::setup(const char *SSid,
 		    channel) == WL_AP_LISTENING) {
       DIAG(F("Wifi AP SSID %s PASS %s"),strSSID.c_str(),havePassword ? password : strPass.c_str());
       ip = WiFi.localIP();
-      DIAG(F("Wifi AP IP %d.%d.%d.%d"),ip[0], ip[1], ip[2], ip[3]);
+      DIAG(F("Wifi AP IP %s"),ip);
       wifiUp = true;
       APmode = true;
     } else {
@@ -264,7 +264,7 @@ const char *wlerror[] = {
 			 "WL_DISCONNECTED"
 };
 
-/*void WifiNINA::loop() {
+void WifiNINA::loop() {
   int clientId; //tmp loop var
 
   // really no good way to check for LISTEN especially in AP mode?
@@ -284,7 +284,7 @@ const char *wlerror[] = {
       }
     }
     WiFiClient client = server->available();
-    if (client) {
+    if (client == true) {
       ///while (client.available() == true) {
         for (clientId=0; clientId<clients.size(); clientId++){
           if (clients[clientId].recycle(client)) {
@@ -368,78 +368,5 @@ const char *wlerror[] = {
       //DIAG(F("Running BT"));
     }
   }
-}*/
-
-WiFiClient clients[MAX_CLIENTS];  // nulled in setup
-
-void WifiNINA::checkForNewClient() {
-  auto newClient=server->available();
-  if (!newClient) return;
-  for (byte clientId=0; clientId<MAX_CLIENTS; clientId++){
-    if (!clients[clientId]) {
-      clients[clientId]=newClient; // use this slot
-      DIAG(F("New client connected to slot %d"),clientId); //TJF: brought in for debugging.
-      return;
-    }
-  }
 }
-
-void WifiNINA::checkForLostClients() {
-  for (byte clientId=0; clientId<MAX_CLIENTS; clientId++){
-    auto c=clients[clientId];
-    if(c && !c.connected()) {
-      DIAG(F("Remove client %d"), clientId);
-      CommandDistributor::forget(clientId);
-      //delete c; //TJF: this causes a crash when client drops.. commenting out for now.
-      //clients[clientId]=NULL; // TJF: what to do... what to do...
-    }
-  }
-}
-
-void WifiNINA::checkForClientInput() {
-  // Find a client providing input
-    for (byte clientId=0; clientId<MAX_CLIENTS; clientId++){
-      auto c=clients[clientId];
-      if(c) {
-        auto len=c.available();
-        if (len) {
-          // read data from client
-          byte cmd[len+1];
-          for(int i=0; i<len; i++) cmd[i]=c.read();
-          cmd[len]=0;
-          CommandDistributor::parse(clientId,cmd,outboundRing);
-        }
-      }
-    }
-}
-
-void WifiNINA::checkForClientOutput() {
-  // something to write out?
-  auto clientId=outboundRing->read();
-  if (clientId < 0) return;
-  auto replySize=outboundRing->count();
-  if (replySize==0) return; // nothing to send
-  auto c=clients[clientId];
-  if (!c) {
-    // client is gone, throw away msg
-    for (int i=0;i<replySize;i++) outboundRing->read();
-    DIAG(F("gone, drop message.")); //TJF: only for diag
-    return;
-  }
-  // emit data to the client object
-  // This should work in theory, the
-  DIAG(F("send message")); //TJF: only for diag
-  //TJF: the old code had to add a 0x00 byte to the end to terminate the
-  //TJF: c string, before sending it. i take it this is not needed?
-  for (int i=0;i<replySize;i++) c.write(outboundRing->read());
-}
-
-void WifiNINA::loop() {
-  checkForLostClients(); // ***
-  checkForNewClient();
-  checkForClientInput(); // ***
-  WiThrottle::loop(outboundRing); // allow withrottle to broadcast if needed
-  checkForClientOutput();
-}
-
 #endif // WIFI_NINA

Wifi_NINA.h

@@ -35,12 +35,8 @@ public:
 		    const char *hostname,
 		    const int port,
 		    const byte channel,
-				const bool forceAP);
+			const bool forceAP);
   static void loop();
 private:
-	static void checkForNewClient();
-	static void checkForLostClients();
-	static void checkForClientInput();
-	static void checkForClientOutput();
 };
 #endif //WifiNINA_h