Merge branch 'devel_fozzie2' of https://github.com/DCC-EX/CommandStation-EX into devel_fozzie2

EthernetInterface.cpp

@@ -29,6 +29,13 @@
 #include "CommandDistributor.h"
 #include "WiThrottle.h"
 #include "DCCTimer.h"
+#if __has_include ( "MDNS_Generic.h")
+  #include "MDNS_Generic.h"
+  #define DO_MDNS 
+  EthernetUDP udp;
+  MDNS mdns(udp);
+#endif
+
 
 extern void looptimer(unsigned long timeout, const FSH* message);
 
@@ -42,48 +49,76 @@ RingStream * EthernetInterface::outboundRing = nullptr;
  * @brief Setup Ethernet Connection
  * 
  */
-void EthernetInterface::setup()
+
+void EthernetInterface::setup()  // STM32 VERSION
 {
-    connected=false;
+  DIAG(F("Ethernet begin"
+  #ifdef DO_MDNS
+    " with mDNS"
+  #endif 
+  ));
+  
+  #ifdef STM32_ETHERNET
+    // Set a HOSTNAME for the DHCP request - a nice to have, but hard it seems on LWIP for STM32
+    // The default is "lwip", which is **always** set in STM32Ethernet/src/utility/ethernetif.cpp
+    // for some reason. One can edit it to instead read:
+    //      #if LWIP_NETIF_HOSTNAME
+    //      /* Initialize interface hostname */
+    //      if (netif->hostname == NULL)
+    //         netif->hostname = "lwip";
+    //      #endif /* LWIP_NETIF_HOSTNAME */
+    // Which seems more useful! We should propose the patch... so the following line actually works!
+    netif_set_hostname(&gnetif, WIFI_HOSTNAME);   // Should probably be passed in the contructor...
+#endif
 
     byte mac[6];
     DCCTimer::getSimulatedMacAddress(mac);
-    DIAG(F("Ethernet begin"));
+    #define _MAC_ mac
-    
+  
-#ifdef IP_ADDRESS
+  #ifdef IP_ADDRESS
     static IPAddress myIP(IP_ADDRESS);
-    Ethernet.begin(mac, myIP);
+    Ethernet.begin(_MAC_,myIP);
-#else
+    setup(false);
-    if (Ethernet.begin(mac) == 0)
+  #else
-    {
+    if (Ethernet.begin(_MAC_)==0)
-      LCD(4,F("IP: No DHCP"));
+  {
-      return;
+    LCD(4,F("IP: No DHCP"));
-    }
+    return;
-#endif
+  }
-    auto ip = Ethernet.localIP();    // look what IP was obtained (dynamic or static)
+  #endif
-    if (!ip) {
+
-      LCD(4,F("IP: None"));
+  auto ip = Ethernet.localIP();    // look what IP was obtained (dynamic or static)
-      return;
+  if (!ip) {
-    }
+    LCD(4,F("IP: None"));
-    server = new EthernetServer(IP_PORT); // Ethernet Server listening on default port IP_PORT
+    return;
-    server->begin();
+  }
-    #ifdef LCD_DRIVER
+  server = new EthernetServer(IP_PORT); // Ethernet Server listening on default port IP_PORT
-      const byte lcdData[]={LCD_DRIVER};
+  server->begin();
-      const bool wideDisplay=lcdData[1]>=24; // data[1] is cols. 
+
-    #else 
+  // Arrange display of IP address and port
-      const bool wideDisplay=true;
+  #ifdef LCD_DRIVER
-    #endif    
+    const byte lcdData[]={LCD_DRIVER};
-    if (wideDisplay) {
+    const bool wideDisplay=lcdData[1]>=24; // data[1] is cols. 
-      // OLEDS or just usb diag is ok on one line. 
+  #else 
-      LCD(4,F("IP %d.%d.%d.%d:%d"), ip[0], ip[1], ip[2], ip[3], IP_PORT);    
+    const bool wideDisplay=true;
-    } 
+  #endif    
-    else { // LCDs generally too narrow, so take 2 lines
+  if (wideDisplay) {
-      LCD(4,F("IP %d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
+    // OLEDS or just usb diag is ok on one line. 
-      LCD(5,F("Port %d"), IP_PORT);
+    LCD(4,F("IP %d.%d.%d.%d:%d"), ip[0], ip[1], ip[2], ip[3], IP_PORT);    
-    }
+  } 
+  else { // LCDs generally too narrow, so take 2 lines
+    LCD(4,F("IP %d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
+    LCD(5,F("Port %d"), IP_PORT);
+  }
  
-    outboundRing=new RingStream(OUTBOUND_RING_SIZE);
+  outboundRing=new RingStream(OUTBOUND_RING_SIZE);
-    connected=true;
+  #ifdef DO_MDNS
+    mdns.begin(Ethernet.localIP(), WIFI_HOSTNAME); // hostname
+    mdns.addServiceRecord(WIFI_HOSTNAME "._withrottle", IP_PORT, MDNSServiceTCP);
+  // Not sure if we need to run it once, but just in case!
+    mdns.run();
+  #endif  
+  connected=true;    
 }
 
 
@@ -94,7 +129,8 @@ void EthernetInterface::setup()
 void EthernetInterface::loop()
 {
     if (!connected) return;
-
+    looptimer(5000, F("E.loop"));
+	      
     static bool warnedAboutLink=false;
     if (Ethernet.linkStatus() == LinkOFF){
         if (warnedAboutLink) return;
@@ -102,13 +138,21 @@ void EthernetInterface::loop()
         warnedAboutLink=true;
         return;
     }
-
+    looptimer(5000, F("E.loop warn"));
+	  
     // link status must be ok here 
     if (warnedAboutLink) {
       DIAG(F("Ethernet link RESTORED"));
       warnedAboutLink=false;
     } 
     
+  #ifdef DO_MDNS
+    // Always do this because we don't want traffic to intefere with being found!
+    mdns.run();
+    looptimer(5000, F("E.mdns"));
+	  
+  #endif
+
     //
     switch (Ethernet.maintain()) {
     case 1:
@@ -126,28 +170,46 @@ void EthernetInterface::loop()
         //DIAG(F("maintained"));
         break;
     }
-    
+    looptimer(5000, F("E.maintain"));
-    // get client from the server
+	  
-    auto client = server->accept();
+      // get client from the server
-
+  #if defined (STM32_ETHERNET)
-    // check for new client
+    // STM32Ethernet doesn't use accept(), just available()
-    if (client)
+    auto client = server->available();
-    {
+    if (client) {
-        if (Diag::ETHERNET) DIAG(F("Ethernet: New client "));
+      // check for new client
-        byte socket;
+      byte socket;
+      bool sockFound = false;
+      for (socket = 0; socket < MAX_SOCK_NUM; socket++)
+      {
+        if (client == clients[socket])
+        {
+          sockFound = true;
+          break;
+        }
+      }
+      if (!sockFound)
+      { // new client
         for (socket = 0; socket < MAX_SOCK_NUM; socket++)
         {
-            if (!clients[socket])
+          if (!clients[socket])
-            {
+          {
-                // On accept() the EthernetServer doesn't track the client anymore
+            clients[socket] = client;
-                // so we store it in our client array
+            sockFound=true;
-                if (Diag::ETHERNET) DIAG(F("Socket %d"),socket);
+            if (Diag::ETHERNET)
-                clients[socket] = client;
+              DIAG(F("Ethernet: New client socket %d"), socket);
-                break;
+            break;
-            }
+          }
         }
-        if (socket==MAX_SOCK_NUM) DIAG(F("new Ethernet OVERFLOW")); 
+      }
+      if (!sockFound) DIAG(F("new Ethernet OVERFLOW"));
     }
+  
+  #else
+    auto client = server->accept();
+    if (client) clients[client.getSocketNumber()]=client;
+  #endif
+    
 
     // check for incoming data from all possible clients
     for (byte socket = 0; socket < MAX_SOCK_NUM; socket++)

EthernetInterface.h

@@ -35,6 +35,14 @@
 #if defined (ARDUINO_TEENSY41)
  #include <NativeEthernet.h>         //TEENSY Ethernet Treiber
  #include <NativeEthernetUdp.h>   
+#elif defined (ARDUINO_NUCLEO_F429ZI) || defined (ARDUINO_NUCLEO_F439ZI) || defined (ARDUINO_NUCLEO_F4X9ZI)
+ #include <LwIP.h>
+//  #include "STM32lwipopts.h"
+ #include <STM32Ethernet.h>
+ #include <lwip/netif.h>
+ extern "C" struct netif gnetif;
+ #define STM32_ETHERNET
+ #define MAX_SOCK_NUM 8
 #else
  #include "Ethernet.h"
 #endif
@@ -45,7 +53,7 @@
  * 
  */
 
-#define MAX_ETH_BUFFER 512
+#define MAX_ETH_BUFFER 128
 #define OUTBOUND_RING_SIZE 2048
 
 class EthernetInterface {

platformio.ini

@@ -104,6 +104,14 @@ lib_deps =
 	${env.lib_deps}
 	arduino-libraries/Ethernet
 	SPI
+	MDNS_Generic
+
+lib_ignore = WiFi101
+			WiFi101_Generic
+			WiFiEspAT
+			WiFiMulti_Generic
+			WiFiNINA_Generic
+
 monitor_speed = 115200
 monitor_echo = yes
 build_flags = 
@@ -263,6 +271,24 @@ monitor_echo = yes
 
 ; Experimental - Ethernet work still in progress
 ;
+[env:Nucleo-F429ZI]
+platform = ststm32
+board = nucleo_f429zi
+framework = arduino
+lib_deps = ${env.lib_deps}
+			stm32duino/STM32Ethernet @ ^1.3.0
+			stm32duino/STM32duino LwIP @ ^2.1.2
+			MDNS_Generic
+lib_ignore = WiFi101
+			WiFi101_Generic
+			WiFiEspAT
+			WiFiMulti_Generic
+			WiFiNINA_Generic
+build_flags = -std=c++17 -Os -g2 -Wunused-variable
+monitor_speed = 115200
+monitor_echo = yes
+upload_protocol = stlink
+
 ; [env:Nucleo-F429ZI]
 ; platform = ststm32
 ; board = nucleo_f429zi