Fixed sendToDcc for multiple interface support

CommandStation-EX.ino

@@ -18,9 +18,8 @@
 DCCEXParser serialParser;
 
 // (0) Declare NetworkInterfaces
-// NetworkInterface wifi;
+NetworkInterface wifi;
 NetworkInterface eth1;
-NetworkInterface eth2;
 // (0) Declared NetworkInterfaces
 
 // (1) Start NetworkInterface - HTTP callback
@@ -70,10 +69,18 @@ void setup()
 
   DIAG(F("\nFree RAM before network init: [%d]\n"),freeMemory());
   DIAG(F("\nNetwork Setup In Progress ...\n"));
+  
+  // WIFI, TCP on Port 2560, Wifi (ssid/password) has been configured permanetly already on the esp. If
+  // the connection fails will go into AP mode 
+  // wifi.setup(WIFI);   
+
+  // New connection on known ssid / password combo / port can be added as a last parameter other wise the default of 2560
+  // will be used. If it passes the connection will be stored as permanent default. If fails will go into AP mode.                
+  // wifi.setup(WIFI, TCP, F(WIFI_SSID), F(WIFI_PASSWORD), F(WIFI_HOSTNAME));
+  // wifi.setup(WIFI, TCP, F(WIFI_SSID), F(WIFI_PASSWORD), F(WIFI_HOSTNAME, 2323)
 
-  // wifi.setup(WIFI);                                  // WIFI, TCP on Port 2560
   eth1.setup(ETHERNET, TCP, 8888);                      // ETHERNET, TCP on Port 8888
-  eth2.setup(ETHERNET, TCP);  
+  wifi.setup(WIFI, TCP);                                // WIFI on Port 2560
   eth1.setHttpCallback(httpRequestHandler);             // HTTP callback
 
   DIAG(F("\nNetwork Setup done ..."));
@@ -105,7 +112,6 @@ void loop()
 NetworkInterface::loop();
 // (3) End Loop NetworkInterface
 
-
   LCDDisplay::loop();  // ignored if LCD not in use 
   
 // Optionally report any decrease in memory (will automatically trigger on first call)

NetworkConfig.h

@@ -27,6 +27,12 @@
  * 86:cf:fa:9f:07:79
  */
 
+/**
+ * @brief Build configuration
+ * 
+ */
+
+#define DCCEX_ENABLED      // uncomment to enable CS-EX integration; Commented will operate as standalone and only echo commands as replies
 
 /**
  * @brief Network operational configuration
@@ -43,6 +49,14 @@
 #define MAX_INTERFACES  4                                       // Consume too much memeory beyond in general not more than 2 should be required
 #define MAX_SOCK_NUM    8                                       // Maximum number of sockets allowed for any WizNet based EthernetShield. The W5100 only supports 4
 #define MAX_WIFI_SOCK   5                                       // ESP8266 doesn't support more than 5 connections
-#define MAX_ETH_BUFFER  64                                      // maximum length we read in one go from a TCP packet.
+#define MAX_ETH_BUFFER  128                                      // maximum length we read in one go from a TCP packet.
 #define MAX_OVERFLOW    MAX_ETH_BUFFER / 2                      // length of the overflow buffer to be used for a given connection.
-#define MAX_JMRI_CMD    MAX_ETH_BUFFER / 2                      // MAX Length of a JMRI Command
+#define MAX_JMRI_CMD    MAX_ETH_BUFFER / 2                      // MAX Length of a JMRI Command
+
+
+
+/**
+ * @todo - MAC address automation
+ * @todo - Wifi setup process in case no permanent setup yet done
+ * 
+ */

Transport.cpp

@@ -46,6 +46,7 @@ void Transport<S,C,U>::loop() {
     };
     case TCP:
     {
+        // DIAG(F("Transport: %s\n"), this->transport == WIFI ? "WIFI" : "ETHERNET"); 
         tcpSessionHandler(server);    
     };
     case MQTT:
