Merge 5d411e6a08 into 83d4930124

DCCEXParser.cpp

@@ -70,8 +70,8 @@ Once a new OPCODE is decided upon, update this list.
   L, Reserved for LCC interface (implemented in EXRAIL)
   m, message to throttles broadcast 
   M, Write DCC packet
-  n, Reserved for SensorCam
-  N, Reserved for Sensorcam 
+  n,
+  N,
   o,
   O, Output broadcast
   p, Broadcast power state
@@ -91,10 +91,10 @@ Once a new OPCODE is decided upon, update this list.
   w, Write CV on main
   W, Write CV
   x,
-  X, Invalid command response
-  y, 
+  X, Invalid command
+  y,
   Y, Output broadcast
-  z, Direct output
+  z,
   Z, Output configuration/control
 */
 

DCCTimerAVR.cpp

@@ -185,10 +185,8 @@ int DCCTimer::freeMemory() {
 }
 
 void DCCTimer::reset() {
-  // 250ms chosen to circumwent bootloader bug which
-  // hangs at too short timepout (like 15ms)
-  wdt_enable( WDTO_250MS); // set Arduino watchdog timer for 250ms 
-  delay(500);              // wait for it to happen
+  wdt_enable( WDTO_15MS); // set Arduino watchdog timer for 15ms 
+  delay(50);            // wait for the prescaller time to expire
 
 }
 

EXRAIL2.cpp

@@ -1,5 +1,4 @@
 /*
- *  © 2024 Paul M. Antoine
  *  © 2021 Neil McKechnie
  *  © 2021-2023 Harald Barth
  *  © 2020-2023 Chris Harlow
@@ -1144,25 +1143,20 @@ void RMFT2::kill(const FSH * reason, int operand) {
 }
 
 int16_t RMFT2::getSignalSlot(int16_t id) {
-
-  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)
-    {
+  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;
       // 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.
-      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;
+      // 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
+  }  
 }
 
 /* static */ void RMFT2::doSignal(int16_t id,char rag) {
@@ -1224,7 +1218,7 @@ int16_t RMFT2::getSignalSlot(int16_t id) {
   if (rag==SIGNAL_AMBER && (amberpin==0)) rag=SIMAMBER; // special case this func only
    
   // Manage invert (HIGH on) pins
-  bool aHigh=sighandle & ACTIVE_HIGH_SIGNAL_FLAG;
+  bool aHigh=sigid & ACTIVE_HIGH_SIGNAL_FLAG;
       
   // set the three pins 
   if (redpin) {

EXRAIL2.h

@@ -187,7 +187,6 @@ 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[]);
@@ -197,6 +196,7 @@ 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-202404091507Z"
+#define GITHUB_SHA "devel-202404211704Z"

IO_EXFastclock.h

@@ -51,7 +51,6 @@ static void create(I2CAddress i2cAddress) {
   // Start by assuming we will find the clock
   // Check if specified I2C address is responding (blocking operation)
   // Returns I2C_STATUS_OK (0) if OK, or error code.
-  I2CManager.begin();
   uint8_t _checkforclock = I2CManager.checkAddress(i2cAddress);
   DIAG(F("Clock check result - %d"), _checkforclock);
   // XXXX change thistosave2 bytes

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 INV>
+    if (params==2  && p[1]=="INV"_hk) // <= id AUTO>
       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,14 +3,7 @@
 
 #include "StringFormatter.h"
 
-#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
-//        - Add support for ports G and H on STM32 for ADCee() and MotorDriver pins/shadow regs 
+#define VERSION "5.2.51"
 // 5.2.51 - Bugfix for SIGNAL: Distinguish between sighandle and sigid
 // 5.2.50 - EXRAIL ONBUTTON/ONSENSOR observe LATCH
 // 5.2.49 - EXRAIL additions: