version 5.2.3

Updated version.h

CommandDistributor.cpp

@@ -105,6 +105,7 @@ void  CommandDistributor::parse(byte clientId,byte * buffer, RingStream * stream
 void CommandDistributor::forget(byte clientId) {
   if (clients[clientId]==WITHROTTLE_TYPE) WiThrottle::forget(clientId);
   clients[clientId]=NONE_TYPE;
+  if (virtualLCDClient==clientId) virtualLCDClient=RingStream::NO_CLIENT;
 }
 #endif 
 
@@ -248,6 +249,11 @@ void  CommandDistributor::broadcastLoco(byte slot) {
 }
 
 void  CommandDistributor::broadcastPower() {
+  char pstr[] = "? x";
+  for(byte t=0; t<TrackManager::MAX_TRACKS; t++)
+    if (TrackManager::getPower(t, pstr))
+      broadcastReply(COMMAND_TYPE, F("<p%s>\n"),pstr);
+
   bool main=TrackManager::getMainPower()==POWERMODE::ON;
   bool prog=TrackManager::getProgPower()==POWERMODE::ON;
   bool join=TrackManager::isJoined();
@@ -270,7 +276,15 @@ void CommandDistributor::broadcastRaw(clientType type, char * msg) {
 }
 
 void CommandDistributor::broadcastTrackState(const FSH* format,byte trackLetter, int16_t dcAddr) {
-  broadcastReply(COMMAND_TYPE, format,trackLetter, dcAddr);
+  broadcastReply(COMMAND_TYPE, format, trackLetter, dcAddr);
+}
+
+void  CommandDistributor::broadcastRouteState(uint16_t routeId, byte state ) {
+  broadcastReply(COMMAND_TYPE, F("<jB %d %d>\n"),routeId,state);
+}
+
+void  CommandDistributor::broadcastRouteCaption(uint16_t routeId, const FSH* caption ) {
+  broadcastReply(COMMAND_TYPE, F("<jB %d \"%S\">\n"),routeId,caption);
 }
 
 Print * CommandDistributor::getVirtualLCDSerial(byte screen, byte row) {
@@ -318,4 +332,5 @@ void CommandDistributor::setVirtualLCDSerial(Print * stream) {
 
 Print* CommandDistributor::virtualLCDSerial=nullptr;
 byte CommandDistributor::virtualLCDClient=0xFF;
-byte CommandDistributor::rememberVLCDClient=0;
+byte CommandDistributor::rememberVLCDClient=0;
+

CommandDistributor.h

@@ -58,8 +58,10 @@ public :
   static void broadcastTrackState(const FSH* format,byte trackLetter, int16_t dcAddr);
   template<typename... Targs> static void broadcastReply(clientType type, Targs... msg);
   static void forget(byte clientId);
+  static void broadcastRouteState(uint16_t routeId,byte state);
+  static void broadcastRouteCaption(uint16_t routeId,const FSH * caption);
   
-    // Handling code for virtual LCD receiver.
+  // Handling code for virtual LCD receiver.
   static Print * getVirtualLCDSerial(byte screen, byte row);
   static void commitVirtualLCDSerial();
   static void setVirtualLCDSerial(Print * stream); 

CommandStation-EX.ino

@@ -96,11 +96,7 @@ void setup()
   // Start Ethernet if it exists
 #ifndef ARDUINO_ARCH_ESP32
 #if WIFI_ON
-#ifndef WIFI_NINA
   WifiInterface::setup(WIFI_SERIAL_LINK_SPEED, F(WIFI_SSID), F(WIFI_PASSWORD), F(WIFI_HOSTNAME), IP_PORT, WIFI_CHANNEL, WIFI_FORCE_AP);
-#else
-  WifiNINA::setup(WIFI_SSID, WIFI_PASSWORD, WIFI_HOSTNAME, IP_PORT, WIFI_CHANNEL, WIFI_FORCE_AP);
-#endif // WIFI_NINA
 #endif // WIFI_ON
 #else
   // ESP32 needs wifi on always
@@ -148,11 +144,7 @@ void loop()
   // Responsibility 3: Optionally handle any incoming WiFi traffic
 #ifndef ARDUINO_ARCH_ESP32
 #if WIFI_ON
-#ifndef WIFI_NINA
   WifiInterface::loop();
-#else
-  WifiNINA::loop();
-#endif //WIFI_NINA
 #endif //WIFI_ON
 #else  //ARDUINO_ARCH_ESP32
 #ifndef WIFI_TASK_ON_CORE0

DCC.h

@@ -43,11 +43,7 @@ const uint16_t LONG_ADDR_MARKER = 0x4000;
 // Allocations with memory implications..!
 // Base system takes approx 900 bytes + 8 per loco. Turnouts, Sensors etc are dynamically created
 #if defined(HAS_ENOUGH_MEMORY)
-#if defined(ARDUINO_GIGA) // yes giga
-const byte MAX_LOCOS = 100;
-#else // no giga
 const byte MAX_LOCOS = 50;
-#endif // giga
 #else
 const byte MAX_LOCOS = 30;
 #endif

DCCEX.h

@@ -1,5 +1,4 @@
 /*
- *  © 2023 Paul M. Antoine
  *  © 2021 Fred Decker
  *  © 2020-2021 Harald Barth
  *  © 2020-2021 Chris Harlow
@@ -34,13 +33,8 @@
 #include "SerialManager.h"
 #include "version.h"
 #ifndef ARDUINO_ARCH_ESP32
-#ifdef WIFI_NINA
-#include "Wifi_NINA.h"
-#else
 #include "WifiInterface.h"
-#endif // WIFI_NINA
 #else
-#undef WIFI_NINA
 #include "WifiESP32.h"
 #endif
 #if ETHERNET_ON == true

DCCEXParser.cpp

@@ -210,8 +210,10 @@ int16_t DCCEXParser::splitValues(int16_t result[MAX_COMMAND_PARAMS], const byte
         case 1: // skipping spaces before a param
             if (hot == ' ')
                 break;
-            if (hot == '\0' || hot == '>')
-                return parameterCount;
+            if (hot == '\0')
+	      return -1;
+	    if (hot == '>')
+	      return parameterCount;
             state = 2;
             continue;
 
@@ -304,14 +306,19 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
 #ifndef DISABLE_EEPROM
     (void)EEPROM; // tell compiler not to warn this is unused
 #endif
+    byte params = 0;
     if (Diag::CMD)
         DIAG(F("PARSING:%s"), com);
     int16_t p[MAX_COMMAND_PARAMS];
     while (com[0] == '<' || com[0] == ' ')
         com++; // strip off any number of < or spaces
     byte opcode = com[0];
-    byte params = splitValues(p, com, opcode=='M' || opcode=='P');
-    
+    int16_t splitnum = splitValues(p, com, opcode=='M' || opcode=='P');
+    if (splitnum < 0 || splitnum >= MAX_COMMAND_PARAMS) // if arguments are broken, leave but via printing <X>
+      goto out;
+    // Because of check above we are now inside byte size
+    params = splitnum;
+
     if (filterCallback)
         filterCallback(stream, opcode, params, p);
     if (filterRMFTCallback && opcode!='\0')
@@ -553,131 +560,66 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
 
     case '1': // POWERON <1   [MAIN|PROG|JOIN]>
         {
-            bool main=false;
-            bool prog=false;
-            bool join=false;
-            bool singletrack=false;
-            //byte t=0;
-            if (params > 1) break;
-            if (params==0) { // All
-                main=true;
-                prog=true;
-            }
-            if (params==1) {
-                if (p[0]==HASH_KEYWORD_MAIN) { // <1 MAIN>
-                        main=true;
+	  if (params > 1) break;
+	  if (params==0) { // All
+	    TrackManager::setTrackPower(TRACK_MODE_ALL, POWERMODE::ON);
+	  }
+	  if (params==1) {
+	    if (p[0]==HASH_KEYWORD_MAIN) { // <1 MAIN>
+	      TrackManager::setTrackPower(TRACK_MODE_MAIN, POWERMODE::ON);
             }
 #ifndef DISABLE_PROG
             else if (p[0] == HASH_KEYWORD_JOIN) {  // <1 JOIN>
-                main=true;
-                prog=true;
-                join=true;
+	      TrackManager::setJoin(true);
+	      TrackManager::setTrackPower(TRACK_MODE_MAIN|TRACK_MODE_PROG, POWERMODE::ON);
             }
             else if (p[0]==HASH_KEYWORD_PROG) { // <1 PROG>
-                prog=true;
+	      TrackManager::setJoin(false);
+	      TrackManager::setTrackPower(TRACK_MODE_PROG, POWERMODE::ON);
             }
 #endif
-            //else if (p[0] >= 'A' && p[0] <= 'H') { // <1 A-H>
             else if (p[0] >= HASH_KEYWORD_A && p[0] <= HASH_KEYWORD_H) { // <1 A-H>
-                byte t = (p[0] - 'A');
-                    //DIAG(F("Processing track - %d "), t);
-                    if (TrackManager::isProg(t)) {
-                        main = false;
-                        prog = true;
-                    }
-                    else
-                    {
-                        main=true;
-                        prog=false;
-                    }
-                singletrack=true;
-                if (main) TrackManager::setTrackPower(false, false, POWERMODE::ON, t);
-                if (prog) TrackManager::setTrackPower(true, false, POWERMODE::ON, t);
-                
-                StringFormatter::send(stream, F("<1 %c>\n"), t+'A');
-                //CommandDistributor::broadcastPower();
-                //TrackManager::streamTrackState(NULL,t);
-                return;
+	      byte t = (p[0] - 'A');
+	      TrackManager::setTrackPower(POWERMODE::ON, t);
+	      //StringFormatter::send(stream, F("<p1 %c>\n"), t+'A');
             }
-
 	    else break; // will reply <X>
-	    }
-
-        if (!singletrack) {
-            TrackManager::setJoin(join);
-            if (join) TrackManager::setJoinPower(POWERMODE::ON);
-            else {
-                if (main) TrackManager::setMainPower(POWERMODE::ON);
-                if (prog) TrackManager::setProgPower(POWERMODE::ON);
-            }
-            CommandDistributor::broadcastPower();
+	  }
+	  CommandDistributor::broadcastPower();
+	  //TrackManager::streamTrackState(NULL,t);
           
-            return;
-            }
+	  return;
+	}
             
-        }
-
     case '0': // POWEROFF <0 [MAIN | PROG] >
         {
-            bool main=false;
-            bool prog=false;
-            bool singletrack=false;
-            //byte t=0;
-            if (params > 1) break;
-            if (params==0) { // All
-                main=true;
-                prog=true;
-            }
-            if (params==1) {
-                if (p[0]==HASH_KEYWORD_MAIN) { // <0 MAIN>
-                    main=true;
-            }
+	  if (params > 1) break;
+	  if (params==0) { // All
+	    TrackManager::setJoin(false);
+	    TrackManager::setTrackPower(TRACK_MODE_ALL, POWERMODE::OFF);
+	  }
+	  if (params==1) {
+	    if (p[0]==HASH_KEYWORD_MAIN) { // <0 MAIN>
+	      TrackManager::setJoin(false);
+	      TrackManager::setTrackPower(TRACK_MODE_MAIN, POWERMODE::OFF);
+	    }
 #ifndef DISABLE_PROG
             else if (p[0]==HASH_KEYWORD_PROG) { // <0 PROG>
-                prog=true;
+	      TrackManager::progTrackBoosted=false;  // Prog track boost mode will not outlive prog track off
+	      TrackManager::setTrackPower(TRACK_MODE_PROG, POWERMODE::OFF);
             }
 #endif
-            //else if (p[0] >= 'A' && p[0] <= 'H') { // <1 A-H>
-             else if (p[0] >= HASH_KEYWORD_A && p[0] <= HASH_KEYWORD_H) { // <1 A-H>
-                byte t = (p[0] - 'A');
-                //DIAG(F("Processing track - %d "), t);
-                if (TrackManager::isProg(t)) {
-                    main = false;
-                    prog = true;
-                }
-                else
-                {
-                    main=true;
-                    prog=false;
-                }
-                singletrack=true;  
-                TrackManager::setJoin(false);
-                if (main) TrackManager::setTrackPower(false, false, POWERMODE::OFF, t);
-                if (prog) {
-                    TrackManager::progTrackBoosted=false;  // Prog track boost mode will not outlive prog track off
-                    TrackManager::setTrackPower(true, false, POWERMODE::OFF, t);                 
-                }   
-                StringFormatter::send(stream, F("<0 %c>\n"), t+'A');
-                //CommandDistributor::broadcastPower();
-                //TrackManager::streamTrackState(NULL, t);
-                return;
-            }    
-
-	    else break; // will reply <X>
+	    else if (p[0] >= HASH_KEYWORD_A && p[0] <= HASH_KEYWORD_H) { // <1 A-H>
+	      byte t = (p[0] - 'A');
+	      TrackManager::setJoin(false);
+	      TrackManager::setTrackPower(POWERMODE::OFF, t);
+	      //StringFormatter::send(stream, F("<p0 %c>\n"), t+'A');
 	    }
-
-        if (!singletrack) {
-            TrackManager::setJoin(false);
-            
-            if (main) TrackManager::setMainPower(POWERMODE::OFF);
-            if (prog) {
-                    TrackManager::progTrackBoosted=false;  // Prog track boost mode will not outlive prog track off
-                    TrackManager::setProgPower(POWERMODE::OFF);
-                }
-            CommandDistributor::broadcastPower();
-            return;
-        }
-    }
+	    else break; // will reply <X>
+	  }
+	  CommandDistributor::broadcastPower();
+	  return;
+	}
 
     case '!': // ESTOP ALL  <!>
         DCC::setThrottle(0,1,1); // this broadcasts speed 1(estop) and sets all reminders to speed 1.
@@ -724,7 +666,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
             return;
         break;
 #endif
-    case '=': // TACK MANAGER CONTROL <= [params]>
+    case '=': // TRACK MANAGER CONTROL <= [params]>
         if (TrackManager::parseJ(stream, params, p))
             return;
         break;
@@ -781,27 +723,11 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
                     TrackManager::reportCurrent(stream);   // <g limit...limit>     
                     return;
 
-                case HASH_KEYWORD_A: // <JA> returns automations/routes
-                    StringFormatter::send(stream, F("<jA"));
-                    if (params==1) {// <JA>
-#ifdef EXRAIL_ACTIVE
-                        SENDFLASHLIST(stream,RMFT2::routeIdList)
-                        SENDFLASHLIST(stream,RMFT2::automationIdList)
-#endif
-                    }
-                    else {  // <JA id>
-                        StringFormatter::send(stream,F(" %d %c \"%S\""), 
-                                        id, 
-#ifdef EXRAIL_ACTIVE
-                                        RMFT2::getRouteType(id), // A/R
-                                        RMFT2::getRouteDescription(id)
-#else  
-                                        'X',F("")
-#endif                                        
-                                        );
-                    }
-                    StringFormatter::send(stream, F(">\n"));      
-                    return; 
+                case HASH_KEYWORD_A: // <JA> intercepted by EXRAIL// <JA> returns automations/routes
+                    if (params!=1) break; // <JA>
+                    StringFormatter::send(stream, F("<jA>\n"));
+                    return;
+ 
             case HASH_KEYWORD_R: // <JR> returns rosters 
                 StringFormatter::send(stream, F("<jR"));
 #ifdef EXRAIL_ACTIVE
@@ -915,20 +841,21 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
 
     case '@': // JMRI saying "give me virtual LCD msgs"
         CommandDistributor::setVirtualLCDSerial(stream);
-        StringFormatter::send(stream,
-            F("<@ 0 0 \"DCC-EX v" VERSION "\">\n"
-               "<@ 0 1 \"Lic GPLv3\">\n"));
         return; 
 
     default: //anything else will diagnose and drop out to <X>
+      if (opcode >= ' ' && opcode <= '~') {
         DIAG(F("Opcode=%c params=%d"), opcode, params);
         for (int i = 0; i < params; i++)
             DIAG(F("p[%d]=%d (0x%x)"), i, p[i], p[i]);
-        break;
+      } else {
+	DIAG(F("Unprintable %x"), opcode);
+      }
+      break;
 
     } // end of opcode switch
 
-    // Any fallout here sends an <X>
+out:// Any fallout here sends an <X>
     StringFormatter::send(stream, F("<X>\n"));
 }
 
@@ -1128,7 +1055,6 @@ bool DCCEXParser::parseS(Print *stream, int16_t params, int16_t p[])
 bool DCCEXParser::parseC(Print *stream, int16_t params, int16_t p[]) {
     if (params == 0)
         return false;
-    bool onOff = (params > 0) && (p[1] == 1 || p[1] == HASH_KEYWORD_ON); // dont care if other stuff or missing... just means off
     switch (p[0])
     {
 #ifndef DISABLE_PROG
@@ -1166,6 +1092,8 @@ bool DCCEXParser::parseC(Print *stream, int16_t params, int16_t p[]) {
 	      LCD(0, F("Ack Retry=%d Sum=%d"), p[2], DCCACK::setAckRetry(p[2]));  //   <D ACK RETRY 2>
 	    }
 	} else {
+      bool onOff = (params > 0) && (p[1] == 1 || p[1] == HASH_KEYWORD_ON); // dont care if other stuff or missing... just means off
+    
 	  DIAG(F("Ack diag %S"), onOff ? F("on") : F("off"));
 	  Diag::ACK = onOff;
 	}

DCCTimer.h

@@ -3,7 +3,6 @@
  *  © 2021 Mike S
  *  © 2021-2023 Harald Barth
  *  © 2021 Fred Decker
- *  © 2023 Travis Farmer
  *  All rights reserved.
  *  
  *  This file is part of CommandStation-EX
@@ -91,9 +90,6 @@ private:
   static const int DCC_SIGNAL_TIME=58;  // this is the 58uS DCC 1-bit waveform half-cycle 
 #if defined(ARDUINO_ARCH_STM32)  // TODO: PMA temporary hack - assumes 100Mhz F_CPU as STM32 can change frequency
   static const long CLOCK_CYCLES=(100000000L / 1000000 * DCC_SIGNAL_TIME) >>1;
-#elif defined(ARDUINO_GIGA)
-  ///TJF: we could get F_CPU from SystemCoreClock, but it will not allow as it is a non-constant value
-  static const long CLOCK_CYCLES=(480000000L / 1000000 * DCC_SIGNAL_TIME) >>1;
 #else
   static const long CLOCK_CYCLES=(F_CPU / 1000000 * DCC_SIGNAL_TIME) >>1;
 #endif

DCCTimerGiga.cpp

@@ -1,193 +0,0 @@
-/*
- *  © 2023 Travis Farmer
- *  © 2023 Neil McKechnie
- *  © 2022-2023 Paul M. Antoine
- *  © 2021 Mike S
- *  © 2021, 2023 Harald Barth
- *  © 2021 Fred Decker
- *  © 2021 Chris Harlow
- *  © 2021 David Cutting
- *  All rights reserved.
- *  
- *  This file is part of Asbelos DCC API
- *
- *  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/>.
- */
-
-// ATTENTION: this file only compiles on a STM32 based boards
-// Please refer to DCCTimer.h for general comments about how this class works
-// This is to avoid repetition and duplication.
-#if defined(ARDUINO_GIGA)
-
-#include "DCCTimer.h"
-#include "DIAG.h"
-#include "GigaHardwareTimer.h"
-#include <Arduino_AdvancedAnalog.h>
-//#include "config.h"
-///////////////////////////////////////////////////////////////////////////////////////////////
-// Experimental code for High Accuracy (HA) DCC Signal mode
-// Warning - use of TIM2 and TIM3 can affect the use of analogWrite() function on certain pins,
-// which is used by the DC motor types.
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-INTERRUPT_CALLBACK interruptHandler=0;
-
-#ifndef DCC_EX_TIMER
-#if defined(TIM6)
-#define DCC_EX_TIMER TIM6
-#elif defined(TIM7)
-#define DCC_EX_TIMER TIM7
-#elif defined(TIM12)
-#define DCC_EX_TIMER TIM12
-#else
-#warning This Giga variant does not have Timers 1,8 or 11!!
-#endif
-#endif // ifndef DCC_EX_TIMER
-
-HardwareTimer dcctimer(TIM8);
-void DCCTimer_Handler() __attribute__((interrupt));
-
-void DCCTimer_Handler() {
-  interruptHandler();
-}
-
-void DCCTimer::begin(INTERRUPT_CALLBACK callback) {
-  interruptHandler=callback;
-  noInterrupts();
-
-  dcctimer.pause();
-  dcctimer.setPrescaleFactor(1);
-//  timer.setOverflow(CLOCK_CYCLES * 2);
-  dcctimer.setOverflow(DCC_SIGNAL_TIME, MICROSEC_FORMAT);
-  // dcctimer.attachInterrupt(Timer11_Handler);
-  dcctimer.attachInterrupt(DCCTimer_Handler);
-  dcctimer.setInterruptPriority(0, 0); // Set highest preemptive priority!
-  dcctimer.refresh();
-  dcctimer.resume();
-
-  interrupts();
-}
-
-bool DCCTimer::isPWMPin(byte pin) {
-  //TODO: STM32 whilst this call to digitalPinHasPWM will reveal which pins can do PWM,
-  //      there's no support yet for High Accuracy, so for now return false
-  //  return digitalPinHasPWM(pin);
-  (void) pin;
-  return false;
-}
-
-void DCCTimer::setPWM(byte pin, bool high) {
-    // TODO: High Accuracy mode is not supported as yet, and may never need to be
-    (void) pin;
-    (void) high;
-    return;
- }
-
-void DCCTimer::clearPWM() {
-  return;
-}
-
-void   DCCTimer::getSimulatedMacAddress(byte mac[6]) {
-  volatile uint32_t *serno1 = (volatile uint32_t *)UID_BASE;
-  volatile uint32_t *serno2 = (volatile uint32_t *)UID_BASE+4;
-  volatile uint32_t *serno3 = (volatile uint32_t *)UID_BASE+8;
-  volatile uint32_t m1 = *serno1;
-  volatile uint32_t m2 = *serno2;
-  volatile uint32_t m3 = *serno3;
-  mac[0] = 0xBE;
-  mac[1] = 0xEF;
-  mac[2] = m1 ^ m3 >> 24;
-  mac[3] = m1 ^ m3 >> 16;
-  mac[4] = m1 ^ m3 >> 8;
-  mac[5] = m1 ^ m3 >> 0;
-  //DIAG(F("MAC: %P:%P:%P:%P:%P:%P"),mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]);
-
-}
-volatile int DCCTimer::minimum_free_memory=__INT_MAX__;
-
-// Return low memory value... 
-int DCCTimer::getMinimumFreeMemory() {
-  noInterrupts(); // Disable interrupts to get volatile value 
-  int retval = freeMemory();
-  interrupts();
-  return retval;
-}
-extern "C" char* sbrk(int incr);
-
-int DCCTimer::freeMemory() {
-  
-  char top;
-  unsigned int tmp = (unsigned int)(&top - reinterpret_cast<char*>(sbrk(0)));
-  return (int)(tmp / 1000);
-}
-
-void DCCTimer::reset() {
-  //Watchdog &watchdog = Watchdog::get_instance();
-  //Watchdog::stop();
-  //Watchdog::start(500);
-  
-  //while(true) {};
-  return;
-}
-
-int * ADCee::analogvals = NULL;
-
-int16_t ADCee::ADCmax()
-{
-    return 4095;
-}
-
-AdvancedADC adc;
-pin_size_t active_pins[] = {A0, A1, A2, A3};
-pin_size_t active_pinsB[] = {A4, A5, A6, A7};
-int num_active_pins = 4;
-const int samples_per_round = 512;
-int ADCee::init(uint8_t pin) {
-  adc.stop();
-  if (pin >= A0 && pin <= A3) adc.begin(AN_RESOLUTION_12, 16000, 1, samples_per_round, num_active_pins, active_pins);
-  else if (pin >= A4 && pin <= A7) adc.begin(AN_RESOLUTION_12, 16000, 1, samples_per_round, num_active_pins, active_pinsB);
-  return 123;
-}
-
-/*
- * Read function ADCee::read(pin) to get value instead of analogRead(pin)
- */
-int ADCee::read(uint8_t pin, bool fromISR) {
-  int tmpPin = 0;
-  if (pin >= A0 && pin <= A3) tmpPin = (pin - A0);
-  else if (pin >= A4 && pin <= A7) tmpPin = ((pin - A0) - 4);
-  static SampleBuffer buf = adc.read();
-  int retVal = -123;
-  if (adc.available()) {
-    buf.release();
-    buf = adc.read();
-  }
-  return (buf[tmpPin]);
-}
-
-/*
- * Scan function that is called from interrupt
- */
-#pragma GCC push_options
-#pragma GCC optimize ("-O3")
-void ADCee::scan() {
-}
-#pragma GCC pop_options
-
-void ADCee::begin() {
-  noInterrupts();
-  
-  interrupts();
-}
-#endif

Display.h

@@ -37,7 +37,9 @@
 class Display : public DisplayInterface {
 public:
   Display(DisplayDevice *deviceDriver);
+#if !defined (MAX_CHARACTER_ROWS)
   static const int MAX_CHARACTER_ROWS = 8;
+#endif
   static const int MAX_CHARACTER_COLS = MAX_MSG_SIZE;
   static const long DISPLAY_SCROLL_TIME = 3000;  // 3 seconds
 

EEStore.cpp

@@ -31,12 +31,12 @@
 #include "Sensors.h"
 #include "Turnouts.h"
 
-#if defined(ARDUINO_ARCH_SAMC) || defined(ARDUINO_GIGA)
+#if defined(ARDUINO_ARCH_SAMC)
 ExternalEEPROM EEPROM;
 #endif
 
 void EEStore::init() {
-#if defined(ARDUINO_ARCH_SAMC) || defined(ARDUINO_GIGA)
+#if defined(ARDUINO_ARCH_SAMC)
   EEPROM.begin(0x50);  // Address for Microchip 24-series EEPROM with all three
                        // A pins grounded (0b1010000 = 0x50)
 #endif

EEStore.h

@@ -26,7 +26,7 @@
 
 #include <Arduino.h>
 
-#if defined(ARDUINO_ARCH_SAMC) || defined(ARDUINO_GIGA)
+#if defined(ARDUINO_ARCH_SAMC)
 #include <SparkFun_External_EEPROM.h>
 extern ExternalEEPROM EEPROM;
 #else

EXRAIL2.cpp

@@ -55,22 +55,6 @@
 #include "Turntables.h"
 #include "IODevice.h"
 
-// Command parsing keywords
-const int16_t HASH_KEYWORD_EXRAIL=15435;    
-const int16_t HASH_KEYWORD_ON = 2657;
-const int16_t HASH_KEYWORD_START=23232;
-const int16_t HASH_KEYWORD_RESERVE=11392;
-const int16_t HASH_KEYWORD_FREE=-23052;
-const int16_t HASH_KEYWORD_LATCH=1618;  
-const int16_t HASH_KEYWORD_UNLATCH=1353;
-const int16_t HASH_KEYWORD_PAUSE=-4142;
-const int16_t HASH_KEYWORD_RESUME=27609;
-const int16_t HASH_KEYWORD_KILL=5218;
-const int16_t HASH_KEYWORD_ALL=3457;
-const int16_t HASH_KEYWORD_ROUTES=-3702;
-const int16_t HASH_KEYWORD_RED=26099;
-const int16_t HASH_KEYWORD_AMBER=18713;
-const int16_t HASH_KEYWORD_GREEN=-31493;
 
 // One instance of RMFT clas is used for each "thread" in the automation.
 // Each thread manages a loco on a journey through the layout, and/or may manage a scenery automation.
@@ -86,7 +70,7 @@ RMFT2 * RMFT2::pausingTask=NULL; // Task causing a PAUSE.
  // and all others will have their locos stopped, then resumed after the pausing task resumes.
 byte RMFT2::flags[MAX_FLAGS];
 Print * RMFT2::LCCSerial=0;
-LookList *  RMFT2::sequenceLookup=NULL;
+LookList *  RMFT2::routeLookup=NULL;
 LookList *  RMFT2::onThrowLookup=NULL;
 LookList *  RMFT2::onCloseLookup=NULL;
 LookList *  RMFT2::onActivateLookup=NULL;
@@ -100,9 +84,8 @@ LookList *  RMFT2::onClockLookup=NULL;
 LookList *  RMFT2::onRotateLookup=NULL;
 #endif
 LookList *  RMFT2::onOverloadLookup=NULL;
-
-#define GET_OPCODE GETHIGHFLASH(RMFT2::RouteCode,progCounter)
-#define SKIPOP progCounter+=3
+byte * RMFT2::routeStateArray=nullptr; 
+const FSH  * * RMFT2::routeCaptionArray=nullptr; 
 
 // getOperand instance version, uses progCounter from instance.
 uint16_t RMFT2::getOperand(byte n) {
@@ -120,6 +103,7 @@ uint16_t RMFT2::getOperand(int progCounter,byte n) {
 LookList::LookList(int16_t size) {
   m_size=size;
   m_loaded=0;
+  m_chain=nullptr;
   if (size) {
     m_lookupArray=new int16_t[size];
     m_resultArray=new int16_t[size];
@@ -137,8 +121,35 @@ int16_t LookList::find(int16_t value) {
   for (int16_t i=0;i<m_size;i++) {
     if (m_lookupArray[i]==value) return m_resultArray[i];
   }
+  return m_chain ?  m_chain->find(value)  :-1;
+}
+void LookList::chain(LookList * chain) {
+  m_chain=chain;
+}
+void LookList::handleEvent(const FSH* reason,int16_t id) {
+  // New feature... create multiple ONhandlers
+  for (int i=0;i<m_size;i++) 
+    if (m_lookupArray[i]==id)
+       RMFT2::startNonRecursiveTask(reason,id,m_resultArray[i]);
+}
+
+
+void LookList::stream(Print * _stream) {
+  for (int16_t i=0;i<m_size;i++) {
+    _stream->print(" ");
+    _stream->print(m_lookupArray[i]);
+  }
+}
+
+int16_t LookList::findPosition(int16_t value) {
+  for (int16_t i=0;i<m_size;i++) {
+    if (m_lookupArray[i]==value) return i;
+  }
   return -1;
 }
+int16_t LookList::size() {
+   return m_size;
+}
 
 LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) {
   int progCounter;
@@ -171,7 +182,12 @@ LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) {
   for (int f=0;f<MAX_FLAGS;f++) flags[f]=0;
   
   // create lookups
-  sequenceLookup=LookListLoader(OPCODE_ROUTE, OPCODE_AUTOMATION,OPCODE_SEQUENCE);
+  routeLookup=LookListLoader(OPCODE_ROUTE, OPCODE_AUTOMATION);
+  routeLookup->chain(LookListLoader(OPCODE_SEQUENCE));
+  if (compileFeatures && FEATURE_ROUTESTATE) {
+    routeStateArray=(byte *)calloc(routeLookup->size(),sizeof(byte));
+    routeCaptionArray=(const FSH * *)calloc(routeLookup->size(),sizeof(const FSH *));
+  }
   onThrowLookup=LookListLoader(OPCODE_ONTHROW);
   onCloseLookup=LookListLoader(OPCODE_ONCLOSE);
   onActivateLookup=LookListLoader(OPCODE_ONACTIVATE);
@@ -314,238 +330,15 @@ void RMFT2::setTurntableHiddenState(Turntable * tto) {
 #endif
 
 char RMFT2::getRouteType(int16_t id) {
-  for (int16_t i=0;;i+=2) {
-    int16_t rid= GETHIGHFLASHW(routeIdList,i);
-    if (rid==INT16_MAX) break;
-    if (rid==id) return 'R';
-  }
-  for (int16_t i=0;;i+=2) {
-    int16_t rid= GETHIGHFLASHW(automationIdList,i);
-    if (rid==INT16_MAX) break;
-    if (rid==id) return 'A';
+  int16_t progCounter=routeLookup->find(id);
+  if (progCounter>=0) {
+    byte type=GET_OPCODE; 
+    if (type==OPCODE_ROUTE) return 'R';
+    if (type==OPCODE_AUTOMATION) return 'A';
   }
   return 'X';
 }
 
-// This filter intercepts <> commands to do the following:
-// - Implement RMFT specific commands/diagnostics
-// - Reject/modify JMRI commands that would interfere with RMFT processing
-void RMFT2::ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16_t p[]) {
-  (void)stream; // avoid compiler warning if we don't access this parameter
-  bool reject=false;
-  switch(opcode) {
-    
-  case 'D':
-    if (p[0]==HASH_KEYWORD_EXRAIL) { // <D EXRAIL ON/OFF>
-      diag = paramCount==2 && (p[1]==HASH_KEYWORD_ON || p[1]==1);
-      opcode=0;
-    }
-        break;
-	
-  case '/':  // New EXRAIL command
-    reject=!parseSlash(stream,paramCount,p);
-    opcode=0;
-    break;
-  case 'L':
-    if (compileFeatures & FEATURE_LCC) { 
-      // This entire code block is compiled out if LLC macros not used 
-    if (paramCount==0) {  //<L>  LCC adapter introducing self
-      LCCSerial=stream;   // now we know where to send events we raise
-
-      // loop through all possible sent events 
-      for (int progCounter=0;; SKIPOP) {
-        byte opcode=GET_OPCODE;
-        if (opcode==OPCODE_ENDEXRAIL) break;
-        if (opcode==OPCODE_LCC)  StringFormatter::send(stream,F("<LS x%h>\n"),getOperand(progCounter,0));   
-        if (opcode==OPCODE_LCCX) { // long form LCC
-           StringFormatter::send(stream,F("<LS x%h%h%h%h>\n"),
-                 getOperand(progCounter,1),
-                 getOperand(progCounter,2),
-                 getOperand(progCounter,3),
-                 getOperand(progCounter,0)
-                 );        
-        }}
-      
-      // we stream the hex events we wish to listen to
-      // and at the same time build the event index looku.
-      
-      
-      int eventIndex=0;
-      for (int progCounter=0;; SKIPOP) {
-        byte opcode=GET_OPCODE;
-        if (opcode==OPCODE_ENDEXRAIL) break;
-        if (opcode==OPCODE_ONLCC) {
-           onLCCLookup[eventIndex]=progCounter; // TODO skip...
-           StringFormatter::send(stream,F("<LL %d x%h%h%h:%h>\n"),
-                 eventIndex,
-                 getOperand(progCounter,1),
-                 getOperand(progCounter,2),
-                 getOperand(progCounter,3),
-                 getOperand(progCounter,0)
-                 );   
-           eventIndex++;      
-        }
-      }
-      StringFormatter::send(stream,F("<LR>\n")); // Ready to rumble
-      opcode=0;
-      break;
-    }
-    if (paramCount==1) {  // <L eventid> LCC event arrived from adapter
-        int16_t eventid=p[0];
-        reject=eventid<0 || eventid>=countLCCLookup;
-        if (!reject)  startNonRecursiveTask(F("LCC"),eventid,onLCCLookup[eventid]);
-        opcode=0;
-    }
-    }
-    break; 
-
-  default:  // other commands pass through
-    break;
-  }
-  if (reject) {
-    opcode=0;
-    StringFormatter::send(stream,F("<X>\n"));
-  }
-}
-
-bool RMFT2::parseSlash(Print * stream, byte & paramCount, int16_t p[]) {
-
-  if (paramCount==0) { // STATUS
-    StringFormatter::send(stream, F("<* EXRAIL STATUS"));
-    RMFT2 * task=loopTask;
-    while(task) {
-      StringFormatter::send(stream,F("\nID=%d,PC=%d,LOCO=%d%c,SPEED=%d%c"),
-			    (int)(task->taskId),task->progCounter,task->loco,
-			    task->invert?'I':' ',
-			    task->speedo,
-			    task->forward?'F':'R'
-			    );
-      task=task->next;
-      if (task==loopTask) break;
-    }
-    // Now stream the flags
-    for (int id=0;id<MAX_FLAGS; id++) {
-      byte flag=flags[id];
-      if (flag & ~TASK_FLAG & ~SIGNAL_MASK) { // not interested in TASK_FLAG only. Already shown above
-	      StringFormatter::send(stream,F("\nflags[%d] "),id);
-	      if (flag & SECTION_FLAG) StringFormatter::send(stream,F(" RESERVED"));
-	      if (flag & LATCH_FLAG) StringFormatter::send(stream,F(" LATCHED"));
-      }
-    }
-
-    if (compileFeatures & FEATURE_SIGNAL) {
-      // do the signals
-      // flags[n] represents the state of the nth signal in the table 
-      for (int sigslot=0;;sigslot++) {
-        VPIN sigid=GETHIGHFLASHW(RMFT2::SignalDefinitions,sigslot*8);
-        if (sigid==0) break; // end of signal list 
-        byte flag=flags[sigslot] & SIGNAL_MASK; // obtain signal flags for this id
-        StringFormatter::send(stream,F("\n%S[%d]"), 
-          (flag == SIGNAL_RED)? F("RED") : (flag==SIGNAL_GREEN) ? F("GREEN") : F("AMBER"),
-          sigid & SIGNAL_ID_MASK); 
-      } 
-    }
-    StringFormatter::send(stream,F(" *>\n"));
-    return true;
-  }
-  switch (p[0]) {
-  case HASH_KEYWORD_PAUSE: // </ PAUSE>
-    if (paramCount!=1) return false;
-    DCC::setThrottle(0,1,true);  // pause all locos on the track
-    pausingTask=(RMFT2 *)1; // Impossible task address
-    return true;
-    
-  case HASH_KEYWORD_RESUME: // </ RESUME>
-    if (paramCount!=1) return false;
-    pausingTask=NULL;
-    {
-      RMFT2 * task=loopTask;
-      while(task) {
-	if (task->loco) task->driveLoco(task->speedo);
-	task=task->next;
-	if (task==loopTask) break;
-      }
-    }
-    return true;
-    
-    
-  case HASH_KEYWORD_START: // </ START [cab] route >
-    if (paramCount<2 || paramCount>3) return false;
-    {
-      int route=(paramCount==2) ? p[1] : p[2];
-      uint16_t cab=(paramCount==2)? 0 : p[1];
-      int pc=sequenceLookup->find(route);
-      if (pc<0) return false;
-      RMFT2* task=new RMFT2(pc);
-      task->loco=cab;
-    }
-    return true;
-    
-  default:
-    break;
-  }
-
-  // check KILL ALL here, otherwise the next validation confuses ALL with a flag  
-  if (p[0]==HASH_KEYWORD_KILL && p[1]==HASH_KEYWORD_ALL) {
-    while (loopTask) loopTask->kill(F("KILL ALL")); // destructor changes loopTask
-    return true;   
-  }
-
-  // all other / commands take 1 parameter
-  if (paramCount!=2 ) return false;
-  
-  switch (p[0]) {
-  case HASH_KEYWORD_KILL: // Kill taskid|ALL
-    {
-    if ( p[1]<0  || p[1]>=MAX_FLAGS) return false;
-    RMFT2 * task=loopTask;
-      while(task) {
-	      if (task->taskId==p[1]) {
-	        task->kill(F("KILL"));
-	        return  true;
-	      }
-	      task=task->next;
-	      if (task==loopTask) break;
-      }
-    }
-    return false;
-    
-  case HASH_KEYWORD_RESERVE:  // force reserve a section
-    return setFlag(p[1],SECTION_FLAG);
-    
-  case HASH_KEYWORD_FREE:  // force free a section
-    return setFlag(p[1],0,SECTION_FLAG);
-    
-  case HASH_KEYWORD_LATCH:
-    return setFlag(p[1], LATCH_FLAG);
-    
-  case HASH_KEYWORD_UNLATCH:
-    return setFlag(p[1], 0, LATCH_FLAG);
- 
-  case HASH_KEYWORD_RED:
-    doSignal(p[1],SIGNAL_RED);
-    return true;
- 
-  case HASH_KEYWORD_AMBER:
-    doSignal(p[1],SIGNAL_AMBER);
-    return true;
- 
-  case HASH_KEYWORD_GREEN:
-    doSignal(p[1],SIGNAL_GREEN);
-    return true;
-    
-  default:
-    return false;
-  }
-}
-
-
-// This emits Routes and Automations to Withrottle
-// Automations are given a state to set the button to "handoff" which implies
-// handing over the loco to the automation.
-// Routes are given "Set" buttons and do not cause the loco to be handed over.
-
-
 
 RMFT2::RMFT2(int progCtr) {
   progCounter=progCtr;
@@ -594,7 +387,7 @@ RMFT2::~RMFT2() {
 }
 
 void RMFT2::createNewTask(int route, uint16_t cab) {
-      int pc=sequenceLookup->find(route);
+      int pc=routeLookup->find(route);
       if (pc<0) return;
       RMFT2* task=new RMFT2(pc);
       task->loco=cab;
@@ -843,10 +636,10 @@ void RMFT2::loop2() {
         //byte thistrack=getOperand(1);
         switch (operand) {
           case TRACK_POWER_0:
-            TrackManager::setTrackPower(TrackManager::isProg(getOperand(1)), false, POWERMODE::OFF, getOperand(1));
+            TrackManager::setTrackPower(POWERMODE::OFF, getOperand(1));
           break;
           case TRACK_POWER_1:
-            TrackManager::setTrackPower(TrackManager::isProg(getOperand(1)), false, POWERMODE::ON, getOperand(1));
+            TrackManager::setTrackPower(POWERMODE::ON, getOperand(1));
           break;
         }
 
@@ -857,7 +650,7 @@ void RMFT2::loop2() {
       // If DC/DCX use  my loco for DC address 
       {
         TRACK_MODE mode = (TRACK_MODE)(operand>>8);
-        int16_t cab=(mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX) ? loco : 0;
+        int16_t cab=(mode & TRACK_MODE_DC) ? loco : 0;
         TrackManager::setTrackMode(operand & 0x0F, mode, cab);
       }
       break; 
@@ -995,7 +788,7 @@ void RMFT2::loop2() {
   }
     
   case OPCODE_FOLLOW:
-    progCounter=sequenceLookup->find(operand);
+    progCounter=routeLookup->find(operand);
     if (progCounter<0) kill(F("FOLLOW unknown"), operand);
     return;
     
@@ -1005,7 +798,7 @@ void RMFT2::loop2() {
       return;
     }
     callStack[stackDepth++]=progCounter+3;
-    progCounter=sequenceLookup->find(operand);
+    progCounter=routeLookup->find(operand);
     if (progCounter<0) kill(F("CALL unknown"),operand);
     return;
     
@@ -1068,7 +861,7 @@ void RMFT2::loop2() {
     
   case OPCODE_START:
     {
-      int newPc=sequenceLookup->find(operand);
+      int newPc=routeLookup->find(operand);
       if (newPc<0) break;
       new RMFT2(newPc);
     }
@@ -1076,7 +869,7 @@ void RMFT2::loop2() {
     
   case OPCODE_SENDLOCO:  // cab, route
     {
-      int newPc=sequenceLookup->find(getOperand(1));
+      int newPc=routeLookup->find(getOperand(1));
       if (newPc<0) break;
       RMFT2* newtask=new RMFT2(newPc); // create new task
       newtask->loco=operand;
@@ -1130,7 +923,16 @@ void RMFT2::loop2() {
   case OPCODE_PRINT:
     printMessage(operand);
     break;
-    
+  case OPCODE_ROUTE_HIDDEN:
+    manageRouteState(operand,2);
+    break;   
+  case OPCODE_ROUTE_INACTIVE:
+    manageRouteState(operand,0);
+    break;   
+  case OPCODE_ROUTE_ACTIVE:
+    manageRouteState(operand,1);
+    break;   
+  
   case OPCODE_ROUTE:
   case OPCODE_AUTOMATION:
   case OPCODE_SEQUENCE:
@@ -1218,9 +1020,9 @@ int16_t RMFT2::getSignalSlot(int16_t id) {
   
   // Schedule any event handler for this signal change.
   // Thjis will work even without a signal definition. 
-  if (rag==SIGNAL_RED) handleEvent(F("RED"),onRedLookup,id);
-  else if (rag==SIGNAL_GREEN) handleEvent(F("GREEN"), onGreenLookup,id);
-  else handleEvent(F("AMBER"), onAmberLookup,id);
+  if (rag==SIGNAL_RED) onRedLookup->handleEvent(F("RED"),id);
+  else if (rag==SIGNAL_GREEN) onGreenLookup->handleEvent(F("GREEN"),id);
+  else onAmberLookup->handleEvent(F("AMBER"),id);
   
   int16_t sigslot=getSignalSlot(id);
   if (sigslot<0) return; 
@@ -1289,26 +1091,26 @@ int16_t RMFT2::getSignalSlot(int16_t id) {
 
 void RMFT2::turnoutEvent(int16_t turnoutId, bool closed) {
   // Hunt for an ONTHROW/ONCLOSE for this turnout
-  if (closed)  handleEvent(F("CLOSE"),onCloseLookup,turnoutId);
-  else handleEvent(F("THROW"),onThrowLookup,turnoutId);
+  if (closed)  onCloseLookup->handleEvent(F("CLOSE"),turnoutId);
+  else onThrowLookup->handleEvent(F("THROW"),turnoutId);
 }
 
 
 void RMFT2::activateEvent(int16_t addr, bool activate) {
   // Hunt for an ONACTIVATE/ONDEACTIVATE for this accessory
-  if (activate)  handleEvent(F("ACTIVATE"),onActivateLookup,addr);
-  else handleEvent(F("DEACTIVATE"),onDeactivateLookup,addr);
+  if (activate)  onActivateLookup->handleEvent(F("ACTIVATE"),addr);
+  else onDeactivateLookup->handleEvent(F("DEACTIVATE"),addr);
 }
 
 void RMFT2::changeEvent(int16_t vpin, bool change) {
   // Hunt for an ONCHANGE for this sensor
-  if (change)  handleEvent(F("CHANGE"),onChangeLookup,vpin);
+  if (change)  onChangeLookup->handleEvent(F("CHANGE"),vpin);
 }
 
 #ifndef IO_NO_HAL
 void RMFT2::rotateEvent(int16_t turntableId, bool change) {
   // Hunt or an ONROTATE for this turntable
-  if (change) handleEvent(F("ROTATE"),onRotateLookup,turntableId);
+  if (change) onRotateLookup->handleEvent(F("ROTATE"),turntableId);
 }
 #endif
 
@@ -1317,8 +1119,8 @@ void RMFT2::clockEvent(int16_t clocktime, bool change) {
   if (Diag::CMD)
    DIAG(F("Looking for clock event at : %d"), clocktime);
   if (change) {
-    handleEvent(F("CLOCK"),onClockLookup,clocktime);
-    handleEvent(F("CLOCK"),onClockLookup,25*60+clocktime%60);
+    onClockLookup->handleEvent(F("CLOCK"),clocktime);
+    onClockLookup->handleEvent(F("CLOCK"),25*60+clocktime%60);
   }
 } 
 
@@ -1327,16 +1129,10 @@ void RMFT2::powerEvent(int16_t track, bool overload) {
   if (Diag::CMD)
    DIAG(F("Looking for Power event on track : %c"), track);
   if (overload) {
-    handleEvent(F("POWER"),onOverloadLookup,track);
+    onOverloadLookup->handleEvent(F("POWER"),track);
   }
 }
 
-
-void RMFT2::handleEvent(const FSH* reason,LookList* handlers, int16_t id) {
-  int pc= handlers->find(id);
-  if (pc>=0) startNonRecursiveTask(reason,id,pc);
-}
-
 void RMFT2::startNonRecursiveTask(const FSH* reason, int16_t id,int pc) {  
   // Check we dont already have a task running this handler
   RMFT2 * task=loopTask;
@@ -1453,3 +1249,29 @@ void RMFT2::thrungeString(uint32_t strfar, thrunger mode, byte id) {
       break;       
     }
 }
+
+void RMFT2::manageRouteState(uint16_t id, byte state) {
+  if (compileFeatures && FEATURE_ROUTESTATE) {
+    // Route state must be maintained for when new throttles connect.
+    // locate route id in the Routes lookup
+    int16_t position=routeLookup->findPosition(id);
+    if (position<0) return; 
+    // set state beside it 
+    if (routeStateArray[position]==state) return; 
+    routeStateArray[position]=state;
+    CommandDistributor::broadcastRouteState(id,state);
+  }
+}
+void RMFT2::manageRouteCaption(uint16_t id,const FSH* caption) {
+  if (compileFeatures && FEATURE_ROUTESTATE) {
+    // Route state must be maintained for when new throttles connect.
+    // locate route id in the Routes lookup
+    int16_t position=routeLookup->findPosition(id);
+    if (position<0) return; 
+    // set state beside it 
+    if (routeCaptionArray[position]==caption) return; 
+    routeCaptionArray[position]=caption;
+    CommandDistributor::broadcastRouteCaption(id,caption);
+  }
+}
+  

EXRAIL2.h

@@ -68,6 +68,7 @@ enum OPCODE : byte {OPCODE_THROW,OPCODE_CLOSE,
              OPCODE_ONROTATE,OPCODE_ROTATE,OPCODE_WAITFORTT,
              OPCODE_LCC,OPCODE_LCCX,OPCODE_ONLCC,
              OPCODE_ONOVERLOAD,
+             OPCODE_ROUTE_ACTIVE,OPCODE_ROUTE_INACTIVE,OPCODE_ROUTE_HIDDEN,
 
              // OPcodes below this point are skip-nesting IF operations
              // placed here so that they may be skipped as a group
@@ -99,6 +100,7 @@ enum thrunger: byte {
   static const byte FEATURE_SIGNAL= 0x80;
   static const byte FEATURE_LCC   = 0x40;
   static const byte FEATURE_ROSTER= 0x20;
+  static const byte FEATURE_ROUTESTATE= 0x10;
   
  
   // Flag bits for status of hardware and TPL
@@ -119,13 +121,20 @@ enum thrunger: byte {
 class LookList {
   public: 
     LookList(int16_t size);
+    void chain(LookList* chainTo);
     void add(int16_t lookup, int16_t result);
-    int16_t find(int16_t value);
+    int16_t find(int16_t value); // finds result value
+    int16_t findPosition(int16_t value); // finds index 
+    int16_t size();
+    void stream(Print * _stream); 
+    void handleEvent(const FSH* reason,int16_t id);
+
   private:
      int16_t m_size;
      int16_t m_loaded;
      int16_t * m_lookupArray;
-     int16_t * m_resultArray;     
+     int16_t * m_resultArray;
+     LookList* m_chain;     
 };
 
  class RMFT2 {
@@ -159,7 +168,8 @@ class LookList {
   static const FSH *  getRosterFunctions(int16_t id);
   static const FSH *  getTurntableDescription(int16_t id);
   static const FSH *  getTurntablePositionDescription(int16_t turntableId, uint8_t positionId);
-    
+  static void startNonRecursiveTask(const FSH* reason, int16_t id,int pc);
+      
 private: 
     static void ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16_t p[]);
     static bool parseSlash(Print * stream, byte & paramCount, int16_t p[]) ;
@@ -176,9 +186,7 @@ private:
     #endif
     static LookList* LookListLoader(OPCODE op1,
                       OPCODE op2=OPCODE_ENDEXRAIL,OPCODE op3=OPCODE_ENDEXRAIL);
-    static void handleEvent(const FSH* reason,LookList* handlers, int16_t id);
     static uint16_t getOperand(int progCounter,byte n);
-    static void startNonRecursiveTask(const FSH* reason, int16_t id,int pc);
     static RMFT2 * loopTask;
     static RMFT2 * pausingTask;
     void delayMe(long millisecs);
@@ -198,7 +206,7 @@ private:
    static const  HIGHFLASH  int16_t SignalDefinitions[];
    static byte flags[MAX_FLAGS];
    static Print * LCCSerial;
-   static LookList * sequenceLookup;
+   static LookList * routeLookup;
    static LookList * onThrowLookup;
    static LookList * onCloseLookup;
    static LookList * onActivateLookup;
@@ -216,6 +224,10 @@ private:
    static const int countLCCLookup;
    static int onLCCLookup[];
    static const byte compileFeatures;
+   static void manageRouteState(uint16_t id, byte state);
+   static void manageRouteCaption(uint16_t id, const FSH* caption);
+   static byte * routeStateArray;
+   static const FSH ** routeCaptionArray;
     
   // Local variables - exist for each instance/task 
     RMFT2 *next;   // loop chain 
@@ -237,4 +249,8 @@ private:
     byte stackDepth;
     int callStack[MAX_STACK_DEPTH];
 };
+
+#define GET_OPCODE GETHIGHFLASH(RMFT2::RouteCode,progCounter)
+#define SKIPOP progCounter+=3
+
 #endif

EXRAIL2MacroReset.h

@@ -126,6 +126,10 @@
 #undef ROTATE
 #undef ROTATE_DCC
 #undef ROUTE
+#undef ROUTE_ACTIVE
+#undef ROUTE_INACTIVE
+#undef ROUTE_HIDDEN
+#undef ROUTE_CAPTION
 #undef SENDLOCO 
 #undef SEQUENCE 
 #undef SERIAL 
@@ -267,6 +271,10 @@
 #define ROTATE_DCC(turntable_id,position)
 #define ROSTER(cab,name,funcmap...)
 #define ROUTE(id,description)
+#define ROUTE_ACTIVE(id)
+#define ROUTE_INACTIVE(id)
+#define ROUTE_HIDDEN(id)
+#define ROUTE_CAPTION(id,caption)
 #define SENDLOCO(cab,route) 
 #define SEQUENCE(id) 
 #define SERIAL(msg) 

EXRAIL2Parser.cpp

@@ -0,0 +1,291 @@
+/*
+ *  © 2021 Neil McKechnie
+ *  © 2021-2023 Harald Barth
+ *  © 2020-2023 Chris Harlow
+ *  © 2022-2023 Colin Murdoch
+ *  All rights reserved.
+ *  
+ *  This file is part of CommandStation-EX
+ *
+ *  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/>.
+ */
+
+// THIS file is an extension of the RMFT2 class 
+//  normally found in EXRAIL2.cpp
+
+#include <Arduino.h>
+#include "defines.h"
+#include "EXRAIL2.h"
+#include "DCC.h"
+// Command parsing keywords
+const int16_t HASH_KEYWORD_EXRAIL=15435;    
+const int16_t HASH_KEYWORD_ON = 2657;
+const int16_t HASH_KEYWORD_START=23232;
+const int16_t HASH_KEYWORD_RESERVE=11392;
+const int16_t HASH_KEYWORD_FREE=-23052;
+const int16_t HASH_KEYWORD_LATCH=1618;  
+const int16_t HASH_KEYWORD_UNLATCH=1353;
+const int16_t HASH_KEYWORD_PAUSE=-4142;
+const int16_t HASH_KEYWORD_RESUME=27609;
+const int16_t HASH_KEYWORD_KILL=5218;
+const int16_t HASH_KEYWORD_ALL=3457;
+const int16_t HASH_KEYWORD_ROUTES=-3702;
+const int16_t HASH_KEYWORD_RED=26099;
+const int16_t HASH_KEYWORD_AMBER=18713;
+const int16_t HASH_KEYWORD_GREEN=-31493;
+const int16_t HASH_KEYWORD_A='A';
+
+// This filter intercepts <> commands to do the following:
+// - Implement RMFT specific commands/diagnostics
+// - Reject/modify JMRI commands that would interfere with RMFT processing
+
+void RMFT2::ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16_t p[]) {
+  (void)stream; // avoid compiler warning if we don't access this parameter
+  bool reject=false;
+  switch(opcode) {
+    
+  case 'D':
+    if (p[0]==HASH_KEYWORD_EXRAIL) { // <D EXRAIL ON/OFF>
+      diag = paramCount==2 && (p[1]==HASH_KEYWORD_ON || p[1]==1);
+      opcode=0;
+    }
+    break;
+	
+  case '/':  // New EXRAIL command
+    reject=!parseSlash(stream,paramCount,p);
+    opcode=0;
+    break;
+  
+  case 'L':
+    // This entire code block is compiled out if LLC macros not used 
+    if (!(compileFeatures & FEATURE_LCC)) return;
+
+    if (paramCount==0) {  //<L>  LCC adapter introducing self
+      LCCSerial=stream;   // now we know where to send events we raise
+
+      // loop through all possible sent events 
+      for (int progCounter=0;; SKIPOP) {
+        byte opcode=GET_OPCODE;
+        if (opcode==OPCODE_ENDEXRAIL) break;
+        if (opcode==OPCODE_LCC)  StringFormatter::send(stream,F("<LS x%h>\n"),getOperand(progCounter,0));   
+        if (opcode==OPCODE_LCCX) { // long form LCC
+           StringFormatter::send(stream,F("<LS x%h%h%h%h>\n"),
+                 getOperand(progCounter,1),
+                 getOperand(progCounter,2),
+                 getOperand(progCounter,3),
+                 getOperand(progCounter,0)
+                 );        
+        }}
+      
+      // we stream the hex events we wish to listen to
+      // and at the same time build the event index looku.
+      
+      
+      int eventIndex=0;
+      for (int progCounter=0;; SKIPOP) {
+        byte opcode=GET_OPCODE;
+        if (opcode==OPCODE_ENDEXRAIL) break;
+        if (opcode==OPCODE_ONLCC) {
+           onLCCLookup[eventIndex]=progCounter; // TODO skip...
+           StringFormatter::send(stream,F("<LL %d x%h%h%h:%h>\n"),
+                 eventIndex,
+                 getOperand(progCounter,1),
+                 getOperand(progCounter,2),
+                 getOperand(progCounter,3),
+                 getOperand(progCounter,0)
+                 );   
+           eventIndex++;      
+        }
+      }
+      StringFormatter::send(stream,F("<LR>\n")); // Ready to rumble
+      opcode=0;
+      break;
+    }
+    if (paramCount==1) {  // <L eventid> LCC event arrived from adapter
+        int16_t eventid=p[0];
+        reject=eventid<0 || eventid>=countLCCLookup;
+        if (!reject)  startNonRecursiveTask(F("LCC"),eventid,onLCCLookup[eventid]);
+        opcode=0;
+    }
+    break; 
+    
+    case 'J':  // throttle info commands
+        if (paramCount<1) return; 
+        switch(p[0]) {
+          case HASH_KEYWORD_A: // <JA> returns automations/routes
+            if (paramCount==1) {// <JA>
+              StringFormatter::send(stream, F("<jA"));
+              routeLookup->stream(stream);
+              StringFormatter::send(stream, F(">\n"));
+              opcode=0;
+              return; 
+            }
+            if (paramCount==2) {  // <JA id>
+              uint16_t id=p[1]; 
+              StringFormatter::send(stream,F("<jA %d %c \"%S\">\n"), 
+                id, getRouteType(id), getRouteDescription(id));
+              
+              if (compileFeatures & FEATURE_ROUTESTATE) {
+                // Send any non-default button states or captions
+                int16_t statePos=routeLookup->findPosition(id);
+                if (statePos>=0) {
+                 if (routeStateArray[statePos]) 
+                 StringFormatter::send(stream,F("<jB %d %d>\n"), id, routeStateArray[statePos]);
+                  if (routeCaptionArray[statePos]) 
+                  StringFormatter::send(stream,F("<jB %d \"%S\">\n"), id,routeCaptionArray[statePos]);
+                }
+              }
+              opcode=0;
+              return;
+            }
+            break;  
+        default:
+            break;
+        }
+  default:  // other commands pass through
+    break;
+  }
+}
+
+bool RMFT2::parseSlash(Print * stream, byte & paramCount, int16_t p[]) {
+
+  if (paramCount==0) { // STATUS
+    StringFormatter::send(stream, F("<* EXRAIL STATUS"));
+    RMFT2 * task=loopTask;
+    while(task) {
+      StringFormatter::send(stream,F("\nID=%d,PC=%d,LOCO=%d%c,SPEED=%d%c"),
+			    (int)(task->taskId),task->progCounter,task->loco,
+			    task->invert?'I':' ',
+			    task->speedo,
+			    task->forward?'F':'R'
+			    );
+      task=task->next;
+      if (task==loopTask) break;
+    }
+    // Now stream the flags
+    for (int id=0;id<MAX_FLAGS; id++) {
+      byte flag=flags[id];
+      if (flag & ~TASK_FLAG & ~SIGNAL_MASK) { // not interested in TASK_FLAG only. Already shown above
+	      StringFormatter::send(stream,F("\nflags[%d] "),id);
+	      if (flag & SECTION_FLAG) StringFormatter::send(stream,F(" RESERVED"));
+	      if (flag & LATCH_FLAG) StringFormatter::send(stream,F(" LATCHED"));
+      }
+    }
+
+    if (compileFeatures & FEATURE_SIGNAL) {
+      // do the signals
+      // flags[n] represents the state of the nth signal in the table 
+      for (int sigslot=0;;sigslot++) {
+        VPIN sigid=GETHIGHFLASHW(RMFT2::SignalDefinitions,sigslot*8);
+        if (sigid==0) break; // end of signal list 
+        byte flag=flags[sigslot] & SIGNAL_MASK; // obtain signal flags for this id
+        StringFormatter::send(stream,F("\n%S[%d]"), 
+          (flag == SIGNAL_RED)? F("RED") : (flag==SIGNAL_GREEN) ? F("GREEN") : F("AMBER"),
+          sigid & SIGNAL_ID_MASK); 
+      } 
+    }
+    StringFormatter::send(stream,F(" *>\n"));
+    return true;
+  }
+  switch (p[0]) {
+  case HASH_KEYWORD_PAUSE: // </ PAUSE>
+    if (paramCount!=1) return false;
+    DCC::setThrottle(0,1,true);  // pause all locos on the track
+    pausingTask=(RMFT2 *)1; // Impossible task address
+    return true;
+    
+  case HASH_KEYWORD_RESUME: // </ RESUME>
+    if (paramCount!=1) return false;
+    pausingTask=NULL;
+    {
+      RMFT2 * task=loopTask;
+      while(task) {
+	if (task->loco) task->driveLoco(task->speedo);
+	task=task->next;
+	if (task==loopTask) break;
+      }
+    }
+    return true;
+    
+    
+  case HASH_KEYWORD_START: // </ START [cab] route >
+    if (paramCount<2 || paramCount>3) return false;
+    {
+      int route=(paramCount==2) ? p[1] : p[2];
+      uint16_t cab=(paramCount==2)? 0 : p[1];
+      int pc=routeLookup->find(route);
+      if (pc<0) return false;
+      RMFT2* task=new RMFT2(pc);
+      task->loco=cab;
+    }
+    return true;
+    
+  default:
+    break;
+  }
+
+  // check KILL ALL here, otherwise the next validation confuses ALL with a flag  
+  if (p[0]==HASH_KEYWORD_KILL && p[1]==HASH_KEYWORD_ALL) {
+    while (loopTask) loopTask->kill(F("KILL ALL")); // destructor changes loopTask
+    return true;   
+  }
+
+  // all other / commands take 1 parameter
+  if (paramCount!=2 ) return false;
+  
+  switch (p[0]) {
+  case HASH_KEYWORD_KILL: // Kill taskid|ALL
+    {
+    if ( p[1]<0  || p[1]>=MAX_FLAGS) return false;
+    RMFT2 * task=loopTask;
+      while(task) {
+	      if (task->taskId==p[1]) {
+	        task->kill(F("KILL"));
+	        return  true;
+	      }
+	      task=task->next;
+	      if (task==loopTask) break;
+      }
+    }
+    return false;
+    
+  case HASH_KEYWORD_RESERVE:  // force reserve a section
+    return setFlag(p[1],SECTION_FLAG);
+    
+  case HASH_KEYWORD_FREE:  // force free a section
+    return setFlag(p[1],0,SECTION_FLAG);
+    
+  case HASH_KEYWORD_LATCH:
+    return setFlag(p[1], LATCH_FLAG);
+    
+  case HASH_KEYWORD_UNLATCH:
+    return setFlag(p[1], 0, LATCH_FLAG);
+ 
+  case HASH_KEYWORD_RED:
+    doSignal(p[1],SIGNAL_RED);
+    return true;
+ 
+  case HASH_KEYWORD_AMBER:
+    doSignal(p[1],SIGNAL_AMBER);
+    return true;
+ 
+  case HASH_KEYWORD_GREEN:
+    doSignal(p[1],SIGNAL_GREEN);
+    return true;
+    
+  default:
+    return false;
+  }
+}
+

EXRAILMacros.h

@@ -102,6 +102,14 @@ void exrailHalSetup() {
 #define LCCX(senderid,eventid) | FEATURE_LCC 
 #undef ONLCC
 #define ONLCC(senderid,eventid) | FEATURE_LCC
+#undef ROUTE_ACTIVE
+#define ROUTE_ACTIVE(id) | FEATURE_ROUTESTATE
+#undef ROUTE_INACTIVE
+#define ROUTE_INACTIVE(id) | FEATURE_ROUTESTATE
+#undef ROUTE_HIDDEN
+#define ROUTE_HIDDEN(id) | FEATURE_ROUTESTATE
+#undef ROUTE_CAPTION
+#define ROUTE_CAPTION(id,caption) | FEATURE_ROUTESTATE
 
 const byte RMFT2::compileFeatures = 0
    #include "myAutomation.h"
@@ -153,6 +161,12 @@ const int StringMacroTracker1=__COUNTER__;
 #define PRINT(msg) THRUNGE(msg,thrunge_print)
 #undef LCN
 #define LCN(msg)   THRUNGE(msg,thrunge_lcn)
+#undef ROUTE_CAPTION
+#define ROUTE_CAPTION(id,caption) \
+case (__COUNTER__ - StringMacroTracker1) : {\
+   manageRouteCaption(id,F(caption));\
+   return;\
+   }
 #undef SERIAL
 #define SERIAL(msg)   THRUNGE(msg,thrunge_serial)
 #undef SERIAL1
@@ -204,6 +218,8 @@ void  RMFT2::printMessage(uint16_t id) {
 #include "EXRAIL2MacroReset.h"
 #undef TURNOUT
 #define TURNOUT(id,addr,subaddr,description...) O_DESC(id,description)
+#undef TURNOUTL
+#define TURNOUTL(id,addr,description...) O_DESC(id,description)
 #undef PIN_TURNOUT
 #define PIN_TURNOUT(id,pin,description...) O_DESC(id,description)
 #undef SERVO_TURNOUT
@@ -438,6 +454,10 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
 #define ROTATE_DCC(id,position) OPCODE_ROTATE,V(id),OPCODE_PAD,V(position),OPCODE_PAD,V(0),
 #endif
 #define ROUTE(id, description)  OPCODE_ROUTE, V(id), 
+#define ROUTE_ACTIVE(id)  OPCODE_ROUTE_ACTIVE,V(id),
+#define ROUTE_INACTIVE(id)  OPCODE_ROUTE_INACTIVE,V(id),
+#define ROUTE_HIDDEN(id)  OPCODE_ROUTE_HIDDEN,V(id),
+#define ROUTE_CAPTION(id,caption) PRINT(caption)
 #define SENDLOCO(cab,route) OPCODE_SENDLOCO,V(cab),OPCODE_PAD,V(route),
 #define SEQUENCE(id)  OPCODE_SEQUENCE, V(id), 
 #define SERIAL(msg) PRINT(msg)

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202310230944Z"
+#define GITHUB_SHA "devel-202311160737Z"

GigaHardwareTimer.h

@@ -1,220 +0,0 @@
-/****************************************************************************************************************************
-  HardwareTimer.h
-
-  For Portenta_H7 boards
-  Written by Khoi Hoang
-
-  Built by Khoi Hoang https://github.com/khoih-prog/Portenta_H7_TimerInterrupt
-  Licensed under MIT license
-
-  Now even you use all these new 16 ISR-based timers,with their maximum interval practically unlimited (limited only by
-  unsigned long miliseconds), you just consume only one Portenta_H7 STM32 timer and avoid conflicting with other cores' tasks.
-  The accuracy is nearly perfect compared to software timers. The most important feature is they're ISR-based timers
-  Therefore, their executions are not blocked by bad-behaving functions / tasks.
-  This important feature is absolutely necessary for mission-critical tasks.
-
-  Version: 1.4.0
-
-  Version Modified By   Date      Comments
-  ------- -----------  ---------- -----------
-  1.2.1   K.Hoang      15/09/2021 Initial coding for Portenta_H7
-  1.3.0   K.Hoang      17/09/2021 Add PWM features and examples
-  1.3.1   K.Hoang      21/09/2021 Fix warnings in PWM examples
-  1.4.0   K.Hoang      22/01/2022 Fix `multiple-definitions` linker error. Fix bug
- *****************************************************************************************************************************/
-
-// Modified from stm32 core v2.0.0
-
-/*
-  Copyright (c) 2017 Daniel Fekete
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-
-  Copyright (c) 2019 STMicroelectronics
-  Modified to support Arduino_Core_STM32
-*/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef GIGAHARDWARETIMER_H_
-#define GIGAHARDWARETIMER_H_
-#if defined(ARDUINO_GIGA)
-/* Includes ------------------------------------------------------------------*/
-#include "Gigatimer.h"
-
-#if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
-
-#define  TIMER_CHANNELS 4    // channel5 and channel 6 are not considered here has they don't have gpio output and they don't have interrupt
-
-typedef enum
-{
-  TIMER_DISABLED,                         // == TIM_OCMODE_TIMING           no output, useful for only-interrupt
-  // Output Compare
-  TIMER_OUTPUT_COMPARE,                   // == Obsolete, use TIMER_DISABLED instead. Kept for compatibility reason
-  TIMER_OUTPUT_COMPARE_ACTIVE,            // == TIM_OCMODE_ACTIVE           pin is set high when counter == channel compare
-  TIMER_OUTPUT_COMPARE_INACTIVE,          // == TIM_OCMODE_INACTIVE         pin is set low when counter == channel compare
-  TIMER_OUTPUT_COMPARE_TOGGLE,            // == TIM_OCMODE_TOGGLE           pin toggles when counter == channel compare
-  TIMER_OUTPUT_COMPARE_PWM1,              // == TIM_OCMODE_PWM1             pin high when counter < channel compare, low otherwise
-  TIMER_OUTPUT_COMPARE_PWM2,              // == TIM_OCMODE_PWM2             pin low when counter < channel compare, high otherwise
-  TIMER_OUTPUT_COMPARE_FORCED_ACTIVE,     // == TIM_OCMODE_FORCED_ACTIVE    pin always high
-  TIMER_OUTPUT_COMPARE_FORCED_INACTIVE,   // == TIM_OCMODE_FORCED_INACTIVE  pin always low
-
-  //Input capture
-  TIMER_INPUT_CAPTURE_RISING,             // == TIM_INPUTCHANNELPOLARITY_RISING
-  TIMER_INPUT_CAPTURE_FALLING,            // == TIM_INPUTCHANNELPOLARITY_FALLING
-  TIMER_INPUT_CAPTURE_BOTHEDGE,           // == TIM_INPUTCHANNELPOLARITY_BOTHEDGE
-
-  // Used 2 channels for a single pin. One channel in TIM_INPUTCHANNELPOLARITY_RISING another channel in TIM_INPUTCHANNELPOLARITY_FALLING.
-  // Channels must be used by pair: CH1 with CH2, or CH3 with CH4
-  // This mode is very useful for Frequency and Dutycycle measurement
-  TIMER_INPUT_FREQ_DUTY_MEASUREMENT,
-
-  TIMER_NOT_USED = 0xFFFF  // This must be the last item of this enum
-} TimerModes_t;
-
-typedef enum
-{
-  TICK_FORMAT, // default
-  MICROSEC_FORMAT,
-  HERTZ_FORMAT,
-} TimerFormat_t;
-
-typedef enum
-{
-  RESOLUTION_1B_COMPARE_FORMAT = 1,  // used for Dutycycle: [0 .. 1]
-  RESOLUTION_2B_COMPARE_FORMAT,      // used for Dutycycle: [0 .. 3]
-  RESOLUTION_3B_COMPARE_FORMAT,      // used for Dutycycle: [0 .. 7]
-  RESOLUTION_4B_COMPARE_FORMAT,      // used for Dutycycle: [0 .. 15]
-  RESOLUTION_5B_COMPARE_FORMAT,      // used for Dutycycle: [0 .. 31]
-  RESOLUTION_6B_COMPARE_FORMAT,      // used for Dutycycle: [0 .. 63]
-  RESOLUTION_7B_COMPARE_FORMAT,      // used for Dutycycle: [0 .. 127]
-  RESOLUTION_8B_COMPARE_FORMAT,      // used for Dutycycle: [0 .. 255]
-  RESOLUTION_9B_COMPARE_FORMAT,      // used for Dutycycle: [0 .. 511]
-  RESOLUTION_10B_COMPARE_FORMAT,     // used for Dutycycle: [0 .. 1023]
-  RESOLUTION_11B_COMPARE_FORMAT,     // used for Dutycycle: [0 .. 2047]
-  RESOLUTION_12B_COMPARE_FORMAT,     // used for Dutycycle: [0 .. 4095]
-  RESOLUTION_13B_COMPARE_FORMAT,     // used for Dutycycle: [0 .. 8191]
-  RESOLUTION_14B_COMPARE_FORMAT,     // used for Dutycycle: [0 .. 16383]
-  RESOLUTION_15B_COMPARE_FORMAT,     // used for Dutycycle: [0 .. 32767]
-  RESOLUTION_16B_COMPARE_FORMAT,     // used for Dutycycle: [0 .. 65535]
-
-  TICK_COMPARE_FORMAT = 0x80, // default
-  MICROSEC_COMPARE_FORMAT,
-  HERTZ_COMPARE_FORMAT,
-  PERCENT_COMPARE_FORMAT, // used for Dutycycle
-} TimerCompareFormat_t;
-
-#ifdef __cplusplus
-
-#include <functional>
-using callback_function_t = std::function<void(void)>;
-
-/* Class --------------------------------------------------------*/
-class HardwareTimer
-{
-  public:
-    HardwareTimer(TIM_TypeDef *instance);
-    ~HardwareTimer();  // destructor
-
-    void pause(void);  // Pause counter and all output channels
-    void pauseChannel(uint32_t channel); // Timer is still running but channel (output and interrupt) is disabled
-    void resume(void); // Resume counter and all output channels
-    void resumeChannel(uint32_t channel); // Resume only one channel
-
-    void setPrescaleFactor(uint32_t prescaler); // set prescaler register (which is factor value - 1)
-    uint32_t getPrescaleFactor();
-
-    void setOverflow(uint32_t val, TimerFormat_t format =
-                       TICK_FORMAT); // set AutoReload register depending on format provided
-    uint32_t getOverflow(TimerFormat_t format = TICK_FORMAT); // return overflow depending on format provided
-
-    void setPWM(uint32_t channel, PinName pin, uint32_t frequency, uint32_t dutycycle,
-                callback_function_t PeriodCallback = nullptr,
-                callback_function_t CompareCallback = nullptr); // Set all in one command freq in HZ, Duty in percentage. Including both interrup.
-    void setPWM(uint32_t channel, uint32_t pin, uint32_t frequency, uint32_t dutycycle,
-                callback_function_t PeriodCallback = nullptr, callback_function_t CompareCallback = nullptr);
-
-    void setCount(uint32_t val, TimerFormat_t format =
-                    TICK_FORMAT); // set timer counter to value 'val' depending on format provided
-    uint32_t getCount(TimerFormat_t format =
-                        TICK_FORMAT);  // return current counter value of timer depending on format provided
-
-    void setMode(uint32_t channel, TimerModes_t mode,
-                 PinName pin = NC); // Configure timer channel with specified mode on specified pin if available
-    void setMode(uint32_t channel, TimerModes_t mode, uint32_t pin);
-
-    TimerModes_t getMode(uint32_t channel);  // Retrieve configured mode
-
-    void setPreloadEnable(bool value); // Configure overflow preload enable setting
-
-    uint32_t getCaptureCompare(uint32_t channel,
-                               TimerCompareFormat_t format = TICK_COMPARE_FORMAT); // return Capture/Compare register value of specified channel depending on format provided
-    void setCaptureCompare(uint32_t channel, uint32_t compare,
-                           TimerCompareFormat_t format = TICK_COMPARE_FORMAT);  // set Compare register value of specified channel depending on format provided
-
-    void setInterruptPriority(uint32_t preemptPriority, uint32_t subPriority); // set interrupt priority
-
-    //Add interrupt to period update
-    void attachInterrupt(callback_function_t
-                         callback); // Attach interrupt callback which will be called upon update event (timer rollover)
-    void detachInterrupt();  // remove interrupt callback which was attached to update event
-    bool hasInterrupt();  //returns true if a timer rollover interrupt has already been set
-    //Add interrupt to capture/compare channel
-    void attachInterrupt(uint32_t channel,
-                         callback_function_t callback); // Attach interrupt callback which will be called upon compare match event of specified channel
-    void detachInterrupt(uint32_t
-                         channel);  // remove interrupt callback which was attached to compare match event of specified channel
-    bool hasInterrupt(uint32_t channel);  //returns true if an interrupt has already been set on the channel compare match
-    void timerHandleDeinit();  // Timer deinitialization
-
-    // Refresh() is usefull while timer is running after some registers update
-    void refresh(
-      void); // Generate update event to force all registers (Autoreload, prescaler, compare) to be taken into account
-
-    uint32_t getTimerClkFreq();  // return timer clock frequency in Hz.
-
-    static void captureCompareCallback(TIM_HandleTypeDef
-                                       *htim); // Generic Caputre and Compare callback which will call user callback
-    static void updateCallback(TIM_HandleTypeDef
-                               *htim);  // Generic Update (rollover) callback which will call user callback
-
-    // The following function(s) are available for more advanced timer options
-    TIM_HandleTypeDef *getHandle();  // return the handle address for HAL related configuration
-    int getChannel(uint32_t channel);
-    int getLLChannel(uint32_t channel);
-    int getIT(uint32_t channel);
-    int getAssociatedChannel(uint32_t channel);
-#if defined(TIM_CCER_CC1NE)
-    bool isComplementaryChannel[TIMER_CHANNELS];
-#endif
-  private:
-    TimerModes_t  _ChannelMode[TIMER_CHANNELS];
-    timerObj_t _timerObj;
-    callback_function_t callbacks[1 +
-                                    TIMER_CHANNELS]; //Callbacks: 0 for update, 1-4 for channels. (channel5/channel6, if any, doesn't have interrupt)
-};
-
-extern timerObj_t *HardwareTimer_Handle[TIMER_NUM];
-
-extern timer_index_t get_timer_index(TIM_TypeDef *htim);
-
-#endif /* __cplusplus */
-
-#endif  // HAL_TIM_MODULE_ENABLED && !HAL_TIM_MODULE_ONLY
-#endif
-#endif  // GIGAHARDWARETIMER_H_

Gigatimer.c

@@ -1,950 +0,0 @@
-/****************************************************************************************************************************
-  timer.c
-
-  For Portenta_H7 boards
-  Written by Khoi Hoang
-
-  Built by Khoi Hoang https://github.com/khoih-prog/Portenta_H7_TimerInterrupt
-  Licensed under MIT license
-
-  Now even you use all these new 16 ISR-based timers,with their maximum interval practically unlimited (limited only by
-  unsigned long miliseconds), you just consume only one Portenta_H7 STM32 timer and avoid conflicting with other cores' tasks.
-  The accuracy is nearly perfect compared to software timers. The most important feature is they're ISR-based timers
-  Therefore, their executions are not blocked by bad-behaving functions / tasks.
-  This important feature is absolutely necessary for mission-critical tasks.
-
-  Version: 1.4.0
-
-  Version Modified By   Date      Comments
-  ------- -----------  ---------- -----------
-  1.2.1   K.Hoang      15/09/2021 Initial coding for Portenta_H7
-  1.3.0   K.Hoang      17/09/2021 Add PWM features and examples
-  1.3.1   K.Hoang      21/09/2021 Fix warnings in PWM examples
-  1.4.0   K.Hoang      22/01/2022 Fix `multiple-definitions` linker error. Fix bug
- *****************************************************************************************************************************/
-
-// Modified from stm32 core v2.0.0
-/*
- *******************************************************************************
-   Copyright (c) 2019, STMicroelectronics
-   All rights reserved.
-
-   This software component is licensed by ST under BSD 3-Clause license,
-   the "License"; You may not use this file except in compliance with the
-   License. You may obtain a copy of the License at:
-                          opensource.org/licenses/BSD-3-Clause
-
- *******************************************************************************
-*/
-#if defined(ARDUINO_GIGA)
-#include "Gigatimer.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
-
-/* Private Functions */
-/* Aim of the function is to get _timerObj pointer using htim pointer */
-/* Highly inspired from magical linux kernel's "container_of" */
-/* (which was not directly used since not compatible with IAR toolchain) */
-timerObj_t *get_timer_obj(TIM_HandleTypeDef *htim)
-{
-  timerObj_t *obj;
-  obj = (timerObj_t *)((char *)htim - offsetof(timerObj_t, handle));
-  return (obj);
-}
-
-/**
-    @brief  TIMER Initialization - clock init and nvic init
-    @param  htim_base: TIM handle
-    @retval None
-*/
-void HAL_TIM_Base_MspInit(TIM_HandleTypeDef *htim_base)
-{
-  timerObj_t *obj = get_timer_obj(htim_base);
-  enableTimerClock(htim_base);
-
-  // configure Update interrupt
-  HAL_NVIC_SetPriority(getTimerUpIrq(htim_base->Instance), obj->preemptPriority, obj->subPriority);
-  HAL_NVIC_EnableIRQ(getTimerUpIrq(htim_base->Instance));
-
-  if (getTimerCCIrq(htim_base->Instance) != getTimerUpIrq(htim_base->Instance))
-  {
-    // configure Capture Compare interrupt
-    HAL_NVIC_SetPriority(getTimerCCIrq(htim_base->Instance), obj->preemptPriority, obj->subPriority);
-    HAL_NVIC_EnableIRQ(getTimerCCIrq(htim_base->Instance));
-  }
-}
-
-/**
-    @brief  TIMER Deinitialization - clock and nvic
-    @param  htim_base: TIM handle
-    @retval None
-*/
-void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef *htim_base)
-{
-  disableTimerClock(htim_base);
-  HAL_NVIC_DisableIRQ(getTimerUpIrq(htim_base->Instance));
-  HAL_NVIC_DisableIRQ(getTimerCCIrq(htim_base->Instance));
-}
-
-/**
-    @brief  Initializes the TIM Output Compare MSP.
-    @param  htim: TIM handle
-    @retval None
-*/
-void HAL_TIM_OC_MspInit(TIM_HandleTypeDef *htim)
-{
-  timerObj_t *obj = get_timer_obj(htim);
-  enableTimerClock(htim);
-
-  // configure Update interrupt
-  HAL_NVIC_SetPriority(getTimerUpIrq(htim->Instance), obj->preemptPriority, obj->subPriority);
-  HAL_NVIC_EnableIRQ(getTimerUpIrq(htim->Instance));
-
-  if (getTimerCCIrq(htim->Instance) != getTimerUpIrq(htim->Instance))
-  {
-    // configure Capture Compare interrupt
-    HAL_NVIC_SetPriority(getTimerCCIrq(htim->Instance), obj->preemptPriority, obj->subPriority);
-    HAL_NVIC_EnableIRQ(getTimerCCIrq(htim->Instance));
-  }
-}
-
-/**
-    @brief  DeInitialize TIM Output Compare MSP.
-    @param  htim: TIM handle
-    @retval None
-*/
-void HAL_TIM_OC_MspDeInit(TIM_HandleTypeDef *htim)
-{
-  disableTimerClock(htim);
-  HAL_NVIC_DisableIRQ(getTimerUpIrq(htim->Instance));
-  HAL_NVIC_DisableIRQ(getTimerCCIrq(htim->Instance));
-}
-
-/**
-    @brief  Initializes the TIM Input Capture MSP.
-    @param  htim: TIM handle
-    @retval None
-*/
-void HAL_TIM_IC_MspInit(TIM_HandleTypeDef *htim)
-{
-  enableTimerClock(htim);
-}
-
-/**
-    @brief  DeInitialize TIM Input Capture MSP.
-    @param  htim: TIM handle
-    @retval None
-*/
-void HAL_TIM_IC_MspDeInit(TIM_HandleTypeDef *htim)
-{
-  disableTimerClock(htim);
-}
-
-/* Exported functions */
-/**
-    @brief  Enable the timer clock
-    @param  htim: TIM handle
-    @retval None
-*/
-void enableTimerClock(TIM_HandleTypeDef *htim)
-{
-  // Enable TIM clock
-#if defined(TIM1_BASE)
-  if (htim->Instance == TIM1)
-  {
-    __HAL_RCC_TIM1_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM2_BASE)
-
-  if (htim->Instance == TIM2)
-  {
-    __HAL_RCC_TIM2_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM3_BASE)
-
-  if (htim->Instance == TIM3)
-  {
-    __HAL_RCC_TIM3_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM4_BASE)
-
-  if (htim->Instance == TIM4)
-  {
-    __HAL_RCC_TIM4_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM5_BASE)
-
-  if (htim->Instance == TIM5)
-  {
-    __HAL_RCC_TIM5_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM6_BASE)
-
-  if (htim->Instance == TIM6)
-  {
-    __HAL_RCC_TIM6_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM7_BASE)
-
-  if (htim->Instance == TIM7)
-  {
-    __HAL_RCC_TIM7_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM8_BASE)
-
-  if (htim->Instance == TIM8)
-  {
-    __HAL_RCC_TIM8_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM9_BASE)
-
-  if (htim->Instance == TIM9)
-  {
-    __HAL_RCC_TIM9_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM10_BASE)
-
-  if (htim->Instance == TIM10)
-  {
-    __HAL_RCC_TIM10_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM11_BASE)
-
-  if (htim->Instance == TIM11)
-  {
-    __HAL_RCC_TIM11_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM12_BASE)
-
-  if (htim->Instance == TIM12)
-  {
-    __HAL_RCC_TIM12_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM13_BASE)
-
-  if (htim->Instance == TIM13)
-  {
-    __HAL_RCC_TIM13_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM14_BASE)
-
-  if (htim->Instance == TIM14)
-  {
-    __HAL_RCC_TIM14_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM15_BASE)
-
-  if (htim->Instance == TIM15)
-  {
-    __HAL_RCC_TIM15_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM16_BASE)
-
-  if (htim->Instance == TIM16)
-  {
-    __HAL_RCC_TIM16_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM17_BASE)
-
-  if (htim->Instance == TIM17)
-  {
-    __HAL_RCC_TIM17_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM18_BASE)
-
-  if (htim->Instance == TIM18)
-  {
-    __HAL_RCC_TIM18_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM19_BASE)
-
-  if (htim->Instance == TIM19)
-  {
-    __HAL_RCC_TIM19_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM20_BASE)
-
-  if (htim->Instance == TIM20)
-  {
-    __HAL_RCC_TIM20_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM21_BASE)
-
-  if (htim->Instance == TIM21)
-  {
-    __HAL_RCC_TIM21_CLK_ENABLE();
-  }
-
-#endif
-#if defined(TIM22_BASE)
-
-  if (htim->Instance == TIM22)
-  {
-    __HAL_RCC_TIM22_CLK_ENABLE();
-  }
-
-#endif
-}
-
-/**
-    @brief  Disable the timer clock
-    @param  htim: TIM handle
-    @retval None
-*/
-void disableTimerClock(TIM_HandleTypeDef *htim)
-{
-  // Enable TIM clock
-#if defined(TIM1_BASE)
-  if (htim->Instance == TIM1)
-  {
-    __HAL_RCC_TIM1_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM2_BASE)
-
-  if (htim->Instance == TIM2)
-  {
-    __HAL_RCC_TIM2_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM3_BASE)
-
-  if (htim->Instance == TIM3)
-  {
-    __HAL_RCC_TIM3_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM4_BASE)
-
-  if (htim->Instance == TIM4)
-  {
-    __HAL_RCC_TIM4_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM5_BASE)
-
-  if (htim->Instance == TIM5)
-  {
-    __HAL_RCC_TIM5_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM6_BASE)
-
-  if (htim->Instance == TIM6)
-  {
-    __HAL_RCC_TIM6_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM7_BASE)
-
-  if (htim->Instance == TIM7)
-  {
-    __HAL_RCC_TIM7_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM8_BASE)
-
-  if (htim->Instance == TIM8)
-  {
-    __HAL_RCC_TIM8_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM9_BASE)
-
-  if (htim->Instance == TIM9)
-  {
-    __HAL_RCC_TIM9_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM10_BASE)
-
-  if (htim->Instance == TIM10)
-  {
-    __HAL_RCC_TIM10_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM11_BASE)
-
-  if (htim->Instance == TIM11)
-  {
-    __HAL_RCC_TIM11_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM12_BASE)
-
-  if (htim->Instance == TIM12)
-  {
-    __HAL_RCC_TIM12_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM13_BASE)
-
-  if (htim->Instance == TIM13)
-  {
-    __HAL_RCC_TIM13_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM14_BASE)
-
-  if (htim->Instance == TIM14)
-  {
-    __HAL_RCC_TIM14_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM15_BASE)
-
-  if (htim->Instance == TIM15)
-  {
-    __HAL_RCC_TIM15_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM16_BASE)
-
-  if (htim->Instance == TIM16)
-  {
-    __HAL_RCC_TIM16_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM17_BASE)
-
-  if (htim->Instance == TIM17)
-  {
-    __HAL_RCC_TIM17_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM18_BASE)
-
-  if (htim->Instance == TIM18)
-  {
-    __HAL_RCC_TIM18_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM19_BASE)
-
-  if (htim->Instance == TIM19)
-  {
-    __HAL_RCC_TIM19_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM20_BASE)
-
-  if (htim->Instance == TIM20)
-  {
-    __HAL_RCC_TIM20_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM21_BASE)
-
-  if (htim->Instance == TIM21)
-  {
-    __HAL_RCC_TIM21_CLK_DISABLE();
-  }
-
-#endif
-#if defined(TIM22_BASE)
-
-  if (htim->Instance == TIM22)
-  {
-    __HAL_RCC_TIM22_CLK_DISABLE();
-  }
-
-#endif
-}
-
-/**
-    @brief  This function return IRQ number corresponding to update interrupt event of timer instance.
-    @param  tim: timer instance
-    @retval IRQ number
-*/
-IRQn_Type getTimerUpIrq(TIM_TypeDef *tim)
-{
-  IRQn_Type IRQn = NonMaskableInt_IRQn;
-
-  if (tim != (TIM_TypeDef *)NC)
-  {
-    /* Get IRQn depending on TIM instance */
-    switch ((uint32_t)tim)
-    {
-#if defined(TIM1_BASE)
-
-      case (uint32_t)TIM1_BASE:
-        IRQn = TIM1_IRQn;
-        break;
-#endif
-#if defined(TIM2_BASE)
-
-      case (uint32_t)TIM2_BASE:
-        IRQn = TIM2_IRQn;
-        break;
-#endif
-#if defined(TIM3_BASE)
-
-      case (uint32_t)TIM3_BASE:
-        IRQn = TIM3_IRQn;
-        break;
-#endif
-#if defined(TIM4_BASE)
-
-      case (uint32_t)TIM4_BASE:
-        IRQn = TIM4_IRQn;
-        break;
-#endif
-#if defined(TIM5_BASE)
-
-      case (uint32_t)TIM5_BASE:
-        IRQn = TIM5_IRQn;
-        break;
-#endif
-
-        // KH
-#if 0
-#if defined(TIM6_BASE)
-
-      case (uint32_t)TIM6_BASE:
-        IRQn = TIM6_IRQn;
-        break;
-#endif
-#endif
-        //////
-
-#if defined(TIM7_BASE)
-
-      case (uint32_t)TIM7_BASE:
-        IRQn = TIM7_IRQn;
-        break;
-#endif
-#if defined(TIM8_BASE)
-
-      case (uint32_t)TIM8_BASE:
-        IRQn = TIM8_IRQn;
-        break;
-#endif
-#if defined(TIM9_BASE)
-
-      case (uint32_t)TIM9_BASE:
-        IRQn = TIM9_IRQn;
-        break;
-#endif
-#if defined(TIM10_BASE)
-
-      case (uint32_t)TIM10_BASE:
-        IRQn = TIM10_IRQn;
-        break;
-#endif
-#if defined(TIM11_BASE)
-
-      case (uint32_t)TIM11_BASE:
-        IRQn = TIM11_IRQn;
-        break;
-#endif
-#if defined(TIM12_BASE)
-
-      case (uint32_t)TIM12_BASE:
-        IRQn = TIM12_IRQn;
-        break;
-#endif
-#if defined(TIM13_BASE)
-
-      case (uint32_t)TIM13_BASE:
-        IRQn = TIM13_IRQn;
-        break;
-#endif
-#if defined(TIM14_BASE)
-
-      case (uint32_t)TIM14_BASE:
-        IRQn = TIM14_IRQn;
-        break;
-#endif
-#if defined(TIM15_BASE)
-
-      case (uint32_t)TIM15_BASE:
-        IRQn = TIM15_IRQn;
-        break;
-#endif
-#if defined(TIM16_BASE)
-
-      case (uint32_t)TIM16_BASE:
-        IRQn = TIM16_IRQn;
-        break;
-#endif
-#if defined(TIM17_BASE)
-
-      case (uint32_t)TIM17_BASE:
-        IRQn = TIM17_IRQn;
-        break;
-#endif
-#if defined(TIM18_BASE)
-
-      case (uint32_t)TIM18_BASE:
-        IRQn = TIM18_IRQn;
-        break;
-#endif
-#if defined(TIM19_BASE)
-
-      case (uint32_t)TIM19_BASE:
-        IRQn = TIM19_IRQn;
-        break;
-#endif
-#if defined(TIM20_BASE)
-
-      case (uint32_t)TIM20_BASE:
-        IRQn = TIM20_IRQn;
-        break;
-#endif
-#if defined(TIM21_BASE)
-
-      case (uint32_t)TIM21_BASE:
-        IRQn = TIM21_IRQn;
-        break;
-#endif
-#if defined(TIM22_BASE)
-
-      case (uint32_t)TIM22_BASE:
-        IRQn = TIM22_IRQn;
-        break;
-#endif
-
-      default:
-        //_Error_Handler("TIM: Unknown timer IRQn", (int)tim);
-        break;
-    }
-  }
-
-  return IRQn;
-}
-
-/**
-    @brief  This function return IRQ number corresponding to Capture or Compare interrupt event of timer instance.
-    @param  tim: timer instance
-    @retval IRQ number
-*/
-IRQn_Type getTimerCCIrq(TIM_TypeDef *tim)
-{
-  IRQn_Type IRQn = NonMaskableInt_IRQn;
-
-  if (tim != (TIM_TypeDef *)NC)
-  {
-    /* Get IRQn depending on TIM instance */
-    switch ((uint32_t)tim)
-    {
-#if defined(TIM1_BASE)
-
-      case (uint32_t)TIM1_BASE:
-        IRQn = TIM1_CC_IRQn;
-        break;
-#endif
-#if defined(TIM2_BASE)
-
-      case (uint32_t)TIM2_BASE:
-        IRQn = TIM2_IRQn;
-        break;
-#endif
-#if defined(TIM3_BASE)
-
-      case (uint32_t)TIM3_BASE:
-        IRQn = TIM3_IRQn;
-        break;
-#endif
-#if defined(TIM4_BASE)
-
-      case (uint32_t)TIM4_BASE:
-        IRQn = TIM4_IRQn;
-        break;
-#endif
-#if defined(TIM5_BASE)
-
-      case (uint32_t)TIM5_BASE:
-        IRQn = TIM5_IRQn;
-        break;
-#endif
-
-#if 0
-        // KH
-#if defined(TIM6_BASE)
-
-      case (uint32_t)TIM6_BASE:
-        IRQn = TIM6_IRQn;
-        break;
-#endif
-#endif
-        //////
-
-#if defined(TIM7_BASE)
-
-      case (uint32_t)TIM7_BASE:
-        IRQn = TIM7_IRQn;
-        break;
-#endif
-#if defined(TIM8_BASE)
-
-      case (uint32_t)TIM8_BASE:
-        IRQn = TIM8_CC_IRQn;
-        break;
-#endif
-#if defined(TIM9_BASE)
-
-      case (uint32_t)TIM9_BASE:
-        IRQn = TIM9_IRQn;
-        break;
-#endif
-#if defined(TIM10_BASE)
-
-      case (uint32_t)TIM10_BASE:
-        IRQn = TIM10_IRQn;
-        break;
-#endif
-#if defined(TIM11_BASE)
-
-      case (uint32_t)TIM11_BASE:
-        IRQn = TIM11_IRQn;
-        break;
-#endif
-#if defined(TIM12_BASE)
-
-      case (uint32_t)TIM12_BASE:
-        IRQn = TIM12_IRQn;
-        break;
-#endif
-#if defined(TIM13_BASE)
-
-      case (uint32_t)TIM13_BASE:
-        IRQn = TIM13_IRQn;
-        break;
-#endif
-#if defined(TIM14_BASE)
-
-      case (uint32_t)TIM14_BASE:
-        IRQn = TIM14_IRQn;
-        break;
-#endif
-#if defined(TIM15_BASE)
-
-      case (uint32_t)TIM15_BASE:
-        IRQn = TIM15_IRQn;
-        break;
-#endif
-#if defined(TIM16_BASE)
-
-      case (uint32_t)TIM16_BASE:
-        IRQn = TIM16_IRQn;
-        break;
-#endif
-#if defined(TIM17_BASE)
-
-      case (uint32_t)TIM17_BASE:
-        IRQn = TIM17_IRQn;
-        break;
-#endif
-#if defined(TIM18_BASE)
-
-      case (uint32_t)TIM18_BASE:
-        IRQn = TIM18_IRQn;
-        break;
-#endif
-#if defined(TIM19_BASE)
-
-      case (uint32_t)TIM19_BASE:
-        IRQn = TIM19_IRQn;
-        break;
-#endif
-#if defined(TIM20_BASE)
-
-      case (uint32_t)TIM20_BASE:
-        IRQn = TIM20_CC_IRQn;
-        break;
-#endif
-#if defined(TIM21_BASE)
-
-      case (uint32_t)TIM21_BASE:
-        IRQn = TIM21_IRQn;
-        break;
-#endif
-#if defined(TIM22_BASE)
-
-      case (uint32_t)TIM22_BASE:
-        IRQn = TIM22_IRQn;
-        break;
-#endif
-        break;
-
-      default:
-        //_Error_Handler("TIM: Unknown timer IRQn", (int)tim);
-        break;
-    }
-  }
-
-  return IRQn;
-}
-
-/**
-    @brief  This function return the timer clock source.
-    @param  tim: timer instance
-    @retval 1 = PCLK1 or 2 = PCLK2
-*/
-uint8_t getTimerClkSrc(TIM_TypeDef *tim)
-{
-  uint8_t clkSrc = 0;
-
-  if (tim != (TIM_TypeDef *)NC)
-#if defined(STM32F0xx) || defined(STM32G0xx)
-    /* TIMx source CLK is PCKL1 */
-    clkSrc = 1;
-
-#else
-  {
-    /* Get source clock depending on TIM instance */
-    switch ((uint32_t)tim)
-    {
-#if defined(TIM2_BASE)
-
-      case (uint32_t)TIM2:
-#endif
-#if defined(TIM3_BASE)
-      case (uint32_t)TIM3:
-#endif
-#if defined(TIM4_BASE)
-      case (uint32_t)TIM4:
-#endif
-#if defined(TIM5_BASE)
-      case (uint32_t)TIM5:
-#endif
-#if defined(TIM6_BASE)
-      case (uint32_t)TIM6:
-#endif
-#if defined(TIM7_BASE)
-      case (uint32_t)TIM7:
-#endif
-#if defined(TIM12_BASE)
-      case (uint32_t)TIM12:
-#endif
-#if defined(TIM13_BASE)
-      case (uint32_t)TIM13:
-#endif
-#if defined(TIM14_BASE)
-      case (uint32_t)TIM14:
-#endif
-#if defined(TIM18_BASE)
-      case (uint32_t)TIM18:
-#endif
-        clkSrc = 1;
-        break;
-#if defined(TIM1_BASE)
-
-      case (uint32_t)TIM1:
-#endif
-#if defined(TIM8_BASE)
-      case (uint32_t)TIM8:
-#endif
-#if defined(TIM9_BASE)
-      case (uint32_t)TIM9:
-#endif
-#if defined(TIM10_BASE)
-      case (uint32_t)TIM10:
-#endif
-#if defined(TIM11_BASE)
-      case (uint32_t)TIM11:
-#endif
-#if defined(TIM15_BASE)
-      case (uint32_t)TIM15:
-#endif
-#if defined(TIM16_BASE)
-      case (uint32_t)TIM16:
-#endif
-#if defined(TIM17_BASE)
-      case (uint32_t)TIM17:
-#endif
-#if defined(TIM19_BASE)
-      case (uint32_t)TIM19:
-#endif
-#if defined(TIM20_BASE)
-      case (uint32_t)TIM20:
-#endif
-#if defined(TIM21_BASE)
-      case (uint32_t)TIM21:
-#endif
-#if defined(TIM22_BASE)
-      case (uint32_t)TIM22:
-#endif
-        clkSrc = 2;
-        break;
-
-      default:
-        ////_Error_Handler("TIM: Unknown timer instance", (int)tim);
-        break;
-    }
-  }
-#endif
-  return clkSrc;
-}
-
-
-#endif /* HAL_TIM_MODULE_ENABLED && !HAL_TIM_MODULE_ONLY */
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Gigatimer.h

@@ -1,198 +0,0 @@
-/****************************************************************************************************************************
-  timer.h
-
-  For Portenta_H7 boards
-  Written by Khoi Hoang
-
-  Built by Khoi Hoang https://github.com/khoih-prog/Portenta_H7_TimerInterrupt
-  Licensed under MIT license
-
-  Now even you use all these new 16 ISR-based timers,with their maximum interval practically unlimited (limited only by
-  unsigned long miliseconds), you just consume only one Portenta_H7 STM32 timer and avoid conflicting with other cores' tasks.
-  The accuracy is nearly perfect compared to software timers. The most important feature is they're ISR-based timers
-  Therefore, their executions are not blocked by bad-behaving functions / tasks.
-  This important feature is absolutely necessary for mission-critical tasks.
-
-  Version: 1.4.0
-
-  Version Modified By   Date      Comments
-  ------- -----------  ---------- -----------
-  1.2.1   K.Hoang      15/09/2021 Initial coding for Portenta_H7
-  1.3.0   K.Hoang      17/09/2021 Add PWM features and examples
-  1.3.1   K.Hoang      21/09/2021 Fix warnings in PWM examples
-  1.4.0   K.Hoang      22/01/2022 Fix `multiple-definitions` linker error. Fix bug
- *****************************************************************************************************************************/
-
-// Modified from stm32 core v2.0.0
-
-/*
- *******************************************************************************
-   Copyright (c) 2019, STMicroelectronics
-   All rights reserved.
-
-   This software component is licensed by ST under BSD 3-Clause license,
-   the "License"; You may not use this file except in compliance with the
-   License. You may obtain a copy of the License at:
-                          opensource.org/licenses/BSD-3-Clause
-
- *******************************************************************************
-*/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __GIGATIMER_H
-#define __GIGATIMER_H
-#if defined(ARDUINO_GIGA)
-/* Includes ------------------------------------------------------------------*/
-#include "PinNames.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
-
-/* Exported constants --------------------------------------------------------*/
-#ifndef TIM_IRQ_PRIO
-#if (__CORTEX_M == 0x00U)
-#define TIM_IRQ_PRIO       3
-#else
-#define TIM_IRQ_PRIO       14
-#endif /* __CORTEX_M */
-
-#endif /* TIM_IRQ_PRIO */
-
-#ifndef TIM_IRQ_SUBPRIO
-#define TIM_IRQ_SUBPRIO    0
-#endif
-
-#if defined(TIM1_BASE) && !defined(TIM1_IRQn)
-#define TIM1_IRQn TIM1_UP_IRQn
-#define TIM1_IRQHandler TIM1_UP_IRQHandler
-#endif
-
-#if defined(TIM8_BASE) && !defined(TIM8_IRQn)
-#define TIM8_IRQn TIM8_UP_TIM13_IRQn
-#define TIM8_IRQHandler TIM8_UP_TIM13_IRQHandler
-#endif
-
-#if defined(TIM12_BASE) && !defined(TIM12_IRQn)
-#define TIM12_IRQn TIM8_BRK_TIM12_IRQn
-#define TIM12_IRQHandler TIM8_BRK_TIM12_IRQHandler
-#endif
-
-#if defined(TIM13_BASE) && !defined(TIM13_IRQn)
-#define TIM13_IRQn TIM8_UP_TIM13_IRQn
-#endif
-
-#if defined(TIM14_BASE) && !defined(TIM14_IRQn)
-#define TIM14_IRQn TIM8_TRG_COM_TIM14_IRQn
-#define TIM14_IRQHandler TIM8_TRG_COM_TIM14_IRQHandler
-#endif
-
-
-typedef enum
-{
-#if defined(TIM1_BASE)
-  TIMER1_INDEX,
-#endif
-#if defined(TIM2_BASE)
-  TIMER2_INDEX,
-#endif
-#if defined(TIM3_BASE)
-  TIMER3_INDEX,
-#endif
-#if defined(TIM4_BASE)
-  TIMER4_INDEX,
-#endif
-#if defined(TIM5_BASE)
-  TIMER5_INDEX,
-#endif
-#if defined(TIM6_BASE)
-  TIMER6_INDEX,
-#endif
-#if defined(TIM7_BASE)
-  TIMER7_INDEX,
-#endif
-#if defined(TIM8_BASE)
-  TIMER8_INDEX,
-#endif
-#if defined(TIM9_BASE)
-  TIMER9_INDEX,
-#endif
-#if defined(TIM10_BASE)
-  TIMER10_INDEX,
-#endif
-#if defined(TIM11_BASE)
-  TIMER11_INDEX,
-#endif
-#if defined(TIM12_BASE)
-  TIMER12_INDEX,
-#endif
-#if defined(TIM13_BASE)
-  TIMER13_INDEX,
-#endif
-#if defined(TIM14_BASE)
-  TIMER14_INDEX,
-#endif
-#if defined(TIM15_BASE)
-  TIMER15_INDEX,
-#endif
-#if defined(TIM16_BASE)
-  TIMER16_INDEX,
-#endif
-#if defined(TIM17_BASE)
-  TIMER17_INDEX,
-#endif
-#if defined(TIM18_BASE)
-  TIMER18_INDEX,
-#endif
-#if defined(TIM19_BASE)
-  TIMER19_INDEX,
-#endif
-#if defined(TIM20_BASE)
-  TIMER20_INDEX,
-#endif
-#if defined(TIM21_BASE)
-  TIMER21_INDEX,
-#endif
-#if defined(TIM22_BASE)
-  TIMER22_INDEX,
-#endif
-
-  TIMER_NUM,
-  UNKNOWN_TIMER = 0XFFFF
-} timer_index_t;
-
-
-// This structure is used to be able to get HardwareTimer instance (C++ class)
-// from handler (C structure) specially for interrupt management
-typedef struct
-{
-  // Those 2 first fields must remain in this order at the beginning of the structure
-  void    *__this;
-  TIM_HandleTypeDef handle;
-  uint32_t preemptPriority;
-  uint32_t subPriority;
-} timerObj_t;
-
-/* Exported functions ------------------------------------------------------- */
-timerObj_t *get_timer_obj(TIM_HandleTypeDef *htim);
-
-void enableTimerClock(TIM_HandleTypeDef *htim);
-void disableTimerClock(TIM_HandleTypeDef *htim);
-
-uint32_t getTimerIrq(TIM_TypeDef *tim);
-uint8_t getTimerClkSrc(TIM_TypeDef *tim);
-
-IRQn_Type getTimerUpIrq(TIM_TypeDef *tim);
-IRQn_Type getTimerCCIrq(TIM_TypeDef *tim);
-
-#endif /* HAL_TIM_MODULE_ENABLED && !HAL_TIM_MODULE_ONLY */
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-#endif /* __GIGATIMER_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

I2CManager_Wire.h

@@ -35,10 +35,6 @@
 #define WIRE_HAS_TIMEOUT
 #endif
 
-
-
-
-
 /***************************************************************************
  *  Initialise I2C interface software
  ***************************************************************************/

MotorDriver.cpp

@@ -5,7 +5,6 @@
  *  © 2020-2023 Harald Barth
  *  © 2020-2021 Chris Harlow
  *  © 2023 Colin Murdoch
- *  © 2023 Travis Farmer
  *  All rights reserved.
  *  
  *  This file is part of CommandStation-EX
@@ -35,21 +34,12 @@ unsigned long MotorDriver::globalOverloadStart = 0;
 volatile portreg_t shadowPORTA;
 volatile portreg_t shadowPORTB;
 volatile portreg_t shadowPORTC;
-#if defined(ARDUINO_ARCH_STM32) || (defined(ARDUINO_GIGA) && defined(XGIGA))
+#if defined(ARDUINO_ARCH_STM32)
 volatile portreg_t shadowPORTD;
 volatile portreg_t shadowPORTE;
 volatile portreg_t shadowPORTF;
 #endif
 
-#if defined(ARDUINO_GIGA) && defined(XGIGA)
-#define STM_PORT(X) (((uint32_t)(X) >> 4) & 0xF)
-#define STM_PIN(X)  ((uint32_t)(X) & 0xF)
-#define STM_GPIO_PIN(X) ((uint16_t)(1<<STM_PIN(X)))
-#define digitalPinToBitMask(p)      (STM_GPIO_PIN(digitalPinToPinName(p)))
-#define portOutputRegister(P)       (&(P->ODR))
-#define portInputRegister(P)        (&(P->IDR))
-#endif
-
 MotorDriver::MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, int16_t brake_pin,
                          byte current_pin, float sense_factor, unsigned int trip_milliamps, int16_t fault_pin) {
   const FSH * warnString = F("** WARNING **");
@@ -67,7 +57,6 @@ MotorDriver::MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, i
   getFastPin(F("SIG"),signalPin,fastSignalPin);
   pinMode(signalPin, OUTPUT);
 
-  #if !defined(ARDUINO_GIGA) || (defined(ARDUINO_GIGA) && defined(XGIGA)) // no giga
   fastSignalPin.shadowinout = NULL;
   if (HAVE_PORTA(fastSignalPin.inout == &PORTA)) {
     DIAG(F("Found PORTA pin %d"),signalPin);
@@ -99,14 +88,13 @@ MotorDriver::MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, i
     fastSignalPin.shadowinout = fastSignalPin.inout;
     fastSignalPin.inout = &shadowPORTF;
   }
-  #endif // giga
+
   signalPin2=signal_pin2;
   if (signalPin2!=UNUSED_PIN) {
     dualSignal=true;
     getFastPin(F("SIG2"),signalPin2,fastSignalPin2);
     pinMode(signalPin2, OUTPUT);
 
-    #if !defined(ARDUINO_GIGA) || (defined(ARDUINO_GIGA) && defined(XGIGA)) // no giga
     fastSignalPin2.shadowinout = NULL;
     if (HAVE_PORTA(fastSignalPin2.inout == &PORTA)) {
       DIAG(F("Found PORTA pin %d"),signalPin2);
@@ -138,7 +126,6 @@ MotorDriver::MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, i
       fastSignalPin2.shadowinout = fastSignalPin2.inout;
       fastSignalPin2.inout = &shadowPORTF;
     }
-    #endif // giga
   }
   else dualSignal=false; 
   
@@ -514,24 +501,13 @@ unsigned int MotorDriver::mA2raw( unsigned int mA) {
   return (int32_t)mA * senseScale / senseFactorInternal;
 }
 
-
 void  MotorDriver::getFastPin(const FSH* type,int pin, bool input, FASTPIN & result) {
     // DIAG(F("MotorDriver %S Pin=%d,"),type,pin);
-#if defined(ARDUINO_GIGA) && !defined(XGIGA) // yes giga
-    (void)type;
-    (void)input; // no warnings please
-
-    result = pin;
-  
-#else // no giga
     (void) type; // avoid compiler warning if diag not used above.
 #if defined(ARDUINO_ARCH_SAMD)
     PortGroup *port = digitalPinToPort(pin);
 #elif defined(ARDUINO_ARCH_STM32)
     GPIO_TypeDef *port = digitalPinToPort(pin);
-#elif defined(ARDUINO_GIGA)
-    //auto * port = ((GPIO_TypeDef *)(GPIOA_BASE + (GPIOB_BASE - GPIOA_BASE) * (digitalPinToPinName(pin) >> 4)));
-    GPIO_TypeDef *port = (GPIO_TypeDef *)digitalPinToPort(pin);
 #else
     uint8_t port = digitalPinToPort(pin);
 #endif
@@ -541,7 +517,6 @@ void  MotorDriver::getFastPin(const FSH* type,int pin, bool input, FASTPIN & res
       result.inout = portOutputRegister(port);
     result.maskHIGH = digitalPinToBitMask(pin);
     result.maskLOW = ~result.maskHIGH;
-#endif // giga
     // DIAG(F(" port=0x%x, inoutpin=0x%x, isinput=%d, mask=0x%x"),port, result.inout,input,result.maskHIGH);
 }
 
@@ -630,6 +605,10 @@ void MotorDriver::checkPowerOverload(bool useProgLimit, byte trackno) {
 	DIAG(F("TRACK %c ALERT FAULT"), trackno + 'A');
       }
       setPower(POWERMODE::ALERT);
+      if ((trackMode & TRACK_MODE_AUTOINV) && (trackMode & (TRACK_MODE_MAIN|TRACK_MODE_EXT|TRACK_MODE_BOOST))){
+	DIAG(F("TRACK %c INVERT"), trackno + 'A');
+	invertOutput();
+      }
       break;
     }
     // all well
@@ -701,8 +680,10 @@ void MotorDriver::checkPowerOverload(bool useProgLimit, byte trackno) {
       power_sample_overload_wait *= 2;
       if (power_sample_overload_wait > POWER_SAMPLE_RETRY_MAX)
 	      power_sample_overload_wait = POWER_SAMPLE_RETRY_MAX;
+  #ifdef EXRAIL_ACTIVE
       DIAG(F("Calling EXRAIL"));
       RMFT2::powerEvent(trackno, true); // Tell EXRAIL we have an overload
+  #endif
       // power on test
       DIAG(F("TRACK %c POWER RESTORE (after %4M)"), trackno + 'A', mslpc);
       setPower(POWERMODE::ALERT);

MotorDriver.h

@@ -3,8 +3,7 @@
  *  © 2021 Mike S
  *  © 2021 Fred Decker
  *  © 2020 Chris Harlow
- *  © 2022 Harald Barth
- *  © 2023 Travis Farmer
+ *  © 2022,2023 Harald Barth
  *  All rights reserved.
  *  
  *  This file is part of CommandStation-EX
@@ -29,23 +28,21 @@
 #include "DCCTimer.h"
 
 // use powers of two so we can do logical and/or on the track modes in if clauses.
+// RACK_MODE_DCX is (TRACK_MODE_DC|TRACK_MODE_INV)
+template<class T> inline T operator~ (T a) { return (T)~(int)a; }
+template<class T> inline T operator| (T a, T b) { return (T)((int)a | (int)b); }
+template<class T> inline T operator& (T a, T b) { return (T)((int)a & (int)b); }
+template<class T> inline T operator^ (T a, T b) { return (T)((int)a ^ (int)b); }
 enum TRACK_MODE : byte {TRACK_MODE_NONE = 1, TRACK_MODE_MAIN = 2, TRACK_MODE_PROG = 4,
-                        TRACK_MODE_DC = 8, TRACK_MODE_DCX = 16, TRACK_MODE_EXT = 32};
-#if defined(ARDUINO_GIGA) && !defined(XGIGA) // yes giga
+                        TRACK_MODE_DC = 8, TRACK_MODE_EXT = 16, TRACK_MODE_BOOST = 32,
+                        TRACK_MODE_ALL = 62, // only to operate all tracks
+                        TRACK_MODE_INV = 64, TRACK_MODE_DCX = 72 /*DC + INV*/, TRACK_MODE_AUTOINV = 128};
 
-#define setHIGH(fastpin)  digitalWrite(fastpin,1)
-#define setLOW(fastpin) digitalWrite(fastpin,0)
-#else // no giga
 #define setHIGH(fastpin)  *fastpin.inout |= fastpin.maskHIGH
 #define setLOW(fastpin)   *fastpin.inout &= fastpin.maskLOW
-#endif // giga
-#if defined(ARDUINO_GIGA) && !defined(XGIGA) // yes giga
-#define isHIGH(fastpin) ((PinStatus)digitalRead(fastpin)==1)
-#define isLOW(fastpin) ((PinStatus)digitalRead(fastpin)==0)
-#else // no giga
 #define isHIGH(fastpin)   (*fastpin.inout & fastpin.maskHIGH)
 #define isLOW(fastpin)    (!isHIGH(fastpin))
-#endif // giga
+
 #define TOKENPASTE(x, y) x ## y
 #define TOKENPASTE2(x, y) TOKENPASTE(x, y)
 
@@ -82,25 +79,6 @@ enum TRACK_MODE : byte {TRACK_MODE_NONE = 1, TRACK_MODE_MAIN = 2, TRACK_MODE_PRO
 #endif
 #endif
 
-#if defined(ARDUINO_GIGA) && defined(XGIGA)
-#define PORTA GPIOA->ODR
-#define HAVE_PORTA(X) X
-#define PORTB GPIOB->ODR
-#define HAVE_PORTB(X) X
-#define PORTC GPIOC->ODR
-#define HAVE_PORTC(X) X
-#define PORTD GPIOD->ODR
-#define HAVE_PORTD(X) X
-#if defined(GPIOE)
-#define PORTE GPIOE->ODR
-#define HAVE_PORTE(X) X
-#endif
-#if defined(GPIOF)
-#define PORTF GPIOF->ODR
-#define HAVE_PORTF(X) X
-#endif
-#endif
-
 // if macros not defined as pass-through we define
 // them here as someting that is valid as a
 // statement and evaluates to false.
@@ -140,25 +118,18 @@ public:
   byte invpin = UNUSED_PIN;
 };
 
-#if defined(__IMXRT1062__) || defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_STM32) || (defined(ARDUINO_GIGA) && defined(XGIGA))
+#if defined(__IMXRT1062__) || defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_STM32)
 typedef uint32_t portreg_t;
 #else
 typedef uint8_t portreg_t;
 #endif
 
-#if defined(ARDUINO_GIGA) && !defined(XGIGA) // yes giga
-typedef int FASTPIN;
-
-
-#else // no giga
 struct FASTPIN {
   volatile portreg_t *inout;
   portreg_t maskHIGH;
   portreg_t maskLOW;
   volatile portreg_t *shadowinout;
 };
-#endif // giga
-
 // The port registers that are shadowing
 // the real port registers. These are
 // defined in Motordriver.cpp
@@ -184,13 +155,9 @@ class MotorDriver {
     // otherwise the call from interrupt context can undo whatever we do
     // from outside interrupt
     void setBrake( bool on, bool interruptContext=false);
-    #if defined(ARDUINO_GIGA) && !defined(XGIGA) // yes giga
     __attribute__((always_inline)) inline void setSignal( bool high) {
-      digitalWrite(signalPin, high);
-      if (dualSignal) digitalWrite(signalPin2, !high);
-    };
-    #else // no giga
-  __attribute__((always_inline)) inline void setSignal( bool high) {
+      if (invertPhase)
+	high = !high;
       if (trackPWM) {
 	DCCTimer::setPWM(signalPin,high);
       }
@@ -205,12 +172,17 @@ class MotorDriver {
 	}
       }
     };
-    #endif // giga
     inline void enableSignal(bool on) {
       if (on)
 	pinMode(signalPin, OUTPUT);
       else
 	pinMode(signalPin, INPUT);
+      if (signalPin2 != UNUSED_PIN) {
+	if (on)
+	  pinMode(signalPin2, OUTPUT);
+	else
+	  pinMode(signalPin2, INPUT);
+      }
     };
     inline pinpair getSignalPin() { return pinpair(signalPin,signalPin2); };
     void setDCSignal(byte speedByte);
@@ -227,12 +199,6 @@ class MotorDriver {
     int  getCurrentRaw(bool fromISR=false);
     unsigned int raw2mA( int raw);
     unsigned int mA2raw( unsigned int mA);
-#if defined(ARDUINO_GIGA) // yes giga
-    inline bool digitalPinHasPWM(int pin) {
-      if (pin!=UNUSED_PIN && pin>=2 && pin<=13) return true;
-      else return false;
-    }
-#endif // giga
     inline bool brakeCanPWM() {
 #if defined(ARDUINO_ARCH_ESP32)
       return (brakePin != UNUSED_PIN); // This was just (true) but we probably do need to check for UNUSED_PIN!
@@ -281,6 +247,32 @@ class MotorDriver {
 #endif
   inline void setMode(TRACK_MODE m) {
     trackMode = m;
+    invertOutput(trackMode & TRACK_MODE_INV);
+  };
+  inline void invertOutput() {               // toggles output inversion
+    invertPhase = !invertPhase;
+    invertOutput(invertPhase);
+  };
+  inline void invertOutput(bool b) {         // sets output inverted or not
+    if (b)
+      invertPhase = 1;
+    else
+      invertPhase = 0;
+#if defined(ARDUINO_ARCH_ESP32)
+    pinpair p = getSignalPin();
+    uint32_t *outreg = (uint32_t *)(GPIO_FUNC0_OUT_SEL_CFG_REG + 4*p.pin);
+    if (invertPhase) // set or clear the invert bit in the gpio out register
+      *outreg |=  ((uint32_t)0x1 << GPIO_FUNC0_OUT_INV_SEL_S);
+    else
+      *outreg &= ~((uint32_t)0x1 << GPIO_FUNC0_OUT_INV_SEL_S);
+    if (p.invpin != UNUSED_PIN) {
+      outreg = (uint32_t *)(GPIO_FUNC0_OUT_SEL_CFG_REG + 4*p.invpin);
+      if (invertPhase) // clear or set the invert bit in the gpio out register
+	*outreg &= ~((uint32_t)0x1 << GPIO_FUNC0_OUT_INV_SEL_S);
+      else
+	*outreg |=  ((uint32_t)0x1 << GPIO_FUNC0_OUT_INV_SEL_S);
+    }
+#endif
   };
   inline TRACK_MODE getMode() {
     return trackMode;
@@ -312,7 +304,7 @@ class MotorDriver {
     bool invertBrake;       // brake pin passed as negative means pin is inverted
     bool invertPower;       // power pin passed as negative means pin is inverted
     bool invertFault;       // fault pin passed as negative means pin is inverted
-    
+    bool invertPhase = 0;   // phase of out pin is inverted
     // Raw to milliamp conversion factors avoiding float data types.
     // Milliamps=rawADCreading * sensefactorInternal / senseScale
     //

SerialManager.cpp

@@ -111,14 +111,15 @@ void SerialManager::loop2() {
             bufferLength = 0;
             buffer[0] = '\0';
         }
-        else if (ch == '>') {
-            buffer[bufferLength] = '\0';
-            DCCEXParser::parse(serial, buffer, NULL); 
-            inCommandPayload = false;
-            break;
-        }
-        else if (inCommandPayload) {
-            if (bufferLength <  (COMMAND_BUFFER_SIZE-1)) buffer[bufferLength++] = ch;
+        else if  (inCommandPayload) {
+	  if (bufferLength <  (COMMAND_BUFFER_SIZE-1))
+	    buffer[bufferLength++] = ch;
+	  if (ch == '>') {
+	    buffer[bufferLength] = '\0';
+	    DCCEXParser::parse(serial, buffer, NULL); 
+	    inCommandPayload = false;
+	    break;
+	  }
         }
     }
     

StringFormatter.cpp

@@ -19,6 +19,7 @@
 #include "StringFormatter.h"
 #include <stdarg.h>
 #include "DisplayInterface.h"
+#include "CommandDistributor.h"
 
 bool Diag::ACK=false;
 bool Diag::CMD=false;
@@ -39,12 +40,20 @@ void StringFormatter::diag( const FSH* input...) {
 void StringFormatter::lcd(byte row, const FSH* input...) {
   va_list args;
 
-  // Copy to serial client for display 0 <@ display# line# "message">
-  send(&USB_SERIAL,F("<@ 0 %d \""),row);
+  // Issue the LCD as a diag first
+  send(&USB_SERIAL,F("<* LCD%d:"),row);
   va_start(args, input);
   send2(&USB_SERIAL,input,args);
-  send(&USB_SERIAL,F("\">\n"));
+  send(&USB_SERIAL,F(" *>\n"));
   
+  // send to virtual LCD collector (if any) 
+  Print * virtualLCD=CommandDistributor::getVirtualLCDSerial(0,row);
+  if (virtualLCD) {
+    va_start(args, input);
+    send2(virtualLCD,input,args);
+    CommandDistributor::commitVirtualLCDSerial();
+  }
+
   DisplayInterface::setRow(row);    
   va_start(args, input);
   send2(DisplayInterface::getDisplayHandler(),input,args);
@@ -52,12 +61,14 @@ void StringFormatter::lcd(byte row, const FSH* input...) {
 
 void StringFormatter::lcd2(uint8_t display, byte row, const FSH* input...) {
   va_list args;
-
-  // Copy to serial client <@ display# line# "message">
-  send(&USB_SERIAL,F("<@ %d %d \""),display,row);
-  va_start(args, input);
-  send2(&USB_SERIAL,input,args);
-  send(&USB_SERIAL,F("\">\n"));
+  
+   // send to virtual LCD collector (if any) 
+  Print * virtualLCD=CommandDistributor::getVirtualLCDSerial(display,row);
+  if (virtualLCD) {
+    va_start(args, input);
+    send2(virtualLCD,input,args);
+    CommandDistributor::commitVirtualLCDSerial();
+  }
 
   DisplayInterface::setRow(display, row);    
   va_start(args, input);

StringFormatter.h

@@ -54,6 +54,5 @@ class StringFormatter
     private: 
     static void send2(Print * serial, const FSH* input,va_list args);
     static void printPadded(Print* stream, long value, byte width, bool formatLeft);
-
 };
 #endif

TrackManager.cpp

@@ -1,6 +1,6 @@
 /*
  *  © 2022 Chris Harlow
- *  © 2022 Harald Barth
+ *  © 2022,2023 Harald Barth
  *  © 2023 Colin Murdoch
  *  All rights reserved.
  *  
@@ -45,6 +45,11 @@ const int16_t HASH_KEYWORD_DC = 2183;
 const int16_t HASH_KEYWORD_DCX = 6463; // DC reversed polarity 
 const int16_t HASH_KEYWORD_EXT = 8201; // External DCC signal
 const int16_t HASH_KEYWORD_A = 65; // parser makes single chars the ascii.   
+const int16_t HASH_KEYWORD_AUTO = -5457;
+#ifdef BOOSTER_INPUT
+const int16_t HASH_KEYWORD_BOOST = 11269;
+#endif
+const int16_t HASH_KEYWORD_INV = 11857;
 
 MotorDriver * TrackManager::track[MAX_TRACKS];
 int16_t TrackManager::trackDCAddr[MAX_TRACKS];
@@ -87,7 +92,7 @@ void TrackManager::sampleCurrent() {
   if (!waiting) {
     // look for a valid track to sample or until we are around
     while (true) {
-      if (track[tr]->getMode() & ( TRACK_MODE_MAIN|TRACK_MODE_PROG|TRACK_MODE_DC|TRACK_MODE_DCX|TRACK_MODE_EXT )) {
+      if (track[tr]->getMode() & ( TRACK_MODE_MAIN|TRACK_MODE_PROG|TRACK_MODE_DC|TRACK_MODE_BOOST|TRACK_MODE_EXT )) {
 	track[tr]->startCurrentFromHW();
 	// for scope debug track[1]->setBrake(1);
 	waiting = true;
@@ -197,8 +202,8 @@ void TrackManager::setPROGSignal( bool on) {
 void TrackManager::setDCSignal(int16_t cab, byte speedbyte) {
   FOR_EACH_TRACK(t) {
     if (trackDCAddr[t]!=cab && cab != 0) continue;
-    if (track[t]->getMode()==TRACK_MODE_DC) track[t]->setDCSignal(speedbyte);
-    else if (track[t]->getMode()==TRACK_MODE_DCX) track[t]->setDCSignal(speedbyte ^ 128);
+    if (track[t]->getMode() & TRACK_MODE_DC)
+      track[t]->setDCSignal(speedbyte);
   }
 }    
 
@@ -207,7 +212,7 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
 
     //DIAG(F("Track=%c Mode=%d"),trackToSet+'A', mode);
     // DC tracks require a motorDriver that can set brake!
-    if (mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX) {
+    if (mode & TRACK_MODE_DC) {
 #if defined(ARDUINO_AVR_UNO)
       DIAG(F("Uno has no PWM timers available for DC"));
       return false;
@@ -223,21 +228,37 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
     pinpair p = track[trackToSet]->getSignalPin();
     //DIAG(F("Track=%c remove  pin %d"),trackToSet+'A', p.pin);
     gpio_reset_pin((gpio_num_t)p.pin);
-    pinMode(p.pin, OUTPUT); // gpio_reset_pin may reset to input
     if (p.invpin != UNUSED_PIN) {
       //DIAG(F("Track=%c remove ^pin %d"),trackToSet+'A', p.invpin);
       gpio_reset_pin((gpio_num_t)p.invpin);
-      pinMode(p.invpin, OUTPUT); // gpio_reset_pin may reset to input
     }
+#ifdef BOOSTER_INPUT
+    if (mode & TRACK_MODE_BOOST) {
+      //DIAG(F("Track=%c mode boost pin %d"),trackToSet+'A', p.pin);
+      pinMode(BOOSTER_INPUT, INPUT);
+      gpio_matrix_in(26, SIG_IN_FUNC228_IDX, false); //pads 224 to 228 available as loopback
+      gpio_matrix_out(p.pin, SIG_IN_FUNC228_IDX, false, false);
+      if (p.invpin != UNUSED_PIN) {
+	gpio_matrix_out(p.invpin, SIG_IN_FUNC228_IDX, true /*inverted*/, false);
+      }
+    } else // elseif clause continues
+#endif
+    if (mode & (TRACK_MODE_MAIN | TRACK_MODE_PROG | TRACK_MODE_DC)) {
+      // gpio_reset_pin may reset to input
+      pinMode(p.pin, OUTPUT);
+      if (p.invpin != UNUSED_PIN)
+	pinMode(p.invpin, OUTPUT);
+    }
+
 #endif
 #ifndef DISABLE_PROG
-    if (mode==TRACK_MODE_PROG) {
+    if (mode & TRACK_MODE_PROG) {
 #else
     if (false) {
 #endif
       // only allow 1 track to be prog
       FOR_EACH_TRACK(t)
-	if (track[t]->getMode()==TRACK_MODE_PROG && t != trackToSet) {
+	if ( (track[t]->getMode() & TRACK_MODE_PROG) && t != trackToSet) {
 	  track[t]->setPower(POWERMODE::OFF);
 	  track[t]->setMode(TRACK_MODE_NONE);
 	  track[t]->makeProgTrack(false);     // revoke prog track special handling
@@ -255,16 +276,20 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
     // state, otherwise trains run away or just dont move.
 
     // This can be done BEFORE the PWM-Timer evaluation (methinks)
-    if (!(mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX)) {
+    if (!(mode & TRACK_MODE_DC)) {
       // DCC tracks need to have set the PWM to zero or they will not work.
       track[trackToSet]->detachDCSignal();
       track[trackToSet]->setBrake(false);
     }
 
-    // EXT is a special case where the signal pin is
-    // turned off. So unless that is set, the signal
-    // pin should be turned on
-    track[trackToSet]->enableSignal(mode != TRACK_MODE_EXT);
+    // BOOST:
+    //  Leave it as is
+    // otherwise:
+    //  EXT is a special case where the signal pin is
+    //  turned off. So unless that is set, the signal
+    //  pin should be turned on
+    if (!(mode & TRACK_MODE_BOOST))
+      track[trackToSet]->enableSignal(!(mode & TRACK_MODE_EXT));
 
 #ifndef ARDUINO_ARCH_ESP32
     // re-evaluate HighAccuracy mode
@@ -274,7 +299,7 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
       // DC tracks must not have the DCC PWM switched on
       // so we globally turn it off if one of the PWM
       // capable tracks is now DC or DCX.
-      if (track[t]->getMode()==TRACK_MODE_DC || track[t]->getMode()==TRACK_MODE_DCX) {
+      if (track[t]->getMode() & TRACK_MODE_DC) {
 	if (track[t]->isPWMCapable()) {
 	  canDo=false;    // this track is capable but can not run PWM
 	  break;          // in this mode, so abort and prevent globally below
@@ -282,7 +307,7 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
 	  track[t]->trackPWM=false; // this track sure can not run with PWM
 	  //DIAG(F("Track %c trackPWM 0 (not capable)"), t+'A');
 	}
-      } else if (track[t]->getMode()==TRACK_MODE_MAIN || track[t]->getMode()==TRACK_MODE_PROG) {
+      } else if (track[t]->getMode() & (TRACK_MODE_MAIN |TRACK_MODE_PROG)) {
 	track[t]->trackPWM = track[t]->isPWMCapable(); // trackPWM is still a guess here
 	//DIAG(F("Track %c trackPWM %d"), t+'A', track[t]->trackPWM);
 	canDo &= track[t]->trackPWM;
@@ -300,10 +325,12 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
 #else
     // For ESP32 we just reinitialize the DCC Waveform
     DCCWaveform::begin();
+    // setMode() again AFTER Waveform::begin() of ESP32 fixes INVERTED signal
+    track[trackToSet]->setMode(mode);
 #endif
 
     // This block must be AFTER the PWM-Timer modifications
-    if (mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX) {
+    if (mode & TRACK_MODE_DC) {
         // DC tracks need to be given speed of the throttle for that cab address
         // otherwise will not match other tracks on same cab.
         // This also needs to allow for inverted DCX
@@ -312,7 +339,7 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
 
     // Normal running tracks are set to the global power state 
     track[trackToSet]->setPower(
-        (mode==TRACK_MODE_MAIN || mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX || mode==TRACK_MODE_EXT) ?
+      (mode & (TRACK_MODE_MAIN | TRACK_MODE_DC | TRACK_MODE_EXT | TRACK_MODE_BOOST)) ?
         mainPowerGuess : POWERMODE::OFF);
     //DIAG(F("TrackMode=%d"),mode);
     return true; 
@@ -320,8 +347,6 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
 
 void TrackManager::applyDCSpeed(byte t) {
   uint8_t speedByte=DCC::getThrottleSpeedByte(trackDCAddr[t]);
-  if (track[t]->getMode()==TRACK_MODE_DCX)
-    speedByte = speedByte ^ 128; // reverse direction bit
   track[t]->setDCSignal(speedByte);
 }
 
@@ -353,12 +378,21 @@ bool TrackManager::parseJ(Print *stream, int16_t params, int16_t p[])
 
     if (params==2  && p[1]==HASH_KEYWORD_EXT) // <= id EXT>
         return setTrackMode(p[0],TRACK_MODE_EXT);
+#ifdef BOOSTER_INPUT
+    if (params==2  && p[1]==HASH_KEYWORD_BOOST) // <= id BOOST>
+        return setTrackMode(p[0],TRACK_MODE_BOOST);
+#endif
+    if (params==2  && p[1]==HASH_KEYWORD_AUTO) // <= id AUTO>
+      return setTrackMode(p[0], track[p[0]]->getMode() | TRACK_MODE_AUTOINV);
+
+    if (params==2  && p[1]==HASH_KEYWORD_INV) // <= id AUTO>
+      return setTrackMode(p[0], track[p[0]]->getMode() | TRACK_MODE_INV);
 
     if (params==3  && p[1]==HASH_KEYWORD_DC && p[2]>0) // <= id DC cab>
         return setTrackMode(p[0],TRACK_MODE_DC,p[2]);
     
     if (params==3  && p[1]==HASH_KEYWORD_DCX && p[2]>0) // <= id DCX cab>
-        return setTrackMode(p[0],TRACK_MODE_DCX,p[2]);
+        return setTrackMode(p[0],TRACK_MODE_DC|TRACK_MODE_INV,p[2]);
 
     return false;
 }
@@ -366,36 +400,43 @@ bool TrackManager::parseJ(Print *stream, int16_t params, int16_t p[])
 void TrackManager::streamTrackState(Print* stream, byte t) {
   // null stream means send to commandDistributor for broadcast
   if (track[t]==NULL) return;
-  auto format=F("");
-  bool pstate = TrackManager::isPowerOn(t);
-  
-  switch(track[t]->getMode()) {
-  case TRACK_MODE_MAIN:
-      if (pstate) {format=F("<= %c MAIN ON>\n");} else {format = F("<= %c MAIN OFF>\n");}
-      break;
+  auto format=F("<= %d XXX>\n");
+  TRACK_MODE tm = track[t]->getMode();
+  if (tm & TRACK_MODE_MAIN) {
+    if(tm & TRACK_MODE_AUTOINV)
+      format=F("<= %c MAIN A>\n");
+    else if (tm & TRACK_MODE_INV)
+      format=F("<= %c MAIN I>\n");
+    else
+      format=F("<= %c MAIN>\n");
+  }
 #ifndef DISABLE_PROG
-  case TRACK_MODE_PROG:
-      if (pstate) {format=F("<= %c PROG ON>\n");} else {format=F("<= %c PROG OFF>\n");}
-      break;
+  else if (tm & TRACK_MODE_PROG)
+    format=F("<= %c PROG>\n");
 #endif
-  case TRACK_MODE_NONE:
-      if (pstate) {format=F("<= %c NONE ON>\n");} else {format=F("<= %c NONE OFF>\n");}
-      break;
-  case TRACK_MODE_EXT:
-      if (pstate) {format=F("<= %c EXT ON>\n");} else {format=F("<= %c EXT OFF>\n");}
-      break;
-  case TRACK_MODE_DC:
-      if (pstate) {format=F("<= %c DC %d ON>\n");} else {format=F("<= %c DC %d OFF>\n");}
-      break;
-  case TRACK_MODE_DCX:
-      if (pstate) {format=F("<= %c DCX %d ON>\n");} else {format=F("<= %c DCX %d OFF>\n");}
-      break;
-  default:
-      break; // unknown, dont care    
+  else if (tm & TRACK_MODE_NONE)
+    format=F("<= %c NONE>\n");
+  else if(tm & TRACK_MODE_EXT)
+    format=F("<= %c EXT>\n");
+  else if(tm & TRACK_MODE_BOOST) {
+        if(tm & TRACK_MODE_AUTOINV)
+      format=F("<= %c B A>\n");
+    else if (tm & TRACK_MODE_INV)
+      format=F("<= %c B I>\n");
+    else
+      format=F("<= %c B>\n");
+  }
+  else if (tm & TRACK_MODE_DC) {
+    if (tm & TRACK_MODE_INV)
+      format=F("<= %c DCX %d>\n");
+    else
+      format=F("<= %c DC %d>\n");
   }
 
-  if (stream) StringFormatter::send(stream,format,'A'+t, trackDCAddr[t]);   
-    else CommandDistributor::broadcastTrackState(format,'A'+t, trackDCAddr[t]);
+  if (stream)
+    StringFormatter::send(stream,format,'A'+t, trackDCAddr[t]);
+  else
+    CommandDistributor::broadcastTrackState(format,'A'+t, trackDCAddr[t]);
   
 }
 
@@ -411,13 +452,13 @@ void TrackManager::loop() {
     if (nextCycleTrack>lastTrack) nextCycleTrack=0;
     if (track[nextCycleTrack]==NULL) return;
     MotorDriver * motorDriver=track[nextCycleTrack];
-    bool useProgLimit=dontLimitProg? false: track[nextCycleTrack]->getMode()==TRACK_MODE_PROG;
+    bool useProgLimit=dontLimitProg ? false : (bool)(track[nextCycleTrack]->getMode() & TRACK_MODE_PROG);
     motorDriver->checkPowerOverload(useProgLimit, nextCycleTrack);   
 }
 
 MotorDriver * TrackManager::getProgDriver() {
     FOR_EACH_TRACK(t)
-      if (track[t]->getMode()==TRACK_MODE_PROG) return track[t];
+      if (track[t]->getMode() & TRACK_MODE_PROG) return track[t];
     return NULL;
 } 
 
@@ -425,63 +466,53 @@ MotorDriver * TrackManager::getProgDriver() {
 std::vector<MotorDriver *>TrackManager::getMainDrivers() {
   std::vector<MotorDriver *>  v;
   FOR_EACH_TRACK(t)
-    if (track[t]->getMode()==TRACK_MODE_MAIN) v.push_back(track[t]);
+    if (track[t]->getMode() & TRACK_MODE_MAIN) v.push_back(track[t]);
   return v;
 }
 #endif
 
-void TrackManager::setPower2(bool setProg,bool setJoin, POWERMODE mode) {
-    if (!setProg) mainPowerGuess=mode; 
-    FOR_EACH_TRACK(t) {
-
-      TrackManager::setTrackPower(setProg, setJoin, mode, t);
-      
+// Set track power for all tracks with this mode
+void TrackManager::setTrackPower(TRACK_MODE trackmode, POWERMODE powermode) {
+  FOR_EACH_TRACK(t) {
+    MotorDriver *driver=track[t]; 
+    if (trackmode & driver->getMode()) {
+      if (powermode == POWERMODE::ON) {
+	if (trackmode & TRACK_MODE_DC) {
+	  driver->setBrake(true);   // DC starts with brake on
+	  applyDCSpeed(t);          // speed match DCC throttles
+	} else {
+	  // toggle brake before turning power on - resets overcurrent error
+	  // on the Pololu board if brake is wired to ^D2.
+	  driver->setBrake(true);
+	  driver->setBrake(false); // DCC runs with brake off
+	}
+      }
+      driver->setPower(powermode);
     }
-    return;
+  }
 }
 
-void TrackManager::setTrackPower(bool setProg, bool setJoin, POWERMODE mode, byte thistrack) {
+// Set track power for this track, inependent of mode
+void TrackManager::setTrackPower(POWERMODE powermode, byte t) {
+  MotorDriver *driver=track[t]; 
+  TRACK_MODE trackmode = driver->getMode();
+  if (trackmode & TRACK_MODE_DC) {
+    if (powermode == POWERMODE::ON) {
+      driver->setBrake(true);   // DC starts with brake on
+      applyDCSpeed(t);          // speed match DCC throttles
+    }
+  } else {
+    if (powermode == POWERMODE::ON) {
+      // toggle brake before turning power on - resets overcurrent error
+      // on the Pololu board if brake is wired to ^D2.
+      driver->setBrake(true);
+      driver->setBrake(false); // DCC runs with brake off
+    }
+  }
+  driver->setPower(powermode);
+}
 
-      //DIAG(F("SetTrackPower Processing Track %d"), thistrack);
-      MotorDriver * driver=track[thistrack]; 
-      if (!driver) return; 
-
-      switch (track[thistrack]->getMode()) {
-          case TRACK_MODE_MAIN:
-              if (setProg) break; 
-              // toggle brake before turning power on - resets overcurrent error
-              // on the Pololu board if brake is wired to ^D2.
-              // XXX see if we can make this conditional
-              driver->setBrake(true);
-              driver->setBrake(false); // DCC runs with brake off
-              driver->setPower(mode);  
-              break; 
-          case TRACK_MODE_DC:
-          case TRACK_MODE_DCX:
-              //DIAG(F("Processing track - %d setProg %d"), thistrack, setProg);
-              if (setProg || setJoin)  break; 
-              driver->setBrake(true); // DC starts with brake on
-              applyDCSpeed(thistrack);        // speed match DCC throttles
-              driver->setPower(mode);
-              break;  
-          case TRACK_MODE_PROG:
-              if (!setProg && !setJoin) break; 
-              driver->setBrake(true);
-              driver->setBrake(false);
-              driver->setPower(mode);
-              break;  
-          case TRACK_MODE_EXT:
-              driver->setBrake(true);
-              driver->setBrake(false);
-              driver->setPower(mode);
-        break;
-          case TRACK_MODE_NONE:
-              break;
-        }
-
- }
-
- void TrackManager::reportPowerChange(Print* stream, byte thistrack) {
+void TrackManager::reportPowerChange(Print* stream, byte thistrack) {
   // This function is for backward JMRI compatibility only
   // It reports the first track only, as main, regardless of track settings.
   //  <c MeterName value C/V unit min max res warn>
@@ -490,12 +521,40 @@ void TrackManager::setTrackPower(bool setProg, bool setJoin, POWERMODE mode, byt
             track[0]->raw2mA(track[0]->getCurrentRaw(false)), maxCurrent, maxCurrent);                  
 }
 
+// returns state of the one and only prog track
 POWERMODE TrackManager::getProgPower() {
-    FOR_EACH_TRACK(t)
-      if (track[t]->getMode()==TRACK_MODE_PROG) 
-	  return track[t]->getPower();
-    return POWERMODE::OFF;   
+  FOR_EACH_TRACK(t)
+    if (track[t]->getMode() & TRACK_MODE_PROG)
+      return track[t]->getPower(); // optimize: there is max one prog track
+  return POWERMODE::OFF;
+}
+
+// returns on if all are on. returns off otherwise
+POWERMODE TrackManager::getMainPower() {
+  POWERMODE result = POWERMODE::OFF;
+  FOR_EACH_TRACK(t) {
+    if (track[t]->getMode() & TRACK_MODE_MAIN) {
+      POWERMODE p = track[t]->getPower();
+      if (p == POWERMODE::OFF)
+	return POWERMODE::OFF; // done and out
+      if (p == POWERMODE::ON)
+	result = POWERMODE::ON;
+    }
   }
+  return result;
+}
+
+bool TrackManager::getPower(byte t, char s[]) {
+  if (t > lastTrack)
+    return false;
+  if (track[t]) {
+    s[0] = track[t]->getPower() == POWERMODE::ON ? '1' : '0';
+    s[2] = t + 'A';
+    return true;
+  }
+  return false;
+}
+
 
 void TrackManager::reportObsoleteCurrent(Print* stream) {
   // This function is for backward JMRI compatibility only
@@ -537,7 +596,7 @@ void TrackManager::setJoin(bool joined) {
 #ifdef ARDUINO_ARCH_ESP32
   if (joined) {
     FOR_EACH_TRACK(t) {
-      if (track[t]->getMode()==TRACK_MODE_PROG) {
+      if (track[t]->getMode() & TRACK_MODE_PROG) {
 	tempProgTrack = t;
 	setTrackMode(t, TRACK_MODE_MAIN);
 	break;
@@ -566,7 +625,7 @@ bool TrackManager::isPowerOn(byte t) {
   }
 
 bool TrackManager::isProg(byte t) {
-    if (track[t]->getMode()==TRACK_MODE_PROG)
+    if (track[t]->getMode() & TRACK_MODE_PROG)
         return true;
     return false;
 }

TrackManager.h

@@ -62,23 +62,22 @@ class TrackManager {
     static void setDCSignal(int16_t cab, byte speedbyte);
     static MotorDriver * getProgDriver();
 #ifdef ARDUINO_ARCH_ESP32
-  static std::vector<MotorDriver *>getMainDrivers();
+    static std::vector<MotorDriver *>getMainDrivers();
 #endif
   
-    static void setPower2(bool progTrack,bool joinTrack,POWERMODE mode);
     static void setPower(POWERMODE mode) {setMainPower(mode); setProgPower(mode);}
-    static void setMainPower(POWERMODE mode) {setPower2(false,false,mode);}
-    static void setProgPower(POWERMODE mode) {setPower2(true,false,mode);}
-    static void setJoinPower(POWERMODE mode) {setPower2(false,true,mode);}
-    static void setTrackPower(bool setProg, bool setJoin, POWERMODE mode, byte thistrack);
-   
+    static void setTrackPower(POWERMODE mode, byte t);
+    static void setTrackPower(TRACK_MODE trackmode, POWERMODE powermode);
+    static void setMainPower(POWERMODE mode) {setTrackPower(TRACK_MODE_MAIN, mode);}
+    static void setProgPower(POWERMODE mode) {setTrackPower(TRACK_MODE_PROG, mode);}
 
     static const int16_t MAX_TRACKS=8;
     static bool setTrackMode(byte track, TRACK_MODE mode, int16_t DCaddr=0);
     static bool parseJ(Print * stream,  int16_t params, int16_t p[]);
     static void loop();
-    static POWERMODE getMainPower() {return mainPowerGuess;}
+    static POWERMODE getMainPower();
     static POWERMODE getProgPower();
+    static bool getPower(byte t, char s[]);
     static void setJoin(bool join);
     static bool isJoined() { return progTrackSyncMain;}
     static void setJoinRelayPin(byte joinRelayPin);
@@ -112,7 +111,7 @@ class TrackManager {
     static POWERMODE mainPowerGuess;
     static void applyDCSpeed(byte t);
 
-    static int16_t trackDCAddr[MAX_TRACKS];  // dc address if TRACK_MODE_DC or TRACK_MODE_DCX
+    static int16_t trackDCAddr[MAX_TRACKS];  // dc address if TRACK_MODE_DC
 #ifdef ARDUINO_ARCH_ESP32
     static byte tempProgTrack; // holds the prog track number during join
 #endif

WifiInterface.cpp

@@ -3,7 +3,6 @@
  *  © 2020-2022 Harald Barth
  *  © 2020-2022 Chris Harlow
  *  © 2023 Nathan Kellenicki
- *  © 2023 Travis Farmer
  *  All rights reserved.
  *
  *  This file is part of CommandStation-EX
@@ -58,14 +57,6 @@ Stream * WifiInterface::wifiStream;
 #define SERIAL3 Serial3
 #endif
 
-#if defined(ARDUINO_GIGA) // yes giga
-#define NUM_SERIAL 5
-#define SERIAL1 Serial1
-#define SERIAL2 Serial2
-#define SERIAL3 Serial3
-#define SERIAL4 Serial4
-#endif // giga
-
 #if defined(ARDUINO_ARCH_STM32)
 // Handle serial ports availability on STM32 for variants!
 // #undef NUM_SERIAL
@@ -210,15 +201,16 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
   // Display the AT version information
   StringFormatter::send(wifiStream, F("AT+GMR\r\n")); 
   if (checkForOK(2000, F("AT version:"), true, false)) {
-    char version[] = "0.0.0.0";
-    for (int i=0; i<8;i++) {
+    char version[] = "0.0.0.0-xxx";
+    for (int i=0; i<11;i++) {
       while(!wifiStream->available());
       version[i]=wifiStream->read();
       StringFormatter::printEscape(version[i]);
     }
     if ((version[0] == '0') ||
 	(version[0] == '2' && version[2] == '0') ||
-	(version[0] == '2' && version[2] == '2' && version[4] == '0' && version[6] == '0')) {
+	(version[0] == '2' && version[2] == '2' && version[4] == '0' && version[6] == '0'
+	 && version[7] == '-' && version[8] == 'd' && version[9] == 'e' && version[10] == 'v')) {
       DIAG(F("You need to up/downgrade the ESP firmware"));
       SSid = F("UPDATE_ESP_FIRMWARE");
       forceAP = true;

Wifi_NINA.cpp

@@ -1,284 +0,0 @@
-/*
-    © 2023 Paul M. Antoine
-    © 2021-23 Harald Barth
-    © 2023 Nathan Kellenicki
-    © 2023 Travis Farmer
-    © 2023 Chris Harlow
-    
-    This file is part of CommandStation-EX
-
-    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/>.
-*/
-#include "defines.h"
-
-#if defined(WIFI_NINA) || defined(GIGA_WIFI)
-//#include <vector>
-#include <SPI.h>
-#ifndef ARDUINO_GIGA
-#include <WifiNINA.h>
-#else
-#if defined(GIGA_WIFI)
-#include <WiFi.h>
-#else
-#include <WiFiNINA.h>
-#endif
-#endif
-#include "Wifi_NINA.h"
-#include "DIAG.h"
-#include "RingStream.h"
-#include "CommandDistributor.h"
-#include "WiThrottle.h"
-
-// Configure the pins used for the ESP32 connection
-#if !defined(ARDUINO_GIGA) && defined(ARDUINO_ARCH_STM32) // Here my STM32 configuration
-  #define SPIWIFI       SPI  // The SPI port
-  #define SPIWIFI_SS    PA4   // Chip select pin
-  #define ESP32_RESETN  PA10   // Reset pin
-  #define SPIWIFI_ACK   PB3   // a.k.a BUSY or READY pin
-  #define ESP32_GPIO0   -1
-#elif defined(ARDUINO_GIGA)
-  #define SPIWIFI       SPI
-  #define SPIWIFI_SS    10   // Chip select pin
-  #define SPIWIFI_ACK    7   // a.k.a BUSY or READY pin
-  #define ESP32_RESETN   5   // Reset pin
-  #define ESP32_GPIO0   -1   // Not connected
-#else
-#warning "WiFiNINA has no SPI port or pin allocations for this archiecture yet!"
-#endif
-#define MAX_CLIENTS 10
-
-static WiFiServer *server = NULL;
-static RingStream *outboundRing = new RingStream(10240);
-static bool APmode = false;
-static IPAddress ip;
-
-char asciitolower(char in) {
-  if (in <= 'Z' && in >= 'A')
-    return in - ('Z' - 'z');
-  return in;
-}
-
-bool WifiNINA::setup(const char *SSid,
-                    const char *password,
-                    const char *hostname,
-                    int port,
-                    const byte channel,
-                    const bool forceAP) {
-  bool havePassword = true;
-  bool haveSSID = true;
-  bool wifiUp = false;
-  uint8_t tries = 40;
-
-  // Set up the pins!
-#if !defined(GIGA_WIFI)
-  WiFi.setPins(SPIWIFI_SS, SPIWIFI_ACK, ESP32_RESETN, ESP32_GPIO0, &SPIWIFI);
-#endif
-  // check for the WiFi module:
-  if (WiFi.status() == WL_NO_MODULE) {
-    DIAG(F("Communication with WiFi module failed!"));
-    // don't continue for now!
-    while (true);
-  }
-
-  // Print firmware version on the module
-  String fv = WiFi.firmwareVersion();
-  DIAG(F("WifiNINA Firmware version found:%s"), fv.c_str());
-
-  const char *yourNetwork = "Your network ";
-  if (strncmp(yourNetwork, SSid, 13) == 0 || strncmp("", SSid, 13) == 0)
-    haveSSID = false;
-  if (strncmp(yourNetwork, password, 13) == 0 || strncmp("", password, 13) == 0)
-    havePassword = false;
-
-  if (haveSSID && havePassword && !forceAP) {
-#ifndef ARDUINO_GIGA
-    WiFi.setHostname(hostname); // Strangely does not work unless we do it HERE!
-#endif
-    // WiFi.mode(WIFI_STA);
-    // WiFi.setAutoReconnect(true);
-    WiFi.begin(SSid, password);
-    while (WiFi.status() != WL_CONNECTED && tries) {
-      Serial.print('.');
-      tries--;
-      delay(500);
-    }
-    if (WiFi.status() == WL_CONNECTED) {
-      IPAddress ip = WiFi.localIP();
-      DIAG(F("Wifi STA IP %d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
-      wifiUp = true;
-    } else {
-      DIAG(F("Could not connect to Wifi SSID %s"),SSid);
-      DIAG(F("Forcing one more Wifi restart"));
-      // esp_wifi_start();
-      // esp_wifi_connect();
-      WiFi.end();
-      WiFi.begin(SSid, password);
-      tries=40;
-      while (WiFi.status() != WL_CONNECTED && tries) {
-        Serial.print('.');
-        tries--;
-        delay(500);
-      }
-      if (WiFi.status() == WL_CONNECTED) {
-        ip = WiFi.localIP();
-        DIAG(F("Wifi STA IP 2nd try %d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
-        wifiUp = true;
-            } else {
-        DIAG(F("Wifi STA mode FAIL. Will revert to AP mode"));
-        haveSSID=false;
-      }
-    }
-  }
-  if (!haveSSID || forceAP) {
-    // prepare all strings
-    String strSSID(forceAP ? SSid : "DCCEX_");
-    String strPass(forceAP ? password : "PASS_");
-    if (!forceAP) {
-      byte mac[6];
-      WiFi.macAddress(mac);
-      String strMac;
-      for (int i = 0; i++; i < 6) {
-        strMac += String(mac[i], HEX);
-      }
-
-      DIAG(F("MAC address: %x:%x:%x:%x:%x:%x"), mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-
-      strMac.remove(0,9);
-      strMac.replace(":","");
-      strMac.replace(":","");
-      // convert mac addr hex chars to lower case to be compatible with AT software
-      //std::transform(strMac.begin(), strMac.end(), strMac.begin(), asciitolower); ///TJF: why does this fail compile with WiFiNINA, but not giga WiFi???
-      strSSID.concat(strMac);
-      strPass.concat(strMac);
-    }
-
-    if (WiFi.beginAP(strSSID.c_str(),
-		    havePassword ? password : strPass.c_str(),
-		    channel) == WL_AP_LISTENING) {
-      DIAG(F("Wifi AP SSID %s PASS %s"),strSSID.c_str(),havePassword ? password : strPass.c_str());
-      ip = WiFi.localIP();
-      DIAG(F("Wifi AP IP %d.%d.%d.%d"),ip[0], ip[1], ip[2], ip[3]);
-      wifiUp = true;
-      APmode = true;
-    } else {
-      DIAG(F("Could not set up AP with Wifi SSID %s"),strSSID.c_str());
-    }
-  }
-
-
-  if (!wifiUp) {
-    DIAG(F("Wifi setup all fail (STA and AP mode)"));
-    // no idea to go on
-    return false;
-  }
-
-  // TODO: we need to run the MDNS_Generic server I suspect
-  // // Now Wifi is up, register the mDNS service
-  // if(!MDNS.begin(hostname)) {
-  //   DIAG(F("Wifi setup failed to start mDNS"));
-  // }
-  // if(!MDNS.addService("withrottle", "tcp", 2560)) {
-  //   DIAG(F("Wifi setup failed to add withrottle service to mDNS"));
-  // }
-
-  server = new WiFiServer(port); // start listening on tcp port
-  server->begin();
-  // server started here
-  DIAG(F("Server will be started on port %d"),port);
-
-  ip = WiFi.localIP();
-  LCD(4,F("IP: %d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
-  LCD(5,F("Port:%d"), port);
-  return true;
-}
-
-const char *wlerror[] = {
-			 "WL_IDLE_STATUS",
-			 "WL_NO_SSID_AVAIL",
-			 "WL_SCAN_COMPLETED",
-			 "WL_CONNECTED",
-			 "WL_CONNECT_FAILED",
-			 "WL_CONNECTION_LOST",
-			 "WL_DISCONNECTED"
-};
-
-WiFiClient * clients[MAX_CLIENTS];  // nulled in setup
-
-void WifiNINA::checkForNewClient() {
-  auto newClient=server->available();
-  if (!newClient) return;
-  for (byte clientId=0; clientId<MAX_CLIENTS; clientId++){
-    if (!clients[clientId]) {
-      clients[clientId]= new WiFiClient(newClient); // use this slot
-      //DIAG(F("New client connected to slot %d"),clientId); //TJF: brought in for debugging.
-      return;
-    }
-  }
-}
-
-void WifiNINA::checkForLostClients() {
-  for (byte clientId=0; clientId<MAX_CLIENTS; clientId++){
-    auto c=clients[clientId];
-    if(c && !c->connected()) {
-      clients[clientId]->stop();
-      //DIAG(F("Remove client %d"), clientId);
-      CommandDistributor::forget(clientId);
-      clients[clientId]=nullptr;
-    }
-  }
-}
-
-void WifiNINA::checkForClientInput() {
-  // Find a client providing input
-    for (byte clientId=0; clientId<MAX_CLIENTS; clientId++){
-      auto c=clients[clientId];
-      if(c) {
-        auto len=c->available();
-        if (len) {
-          // read data from client
-          byte cmd[len+1];
-          for(int i=0; i<len; i++) cmd[i]=c->read();
-          cmd[len]=0x00;
-          CommandDistributor::parse(clientId,cmd,outboundRing);
-        }
-      }
-    }
-}
-
-void WifiNINA::checkForClientOutput() {
-  // something to write out?
-  auto clientId=outboundRing->read();
-  if (clientId < 0) return;
-  auto replySize=outboundRing->count();
-  if (replySize==0) return; // nothing to send
-  auto c=clients[clientId];
-  if (!c) {
-    // client is gone, throw away msg
-    for (int i=0;i<replySize;i++) outboundRing->read();
-    //DIAG(F("gone, drop message.")); //TJF: only for diag
-    return;
-  }
-  // emit data to the client object
-  for (int i=0;i<replySize;i++) c->write(outboundRing->read());
-}
-
-void WifiNINA::loop() {
-  checkForLostClients(); // ***
-  checkForNewClient();
-  checkForClientInput(); // ***
-  WiThrottle::loop(outboundRing); // allow withrottle to broadcast if needed
-  checkForClientOutput();
-}
-
-#endif // WIFI_NINA

Wifi_NINA.h

@@ -1,46 +0,0 @@
-/*
- *  © 2023 Paul M. Antoine
- *  © 2021 Harald Barth
- *  © 2023 Nathan Kellenicki
- *
- *  This file is part of CommandStation-EX
- *
- *  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/>.
- */
-
-#ifndef WifiNINA_h
-#define WifiNINA_h
-// #include "FSH.h"
-#include <Arduino.h>
-// #include <SPI.h>
-// #include <WifiNINA.h>
-
-class WifiNINA
-{
-
-public:
-  static bool setup(const char *wifiESSID,
-		    const char *wifiPassword,
-		    const char *hostname,
-		    const int port,
-		    const byte channel,
-				const bool forceAP);
-  static void loop();
-private:
-	static void checkForNewClient();
-	static void checkForLostClients();
-	static void checkForClientInput();
-	static void checkForClientOutput();
-};
-#endif //WifiNINA_h

config.example.h

@@ -167,6 +167,14 @@ The configuration file for DCC-EX Command Station
 //  *  #define SCROLLMODE 2 is by row (move up 1 row at a time).
 #define SCROLLMODE 1
 
+// In order to avoid wasting memory the current scroll buffer is limited
+// to 8 lines.  Some users wishing to display additional information
+// such as TrackManager power states have requested additional rows aware
+// of the warning that this will take extra RAM.  if you wish to include additional rows
+// uncomment the following #define and set the number of lines you need.
+//#define MAX_CHARACTER_ROWS 12
+
+
 /////////////////////////////////////////////////////////////////////////////////////
 // DISABLE EEPROM
 //
@@ -266,6 +274,12 @@ The configuration file for DCC-EX Command Station
 //
 //#define SERIAL_BT_COMMANDS
 
+// BOOSTER PIN INPUT ON ESP32
+// On ESP32 you have the possibility to define a pin as booster input
+// Arduio pin D2 is GPIO 26 on ESPDuino32
+//
+//#define BOOSTER_INPUT 26
+
 // SABERTOOTH
 //
 // This is a very special option and only useful if you happen to have a

defines.h

@@ -5,7 +5,6 @@
  *  © 2021 Fred Decker
  *  © 2020-2022 Harald Barth
  *  © 2020-2021 Chris Harlow
- *  © 2023 Travis Farmer
  *
  *  This file is part of CommandStation-EX
  *
@@ -148,20 +147,7 @@
   // #ifndef I2C_USE_WIRE
   // #define I2C_USE_WIRE
   // #endif
-#elif defined(ARDUINO_GIGA)
-  #define ARDUINO_TYPE "Giga"
-  #ifndef GIGA_EXT_EEPROM
-    #define DISABLE_EEPROM
-  #endif
-  #if defined(ENABLE_WIFI) && !defined(WIFI_NINA)
-    #define WIFI_NINA
-  #endif
-  //#if !defined(I2C_USE_WIRE)
-  //#define I2C_USE_WIRE
-  //#endif
-  #define SDA I2C_SDA
-  #define SCL I2C_SCL
-  
+
 /* TODO when ready 
 #elif defined(ARDUINO_ARCH_RP2040)
   #define ARDUINO_TYPE "RP2040"

version.h

@@ -3,8 +3,15 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.1.17gw"
-// 5.1.17gw - Giga support by Travis Farmer, with WifiNINA integrated to see if it works
+#define VERSION "5.2.3"
+// 5.2.3  - Bugfix: Catch stange input to parser
+// 5.2.2  - Added option to allow MAX_CHARACTER_ROWS to be defined in config.h
+// 5.2.1  - Trackmanager rework for simpler structure
+// 5.2.0  - ESP32: Autoreverse and booster mode support
+// 5.1.21 - EXRAIL invoke multiple ON handlers for same event
+// 5.1.20 - EXRAIL Tidy and ROUTE_STATE, ROUTE_CAPTION 
+// 5.1.19 - Only flag 2.2.0.0-dev as broken, not 2.2.0.0
+// 5.1.18 - TURNOUTL bugfix
 // 5.1.17 - Divide out C for config and D for diag commands
 // 5.1.16 - Remove I2C address from EXTT_TURNTABLE macro to work with MUX, requires separate HAL macro to create
 // 5.1.15 - LCC/Adapter support and Exrail feature-compile-out.