@@ -62,9 +63,9 @@ void Transport<S, C, U>::connectionPool(S *server)
     for (int i = 0; i < Transport::maxConnections; i++)
     {
         clients[i] = server->accept();
-        connections[i].client = &clients[i];                // set the client 
-        memset(connections[i].overflow, 0, MAX_OVERFLOW);   // clear overflow buffer
-        connections[i].id = i;                              // ser the client id
+        connections[i].client = &clients[i];              
+        memset(connections[i].overflow, 0, MAX_OVERFLOW); 
+        connections[i].id = i;
         DIAG(F("\nConnection pool:       [%d:%x]"), i, connections[i].client);
     }
 }

TransportProcessor.cpp

@@ -27,7 +27,7 @@
 #include "DCCEXParser.h"
 #include "MemStream.h"
 
-DCCEXParser ethParser;
+DCCEXParser dccParser;
 
 #endif
 
@@ -35,7 +35,7 @@ HttpRequest httpReq;
 uint16_t _rseq[MAX_SOCK_NUM] = {0};
 uint16_t _sseq[MAX_SOCK_NUM] = {0};
 
-char protocolName[4][11] = {"JMRI", "WITHROTTLE", "HTTP", "UNKNOWN"}; // change for Progmem
+char protocolName[5][11] = {"JMRI", "WITHROTTLE", "HTTP", "DIAG" , "UNKNOWN"}; // change for Progmem
 bool diagNetwork = false;
 uint8_t diagNetworkClient = 0;
 
@@ -52,25 +52,24 @@ uint8_t diagNetworkClient = 0;
 
 void sendToDCC(Connection *c, TransportProcessor* t, bool blocking)
 {
-    static MemStream *streamer = new MemStream((byte *)t->command, MAX_ETH_BUFFER, MAX_ETH_BUFFER, true);
+    MemStream streamer((byte *)t->command, MAX_ETH_BUFFER, MAX_ETH_BUFFER, true);
 
     DIAG(F("DCC parsing:            [%e]\n"), t->command);
     // as we use buffer for recv and send we have to reset the write position
-    streamer->setBufferContentPosition(0, 0);
+    streamer.setBufferContentPosition(0, 0);
+    dccParser.parse(&streamer, (byte *)t->command, true); // set to true to that the execution in DCC is sync
 
-    ethParser.parse(streamer, (byte *)t->command, true); // set to true to that the execution in DCC is sync
-
-    if (streamer->available() == 0)
+    if (streamer.available() == 0)
     {
         DIAG(F("No response\n"));
     }
     else
     {
-        t->command[streamer->available()] = '\0'; // mark end of buffer, so it can be used as a string later
+        t->command[streamer.available()] = '\0'; // mark end of buffer, so it can be used as a string later
         DIAG(F("Response: %s\n"), t->command);
         if (c->client->connected())
         {
-            c->client->write((byte *)t->command, streamer->available());
+            c->client->write((byte *)t->command, streamer.available());
         }
     }
 }

TransportProcessor.h

@@ -26,8 +26,6 @@
 #include "NetworkConfig.h"
 #include "NetworkInterface.h"
 
-#define DCCEX_ENABLED
-
 typedef enum
 {
     DCCEX,      // if char[0] = < opening bracket the client should be a JMRI / DCC EX client_h
@@ -45,13 +43,13 @@ using appProtocolCallback = void (*)(Connection* c, TransportProcessor* t);
 
 struct Connection
 {
-    uint8_t id;
-    Client *client;
-    char overflow[MAX_OVERFLOW];
-    appProtocol p;
-    char delimiter = '\0';
-    bool isProtocolDefined = false;
-    appProtocolCallback appProtocolHandler;
+    uint8_t id;                             // initalized when the pool is setup
+    Client *client;                         // idem
+    char overflow[MAX_OVERFLOW];            // idem
+    appProtocol p;                          // dynamically determined upon message reception; first message wins
+    char delimiter = '\0';                  // idem
+    bool isProtocolDefined = false;         // idem
+    appProtocolCallback appProtocolHandler; // idem
 };
 
 class TransportProcessor