version 5.2.57

EXRAIL2.cpp

@@ -1,4 +1,5 @@
 /*
+ *  © 2024 Paul M. Antoine
  *  © 2021 Neil McKechnie
  *  © 2021-2023 Harald Barth
  *  © 2020-2023 Chris Harlow
@@ -1143,20 +1144,25 @@ void RMFT2::kill(const FSH * reason, int operand) {
 }
 
 int16_t RMFT2::getSignalSlot(int16_t id) {
-  for (int sigslot=0;;sigslot++) {
-      int16_t sighandle=GETHIGHFLASHW(RMFT2::SignalDefinitions,sigslot*8);
-      if (sighandle==0) { // end of signal list 
-        DIAG(F("EXRAIL Signal %d not defined"), id);
-        return -1;
-      }
-      VPIN sigid = sighandle & SIGNAL_ID_MASK;
+
+  if (id >= 0) {
+    int sigslot = 0;
+    int16_t sighandle = 0;
+    // Trundle down the signal list until we reach the end
+    while ((sighandle = GETHIGHFLASHW(RMFT2::SignalDefinitions, sigslot * 8)) != 0)
+    {
       // sigid is the signal id used in RED/AMBER/GREEN macro
       // for a LED signal it will be same as redpin
-      // but for a servo signal it will also have SERVO_SIGNAL_FLAG set. 
-
-      if (sigid != id) continue; // keep looking
-      return sigslot; // relative slot in signals table
-  }  
+      // but for a servo signal it will also have SERVO_SIGNAL_FLAG set.
+      VPIN sigid = sighandle & SIGNAL_ID_MASK;
+      if (sigid == (VPIN)id) // cast to keep compiler happy but id is positive
+        return sigslot;      // found it
+      sigslot++;             // keep looking
+    };
+  }
+  // If we got here, we did not find the signal
+  DIAG(F("EXRAIL Signal %d not defined"), id);
+  return -1;
 }
 
 /* static */ void RMFT2::doSignal(int16_t id,char rag) {

EXRAIL2.h

@@ -187,6 +187,7 @@ class LookList {
   static const FSH *  getTurntablePositionDescription(int16_t turntableId, uint8_t positionId);
   static void startNonRecursiveTask(const FSH* reason, int16_t id,int pc);
   static bool readSensor(uint16_t sensorId);
+  static bool isSignal(int16_t id,char rag); 
    
 private: 
     static void ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16_t p[]);
@@ -196,7 +197,6 @@ private:
     static bool getFlag(VPIN id,byte mask); 
     static int16_t progtrackLocoId;
     static void doSignal(int16_t id,char rag); 
-    static bool isSignal(int16_t id,char rag); 
     static int16_t getSignalSlot(int16_t id);
     static void setTurnoutHiddenState(Turnout * t);
     #ifndef IO_NO_HAL

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202404211704Z"
+#define GITHUB_SHA "devel-202404091507Z"

TrackManager.cpp

@@ -35,7 +35,7 @@
     
 #define APPLY_BY_MODE(findmode,function) \
         FOR_EACH_TRACK(t) \
-	    if (track[t]->getMode()==findmode)	\
+	    if (track[t]->getMode() & findmode)	\
                 track[t]->function;
 
 MotorDriver * TrackManager::track[MAX_TRACKS] = { NULL };
@@ -398,7 +398,7 @@ bool TrackManager::parseEqualSign(Print *stream, int16_t params, int16_t p[])
     if (params==2  && p[1]=="AUTO"_hk) // <= id AUTO>
       return setTrackMode(p[0], track[p[0]]->getMode() | TRACK_MODE_AUTOINV);
 
-    if (params==2  && p[1]=="INV"_hk) // <= id AUTO>
+    if (params==2  && p[1]=="INV"_hk) // <= id INV>
       return setTrackMode(p[0], track[p[0]]->getMode() | TRACK_MODE_INV);
 
     if (params==3  && p[1]=="DC"_hk && p[2]>0) // <= id DC cab>

version.h

@@ -3,7 +3,10 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.2.54"
+#define VERSION "5.2.57"
+// 5.2.57 - Bugfix autoreverse: Apply mode by binart bit match and not by equality
+// 5.2.56 - Bugfix and refactor for EXRAIL getSignalSlot
+// 5.2.55 - Move EXRAIL isSignal() to public to allow use in STEALTH call
 // 5.2.54 - Bugfix for EXRAIL signal handling for active high 
 // 5.2.53 - Bugfix for EX-Fastclock, call I2CManager.begin() before checking I2C address 
 // 5.2.52 - Bugfix for ADCee() to handle ADC2 and ADC3 channel inputs on F446ZE and others