version

Keep Ethernet singleton "alive" until connection is established.

EXRAIL2.cpp

@@ -551,7 +551,15 @@ bool RMFT2::skipIfBlock() {
 
 
 /* static */ void RMFT2::readLocoCallback(int16_t cv) {
-  progtrackLocoId=cv;
+  if (cv & LONG_ADDR_MARKER) {               // maker bit indicates long addr
+    progtrackLocoId = cv ^ LONG_ADDR_MARKER; // remove marker bit to get real long addr
+    if (progtrackLocoId <= HIGHEST_SHORT_ADDR ) {     // out of range for long addr
+      DIAG(F("Long addr %d <= %d unsupported\n"), progtrackLocoId, HIGHEST_SHORT_ADDR);
+      progtrackLocoId = -1;
+    }
+  } else {
+    progtrackLocoId=cv;
+  }
 }
 
 void RMFT2::loop() {

EthernetInterface.cpp

@@ -1,6 +1,7 @@
 /*
+ *  © 2022 Bruno Sanches
  *  © 2021 Fred Decker
- *  © 2020-2021 Harald Barth
+ *  © 2020-2022 Harald Barth
  *  © 2020-2021 Chris Harlow
  *  © 2020 Gregor Baues
  *  All rights reserved.
@@ -35,8 +36,13 @@ EthernetInterface * EthernetInterface::singleton=NULL;
  */
 void EthernetInterface::setup()
 {
+  if (Ethernet.hardwareStatus() == EthernetNoHardware) {
+    if (singleton!=NULL)
+      DIAG(F("Prog Error!"));
+  } else {
     singleton=new EthernetInterface();
-    if (!singleton->connected) singleton=NULL; 
+  }
+  DIAG(F("Ethernet shield %sfound"), singleton==NULL ? "not " : "");
 };
 
 
@@ -60,73 +66,84 @@ EthernetInterface::EthernetInterface()
         DIAG(F("Ethernet.begin FAILED"));
         return;
     } 
-    #endif
-    DIAG(F("begin OK."));
-     if (Ethernet.hardwareStatus() == EthernetNoHardware) {
-      DIAG(F("Ethernet shield not found"));
-      return;
-    }
-  
-    unsigned long startmilli = millis();
-    while ((millis() - startmilli) < 5500) // Loop to give time to check for cable connection
-    {
-        if (Ethernet.linkStatus() == LinkON)
-            break;
-        DIAG(F("Ethernet waiting for link (1sec) "));
-        delay(1000);
-    }
+    #endif       
+}
 
-    if (Ethernet.linkStatus() == LinkOFF) {
-      DIAG(F("Ethernet cable not connected"));
-      return;
-    }
-    
-    connected=true;
-    
-    IPAddress ip = Ethernet.localIP(); // reassign the obtained ip address
-
-    server = new EthernetServer(IP_PORT); // Ethernet Server listening on default port IP_PORT
-    server->begin();
-  
-    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);     
+/**
+ * @brief Cleanup any resources
+ * 
+ * @return none
+ */
+EthernetInterface::~EthernetInterface() {
+  delete server;
+  delete outboundRing;
 }
 
 /**
  * @brief Main loop for the EthernetInterface
  * 
  */
-void EthernetInterface::loop()
-{
-    if (!singleton) return;
-    
-    switch (Ethernet.maintain())
-    {
-    case 1:
-        //renewed fail
-        DIAG(F("Ethernet Error: renewed fail"));
-        singleton=NULL;
-        return;
-
-    case 3:
-        //rebind fail
-        DIAG(F("Ethernet Error: rebind fail"));
-        singleton=NULL;
-        return;
-
-    default:
-        //nothing happened
-        break;
-    }
-
-   singleton->loop2();
+void EthernetInterface::loop() {
+  if(!singleton || (!singleton->checkLink()))
+    return;
 
+  switch (Ethernet.maintain()) {
+  case 1:
+    //renewed fail
+    DIAG(F("Ethernet Error: renewed fail"));
+    singleton=NULL;
+    return;
+  case 3:
+    //rebind fail
+    DIAG(F("Ethernet Error: rebind fail"));
+    singleton=NULL;
+    return;
+  default:
+    //nothing happened
+    break;
+  }
+  singleton->loop2();
 }
 
- void EthernetInterface::loop2()
-{
+/**
+ * @brief Checks ethernet link cable status and detects when it connects / disconnects
+ * 
+ * @return true when cable is connected, false otherwise
+ */
+bool EthernetInterface::checkLink() {
+  if (Ethernet.linkStatus() == LinkON) {
+    //if we are not connected yet, setup a new server
+    if(!connected) {
+      DIAG(F("Ethernet cable connected"));
+      connected=true;
+      IPAddress ip = Ethernet.localIP(); // reassign the obtained ip address
+      server = new EthernetServer(IP_PORT); // Ethernet Server listening on default port IP_PORT
+      server->begin();
+      LCD(4,F("IP: %d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
+      LCD(5,F("Port:%d"), IP_PORT);
+      // only create a outboundRing it none exists, this may happen if the cable
+      // gets disconnected and connected again
+      if(!outboundRing)
+	outboundRing=new RingStream(OUTBOUND_RING_SIZE);
+    }
+    return true;
+  } else { // connected
+    DIAG(F("Ethernet cable disconnected"));
+    connected=false;
+    //clean up any client
+    for (byte socket = 0; socket < MAX_SOCK_NUM; socket++) {
+      if(clients[socket].connected())
+	clients[socket].stop();
+    }
+    // tear down server
+    delete server;
+    server = nullptr;
+    LCD(4,F("IP: None"));
+  }
+  return false;
+}
+
+void EthernetInterface::loop2() {
     // get client from the server
     EthernetClient client = server->accept();
 

EthernetInterface.h

@@ -50,21 +50,23 @@
 
 class EthernetInterface {
 
- public:
-     
-     static void setup();       
-     static void loop();
-   
- private:
-     static EthernetInterface * singleton;
-     bool connected;
-     EthernetInterface();
-     void loop2();
-    EthernetServer * server;
-    EthernetClient clients[MAX_SOCK_NUM];                // accept up to MAX_SOCK_NUM client connections at the same time; This depends on the chipset used on the Shield
-    uint8_t buffer[MAX_ETH_BUFFER+1];                    // buffer used by TCP for the recv
-    RingStream * outboundRing;
+public:
+  static void setup();
+  static void loop();
   
+private:
+  static EthernetInterface * singleton;
+  bool connected;
+  EthernetInterface();
+  ~EthernetInterface();
+  void loop2();
+  bool checkLink();
+
+  EthernetServer *server = nullptr;
+  EthernetClient clients[MAX_SOCK_NUM]; // accept up to MAX_SOCK_NUM client connections at the same time
+                                        // This depends on the chipset used on the Shield
+  uint8_t buffer[MAX_ETH_BUFFER+1];     // buffer used by TCP for the recv
+  RingStream * outboundRing = nullptr;
 };
 
 #endif

WifiInterface.cpp

@@ -276,6 +276,7 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
       checkForOK(2000, true);
     }
   }
+#endif //DONT_TOUCH_WIFI_CONF
 
   StringFormatter::send(wifiStream, F("AT+CIPSERVER=0\r\n")); // turn off tcp server (to clean connections before CIPMUX=1)
   checkForOK(1000, true); // ignore result in case it already was off
@@ -291,7 +292,6 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
 
   StringFormatter::send(wifiStream, F("AT+CIPSERVER=1,%d\r\n"), port); // turn on server on port
   if (!checkForOK(1000, true)) return WIFI_DISCONNECTED;
-#endif //DONT_TOUCH_WIFI_CONF
  
   StringFormatter::send(wifiStream, F("AT+CIFSR\r\n")); // Display  ip addresses to the DIAG 
   if (!checkForOK(1000, F("IP,\"") , true, false)) return WIFI_DISCONNECTED;

log2lrc.py

@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+#
+#  Copyright 2022 Harald Barth
+#
+#  This converts serial logs with timestamps from the
+#  Arduino IDE to LRC format.
+#
+#  This is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  It is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
+
+# Usage: log2lrc.py HH:MM:SS HH:MM:SS filename
+#                   logtime  videotime
+# The resulting timestamps will be adjusted by logtime - videotime.
+# logtime > videotime
+
+import sys
+import datetime
+import fileinput
+import re
+
+timediff = datetime.datetime.strptime('00:00:00','%H:%M:%S')
+
+def convert(timestr):
+    times=timestr.split('.',1) # remove fractions of second
+    timestamp_obj=datetime.datetime.strptime(times[0],'%H:%M:%S')
+    timestamp_obj=timestamp_obj-timediff       # calculate offset
+    timestr='{0:%M:%S}'.format(timestamp_obj)
+    timestr='%s.%s' % (timestr, times[1][0:2]) # add fractions of second, 2 digits
+    return timestr
+
+def main(argv):
+    global timediff
+    fromtime_str=sys.argv[1]
+    fromtime_obj=datetime.datetime.strptime(fromtime_str,'%H:%M:%S')
+    totime_str=sys.argv[2]
+    totime_obj=datetime.datetime.strptime(totime_str,'%H:%M:%S')
+    sys.argv=sys.argv[2:]
+    
+
+    timediff = fromtime_obj - totime_obj 
+
+    for line in fileinput.input():
+        line = re.split('\s+', line, 1)
+        if (len(line) > 1 and len(line[1]) > 1):
+            l = line[1].replace('\n','')
+            l = l.replace('\r','')
+            l = re.sub('^-> ','',l)
+            print("[%s]%s" % (convert(line[0]),l))
+
+if __name__ == "__main__":
+    main(sys.argv)
+

version.h

@@ -3,11 +3,11 @@
 
 #include "StringFormatter.h"
 
-
-#define VERSION "4.1.1 rc3"
+#define VERSION "4.1.1"
 // 4.1.1 Bugfix: preserve turnout format
 //       Bugfix: parse multiple commands in one buffer string correct
 //       Bugfix: </> command signal status in Exrail
+//       Bugfix: EX-RAIL read long loco addr
 // 4.1.0 ...
 //
 // 4.0.2 EXRAIL additions: