Merge b36fb352b6 into ed853eef1d

CamParser.cpp

@@ -1,95 +0,0 @@
-
-//sensorCAM parser.cpp version 3.03  Sep 2024
-#include "CamParser.h"
-#include "FSH.h"
-#include "IO_EXSensorCAM.h"
-
-#ifndef SENSORCAM_VPIN       //define CAM vpin (700?) in config.h
-#define SENSORCAM_VPIN 0     
-#endif
-#define CAM_VPIN SENSORCAM_VPIN
-#ifndef SENSORCAM2_VPIN 
-#define SENSORCAM2_VPIN CAM_VPIN
-#endif
-#ifndef SENSORCAM3_VPIN 
-#define SENSORCAM3_VPIN 0
-#endif
-const int CAMVPINS[] = {CAM_VPIN,SENSORCAM_VPIN,SENSORCAM2_VPIN,SENSORCAM3_VPIN};
-const int16_t ver=30177;
-const int16_t ve =2899;
-
-VPIN EXSensorCAM::CAMBaseVpin = CAM_VPIN;
-
-bool CamParser::parseN(Print * stream, byte paramCount, int16_t p[]) {
-  (void)stream;  // probably unused parameter 
-  VPIN vpin=EXSensorCAM::CAMBaseVpin;   //use current CAM selection
-
-  if (paramCount==0) { 
-    DIAG(F("vpin:%d EXSensorCAMs defined at Vpins #1@ %d #2@ %d #3@ %d"),vpin,CAMVPINS[1],CAMVPINS[2],CAMVPINS[3]);
-    return true; 
-  }
-  uint8_t camop=p[0]; // cam oprerator 
-  int param1=0;
-  int16_t param3=9999;   // =0 could invoke parameter changes. & -1 gives later errors
-
-  if(camop=='C'){ 
-    if(p[1]>=100) EXSensorCAM::CAMBaseVpin=p[1];
-    if(p[1]<4) EXSensorCAM::CAMBaseVpin=CAMVPINS[p[1]];
-    DIAG(F("CAM base Vpin: %c %d "),p[0],EXSensorCAM::CAMBaseVpin);
-    return true;
-  }
-  if (camop<100) {               //switch CAM# if p[1] dictates
-    if(p[1]>=100 && p[1]<400) {  //limits to CAM# 1 to 3 for now
-      vpin=CAMVPINS[p[1]/100];
-      EXSensorCAM::CAMBaseVpin=vpin;     
-      DIAG(F("switching to CAM %d baseVpin:%d"),p[1]/100,vpin); 
-      p[1]=p[1]%100;             //strip off CAM #
-    } 
-  }
-  if (EXSensorCAM::CAMBaseVpin==0) return false; // no cam defined 
-
-  
-      // send UPPER case to sensorCAM to flag binary data from a DCCEX-CS parser  
-  switch(paramCount) {    
-    case 1:                          //<N ver> produces '^'
-      if((p[0] == ve) || (p[0] == ver) || (p[0] == 'V')) camop='^'; 
-      if (STRCHR_P((const char *)F("EFGMQRVW^"),camop) == nullptr) return false;
-      if (camop=='Q') param3=10;     //<NQ> for activation state of all 10 banks of sensors
-      if (camop=='F') camop=']';     //<NF> for Reset/Finish webCAM.
-      break;    // F Coded as ']' else conflicts with <Nf %%>
-    
-    case 2:                          //<N camop p1>  
-      if (STRCHR_P((const char *)F("ABFILMNOPQRSTUV"),camop)==nullptr) return false;
-      param1=p[1];
-      break;
-    
-    case 3:              //<N vpin rowY colx > or <N cmd p1 p2>
-      camop=p[0];
-      if (p[0]>=100) {   //vpin - i.e. NOT 'A' through 'Z'
-        if (p[1]>236 || p[1]<0) return false;     //row
-        if (p[2]>316 || p[2]<0) return false;     //column
-        camop=0x80;      // special 'a' case for IO_SensorCAM
-        vpin = p[0];
-      }else if (STRCHR_P((const char *)F("IJMNT"),camop) == nullptr) return false; 
-      param1 = p[1];  
-      param3 = p[2];
-      break;
-    
-    case 4:          //<N a id row col> 
-      if (camop!='A') return false;          //must start with 'a' 
-      if (p[3]>316 || p[3]<0) return false;
-      if (p[2]>236 || p[2]<0) return false;
-      if (p[1]>97 || p[1]<0) return false;   //treat as bsNo.
-      vpin = vpin + (p[1]/10)*8 + p[1]%10;   //translate p[1]
-      camop=0x80;    // special 'a' case for IO_SensorCAM
-      param1=p[2];   // row
-      param3=p[3];   // col
-      break;
-
-    default:
-      return false;
-  }
-  DIAG(F("CamParser: %d %c %d %d"),vpin,camop,param1,param3);
-  IODevice::writeAnalogue(vpin,param1,camop,param3);
-  return true;
-}

CamParser.h

@@ -1,12 +0,0 @@
-#ifndef CamParser_H
-#define CamParser_H
-#include <Arduino.h>
-#include "IODevice.h"
-
-class CamParser {
-   public:
-   static bool parseN(Print * stream, byte paramCount, int16_t p[]);
-};
-
-
-#endif

CommandDistributor.cpp

@@ -37,7 +37,7 @@ int16_t lastclocktime;
 int8_t lastclockrate;
 
 
-#if WIFI_ON || ETHERNET_ON || defined(SERIAL1_COMMANDS) || defined(SERIAL2_COMMANDS) || defined(SERIAL3_COMMANDS) || defined(SERIAL4_COMMANDS) || defined(SERIAL5_COMMANDS) || defined(SERIAL6_COMMANDS)
+#if WIFI_ON || ETHERNET_ON || defined(SERIAL1_COMMANDS) || defined(SERIAL2_COMMANDS) || defined(SERIAL3_COMMANDS)
 // use a buffer to allow broadcast
 StringBuffer * CommandDistributor::broadcastBufferWriter=new StringBuffer();
 template<typename... Targs> void CommandDistributor::broadcastReply(clientType type, Targs... msg){
@@ -377,3 +377,4 @@ void CommandDistributor::setVirtualLCDSerial(Print * stream) {
 Print* CommandDistributor::virtualLCDSerial=&USB_SERIAL;
 byte CommandDistributor::virtualLCDClient=0xFF;
 byte CommandDistributor::rememberVLCDClient=0;
+

CommandStation-EX.ino

@@ -141,23 +141,6 @@ void setup()
   CommandDistributor::broadcastPower();
 }
 
-/**************** for future reference
-void looptimer(unsigned long timeout, const FSH* message)
-{
-  static unsigned long lasttimestamp = 0;
-  unsigned long now = micros();
-  if (timeout != 0) {
-    unsigned long diff = now - lasttimestamp;
-    if (diff > timeout) {
-      DIAG(message);
-      DIAG(F("DeltaT=%L"), diff);
-      lasttimestamp = micros();
-      return;
-    }
-  }
-  lasttimestamp = now;
-}
-*********************************************/
 void loop()
 {
   // The main sketch has responsibilities during loop()
@@ -173,7 +156,6 @@ void loop()
 #ifndef ARDUINO_ARCH_ESP32
 #if WIFI_ON
   WifiInterface::loop();
- 
 #endif //WIFI_ON
 #else  //ARDUINO_ARCH_ESP32
 #ifndef WIFI_TASK_ON_CORE0

DCCACK.cpp

@@ -483,3 +483,4 @@ void DCCACK::checkAck(byte sentResetsSincePacket) {
     }      
     ackPulseStart=0;  // We have detected a too-short or too-long pulse so ignore and wait for next leading edge 
 }
+

DCCEXParser.cpp

@@ -72,7 +72,7 @@ Once a new OPCODE is decided upon, update this list.
   M, Write DCC packet
   n, Reserved for SensorCam
   N, Reserved for Sensorcam 
-  o, Neopixel driver (see also IO_NeoPixel.h)
+  o,
   O, Output broadcast
   p, Broadcast power state
   P, Write DCC packet
@@ -117,10 +117,6 @@ Once a new OPCODE is decided upon, update this list.
 #include "Turntables.h"
 #include "version.h"
 #include "KeywordHasher.h"
-#include "CamParser.h"
-#ifdef ARDUINO_ARCH_ESP32
-#include "WifiESP32.h"
-#endif
 
 // This macro can't be created easily as a portable function because the
 // flashlist requires a far pointer for high flash access. 
@@ -144,12 +140,12 @@ byte DCCEXParser::stashTarget=0;
 // Non-DCC things like turnouts, pins and sensors are handled in additional JMRI interface classes.
 
 
-int16_t DCCEXParser::splitValues(int16_t result[MAX_COMMAND_PARAMS], byte *cmd, bool usehex)
+int16_t DCCEXParser::splitValues(int16_t result[MAX_COMMAND_PARAMS], const byte *cmd, bool usehex)
 {
     byte state = 1;
     byte parameterCount = 0;
     int16_t runningValue = 0;
-    byte *remainingCmd = cmd + 1; // skips the opcode
+    const byte *remainingCmd = cmd + 1; // skips the opcode
     bool signNegative = false;
 
     // clear all parameters in case not enough found
@@ -159,6 +155,7 @@ int16_t DCCEXParser::splitValues(int16_t result[MAX_COMMAND_PARAMS], byte *cmd,
     while (parameterCount < MAX_COMMAND_PARAMS)
     {
         byte hot = *remainingCmd;
+
         switch (state)
         {
 
@@ -172,22 +169,7 @@ int16_t DCCEXParser::splitValues(int16_t result[MAX_COMMAND_PARAMS], byte *cmd,
             state = 2;
             continue;
 
-        case 2: // checking sign or quoted string
+        case 2: // checking sign
-#ifdef HAS_ENOUGH_MEMORY
-	    if (hot == '"') {
-	      // this inserts an extra parameter 0x7777 in front
-	      // of each string parameter as a marker that can
-	      // be checked that a string parameter follows
-	      // This clashes of course with the real value
-	      // 0x7777 which we hope is used seldom
-	      result[parameterCount] = (int16_t)0x7777;
-	      parameterCount++;
-	      result[parameterCount] = (int16_t)(remainingCmd - cmd + 1);
-	      parameterCount++;
-	      state = 4;
-	      break;
-	    }
-#endif
             signNegative = false;
             runningValue = 0;
             state = 3;
@@ -218,16 +200,6 @@ int16_t DCCEXParser::splitValues(int16_t result[MAX_COMMAND_PARAMS], byte *cmd,
             parameterCount++;
             state = 1;
             continue;
-#ifdef HAS_ENOUGH_MEMORY
-	case 4: // skipover text
-	  if (hot == '\0')        // We did run to end of buffer without finding the "
-	    return -1;
-	  if (hot == '"') {
-	    *remainingCmd = '\0'; // overwrite " in command buffer with the end-of-string
-	    state = 1;
-	  }
-	  break;
-#endif
         }
         remainingCmd++;
     }
@@ -422,35 +394,6 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
             return;
         break;
 
-#ifndef IO_NO_HAL
-    case 'o':  // Neopixel pin manipulation
-        if (p[0]==0) break;
-        {  
-          VPIN vpin=p[0]>0 ? p[0]:-p[0];
-          bool setON=p[0]>0;
-          if (params==1) {  // <o [-]vpin> 
-            IODevice::write(vpin,setON);
-            return;
-          }
-          if (params==2) {  // <o [-]vpin count> 
-            IODevice::writeRange(vpin,setON,p[1]);
-            return;
-          }
-          if (params==4 || params==5) { // <z [-]vpin r g b [count]>
-             auto count=p[4]?p[4]:1;  
-             if (p[1]<0 || p[1]>0xFF) break;  
-            if (p[2]<0 || p[2]>0xFF) break;  
-            if (p[3]<0 || p[3]>0xFF) break;  
-            // strange parameter mangling... see IO_NeoPixel.h NeoPixel::_writeAnalogue
-            int colour_RG=(p[1]<<8)  | p[2];
-            uint16_t colour_B=p[3];
-            IODevice::writeAnalogueRange(vpin,colour_RG,setON,colour_B,count);
-            return;
-            }
-        }
-        break;
-#endif        
-
     case 'z':  // direct pin manipulation
         if (p[0]==0) break; 
         if (params==1) {  // <z vpin | -vpin> 
@@ -458,7 +401,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
             else IODevice::write(-p[0],LOW);
             return;
         }
-        if (params>=2 && params<=4) { // <z vpin analog profile duration> 
+        if (params>=2 && params<=4) { // <z vpin ana;og profile duration> 
             // unused params default to 0           
             IODevice::writeAnalogue(p[0],p[1],p[2],p[3]);
             return;
@@ -578,7 +521,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
         {
 	  if (params > 1) break;
 	  if (params==0) { // All
-	    TrackManager::setTrackPower(TRACK_ALL, POWERMODE::ON);
+	    TrackManager::setTrackPower(TRACK_MODE_ALL, POWERMODE::ON);
 	  }
 	  if (params==1) {
 	    if (p[0]=="MAIN"_hk) { // <1 MAIN>
@@ -611,7 +554,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
 	  if (params > 1) break;
 	  if (params==0) { // All
 	    TrackManager::setJoin(false);
-	    TrackManager::setTrackPower(TRACK_ALL, POWERMODE::OFF);
+	    TrackManager::setTrackPower(TRACK_MODE_ALL, POWERMODE::OFF);
 	  }
 	  if (params==1) {
 	    if (p[0]=="MAIN"_hk) { // <0 MAIN>
@@ -673,19 +616,6 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
         StringFormatter::send(stream, F("\n"));
         return;
     case 'C': // CONFIG <C [params]>
-#if defined(ARDUINO_ARCH_ESP32)
-// currently this only works on ESP32
-#if defined(HAS_ENOUGH_MEMORY)
-      if (p[0] == "WIFI"_hk) { 	// <C WIFI SSID PASSWORD>
-	if (params != 5)        // the 5 params 0 to 4 are (kinda): WIFI_hk 0x7777 &SSID 0x7777 &PASSWORD
-	  break;
-	if (p[1] == 0x7777 && p[3] == 0x7777) {
-	  WifiESP::setup((const char*)(com + p[2]), (const char*)(com + p[4]), WIFI_HOSTNAME, IP_PORT, WIFI_CHANNEL, WIFI_FORCE_AP);
-	}
-	return;
-      }
-#endif
-#endif //ESP32
         if (parseC(stream, params, p))
             return;
         break;
@@ -877,11 +807,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
             return;
         break;
 #endif
-#ifndef IO_NO_HAL
+
-    case 'N': // <N  commands for SensorCam
-        if (CamParser::parseN(stream,params,p)) return;
-        break;
-#endif
     case '/': // implemented in EXRAIL parser
     case 'L': // LCC interface implemented in EXRAIL parser
         break; // Will <X> if not intercepted by EXRAIL 
@@ -1185,6 +1111,7 @@ bool DCCEXParser::parseC(Print *stream, int16_t params, int16_t p[]) {
 	}
         return true;
 #endif
+
 default: // invalid/unknown
       break;
     }

DCCEXParser.h

@@ -43,7 +43,7 @@ struct DCCEXParser
    private:
   
     static const int16_t MAX_BUFFER=50;  // longest command sent in
-    static int16_t splitValues( int16_t result[MAX_COMMAND_PARAMS], byte * command, bool usehex);
+    static int16_t splitValues( int16_t result[MAX_COMMAND_PARAMS], const byte * command, bool usehex);
      
     static bool parseT(Print * stream, int16_t params, int16_t p[]);
     static bool parseZ(Print * stream, int16_t params, int16_t p[]);

DCCRMT.cpp

@@ -17,25 +17,6 @@
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*
- * RMT has "channels" which us FIFO RAM where you place what you want to send
- * or receive. Channels can be merged to get more words per channel.
- *
- * WROOM: 8 channels total of 512 words, 64 words per channel. We use currently
- * channel 0+1 for 128 words for DCC MAIN and 2+3 for DCC PROG.
- *
- * S3: 8 channels total of 384 words. 4 channels dedicated for TX and 4 channels
- * dedicated for RX. 48 words per channel. So for TX there are 4 channels and we
- * could use them with 96 words for MAIN and PROG if DCC data does fit in there.
- *
- * C3: 4 channels total of 192 words. As we do not use RX we can use all for TX
- * so the situation is the same as for the -S3
- *
- * C6, H2: 4 channels total of 192 words. 2 channels dedictaed for TX and
- * 2 channels dedicated for RX. Half RMT capacity compared to the C3.
- *
- */
-
 #if defined(ARDUINO_ARCH_ESP32)
 #include "defines.h"
 #include "DIAG.h"

DCCTimerAVR.cpp

@@ -197,8 +197,6 @@ void DCCTimer::DCCEXanalogWriteFrequency(uint8_t pin, uint32_t f) {
 }
 void DCCTimer::DCCEXanalogWriteFrequencyInternal(uint8_t pin, uint32_t fbits) {
 #if defined(ARDUINO_AVR_UNO)
-      (void)fbits;
-      (void) pin;
       // Not worth doin something here as:
       // If we are on pin 9 or 10 we are on Timer1 and we can not touch Timer1 as that is our DCC source.
       // If we are on pin 5 or 6 we are on Timer 0 ad we can not touch Timer0 as that is millis() etc.

DCCTimerESP.cpp

@@ -324,3 +324,4 @@ void ADCee::begin() {
 }
 
 #endif //ESP32
+

DCCTimerSTM32.cpp

@@ -70,9 +70,9 @@ HardwareSerial Serial5(PD2, PC12);  // Rx=PD2, Tx=PC12 -- UART5 - F446RE
       defined(ARDUINO_NUCLEO_F429ZI) || defined(ARDUINO_NUCLEO_F439ZI) || defined(ARDUINO_NUCLEO_F4X9ZI)
 // Nucleo-144 boards don't have Serial1 defined by default
 HardwareSerial Serial6(PG9, PG14);  // Rx=PG9, Tx=PG14 -- USART6
-HardwareSerial Serial2(PD6, PD5);  // Rx=PD6, Tx=PD5 -- UART2
-#if !defined(ARDUINO_NUCLEO_F412ZG)  // F412ZG does not have UART5
 HardwareSerial Serial5(PD2, PC12);  // Rx=PD2, Tx=PC12 -- UART5
+#if !defined(ARDUINO_NUCLEO_F412ZG)
+  HardwareSerial Serial2(PD6, PD5);  // Rx=PD6, Tx=PD5 -- UART5
 #endif  
 // Serial3 is defined to use USART3 by default, but is in fact used as the diag console
 // via the debugger on the Nucleo-144. It is therefore unavailable for other DCC-EX uses like WiFi, DFPlayer, etc.
@@ -328,7 +328,7 @@ void DCCTimer::DCCEXanalogWriteFrequencyInternal(uint8_t pin, uint32_t frequency
     if (pin_timer[pin] != NULL)
     {
       pin_timer[pin]->setPWM(pin_channel[pin], pin, frequency, 0); // set frequency in Hertz, 0% dutycycle
-      DIAG(F("DCCEXanalogWriteFrequency::Pin %d on Timer Channel %d, frequency %d"), pin, pin_channel[pin], frequency);
+      DIAG(F("DCCEXanalogWriteFrequency::Pin %d on Timer %d, frequency %d"), pin, pin_channel[pin], frequency);
     }
     else
       DIAG(F("DCCEXanalogWriteFrequency::failed to allocate HardwareTimer instance!"));

EXRAIL2.cpp

@@ -73,7 +73,6 @@ RMFT2 * RMFT2::pausingTask=NULL; // Task causing a PAUSE.
 byte RMFT2::flags[MAX_FLAGS];
 Print * RMFT2::LCCSerial=0;
 LookList *  RMFT2::routeLookup=NULL;
-LookList *  RMFT2::signalLookup=NULL;
 LookList *  RMFT2::onThrowLookup=NULL;
 LookList *  RMFT2::onCloseLookup=NULL;
 LookList *  RMFT2::onActivateLookup=NULL;
@@ -208,26 +207,14 @@ LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) {
   // Second pass startup, define any turnouts or servos, set signals red
   // add sequences onRoutines to the lookups
   if (compileFeatures & FEATURE_SIGNAL) {
-    
     onRedLookup=LookListLoader(OPCODE_ONRED);
     onAmberLookup=LookListLoader(OPCODE_ONAMBER);
     onGreenLookup=LookListLoader(OPCODE_ONGREEN);
-    // Load the signal lookup with slot numbers in the signal table
+    for (int sigslot=0;;sigslot++) {
-    int signalCount=0; 
+      int16_t sighandle=GETHIGHFLASHW(RMFT2::SignalDefinitions,sigslot*8);
-    for (int16_t slot=0;;slot++) {
+      if (sighandle==0) break;  // end of signal list
-        SIGNAL_DEFINITION signal=getSignalSlot(slot);
+      VPIN sigid = sighandle & SIGNAL_ID_MASK;
-        DIAG(F("Signal s=%d id=%d t=%d"),slot,signal.id,signal.type);
+      doSignal(sigid, SIGNAL_RED);
-        if (signal.type==sigtypeNoMoreSignals) break;
-        if (signal.type==sigtypeContinuation) continue;
-        signalCount++;
-    }    
-    signalLookup=new LookList(signalCount);
-    for (int16_t slot=0;;slot++) {
-        SIGNAL_DEFINITION signal=getSignalSlot(slot);
-        if (signal.type==sigtypeNoMoreSignals) break;
-        if (signal.type==sigtypeContinuation) continue;
-        signalLookup->add(signal.id,slot);
-        doSignal(signal.id, SIGNAL_RED);
     }
   }
 
@@ -312,7 +299,7 @@ LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) {
     case OPCODE_EXTTTURNTABLE: {
       VPIN id=operand;
       VPIN pin=getOperand(progCounter,1);
-      int home=getOperand(progCounter,2);
+      int home=getOperand(progCounter,3);
       setTurntableHiddenState(EXTTTurntable::create(id,pin));
       Turntable *tto=Turntable::get(id);
       tto->addPosition(0,0,home);
@@ -491,15 +478,10 @@ bool RMFT2::skipIfBlock() {
 
 
 /* static */ void RMFT2::readLocoCallback(int16_t cv) {
-  if (cv <= 0) {
-    DIAG(F("CV read error"));
-    progtrackLocoId = -1;
-    return;
-  }
   if (cv & LONG_ADDR_MARKER) {               // maker bit indicates long addr
     progtrackLocoId = cv ^ LONG_ADDR_MARKER; // remove marker bit to get real long addr
     if (progtrackLocoId <= HIGHEST_SHORT_ADDR ) {     // out of range for long addr
-      DIAG(F("Long addr %d <= %d unsupported"), progtrackLocoId, HIGHEST_SHORT_ADDR);
+      DIAG(F("Long addr %d <= %d unsupported\n"), progtrackLocoId, HIGHEST_SHORT_ADDR);
       progtrackLocoId = -1;
     }
   } else {
@@ -677,14 +659,13 @@ void RMFT2::loop2() {
     break;
 
   case OPCODE_SET:
+    killBlinkOnVpin(operand);
+    IODevice::write(operand,true);
+    break;
+    
   case OPCODE_RESET:
-    { 
+    killBlinkOnVpin(operand);
-      auto count=getOperand(1);
+    IODevice::write(operand,false);
-      for (uint16_t i=0;i<count;i++) {
-        killBlinkOnVpin(operand+i);
-        IODevice::write(operand+i,opcode==OPCODE_SET);
-      }
-    }
     break;
   
   case OPCODE_BLINK: 
@@ -940,10 +921,11 @@ void RMFT2::loop2() {
       delayMe(100);
       return; // still waiting for callback
     }
+    if (progtrackLocoId<0) {
+      kill(F("No Loco Found"),progtrackLocoId);
+      return; // still waiting for callback
+    }
     
-    // At failed read will result in loco == -1
-    // which is intended so it can be checked
-    // from within EXRAIL
     loco=progtrackLocoId;
     speedo=0;
     forward=true;
@@ -1017,16 +999,6 @@ void RMFT2::loop2() {
     break;
 
 #ifndef IO_NO_HAL
-  case OPCODE_NEOPIXEL: 
-    // OPCODE_NEOPIXEL,V([-]vpin),OPCODE_PAD,V(colour_RG),OPCODE_PAD,V(colour_B),OPCODE_PAD,V(count)
-    { 
-      VPIN vpin=operand>0?operand:-operand;
-      auto count=getOperand(3);
-      killBlinkOnVpin(vpin,count);
-      IODevice::writeAnalogueRange(vpin,getOperand(1),operand>0,getOperand(2),count);
-    }
-    break;
-  
   case OPCODE_WAITFORTT:  // OPCODE_WAITFOR,V(turntable_id)
     if (Turntable::ttMoving(operand)) {
       delayMe(100);
@@ -1148,11 +1120,26 @@ void RMFT2::kill(const FSH * reason, int operand) {
   delete this;
 }
 
+int16_t RMFT2::getSignalSlot(int16_t id) {
 
-SIGNAL_DEFINITION RMFT2::getSignalSlot(int16_t slot) {
+  if (id > 0) {
-  SIGNAL_DEFINITION signal;
+    int sigslot = 0;
-  COPYHIGHFLASH(&signal,SignalDefinitions,slot*sizeof(SIGNAL_DEFINITION),sizeof(SIGNAL_DEFINITION));
+    int16_t sighandle = 0;
-  return signal;
+    // Trundle down the signal list until we reach the end
+    while ((sighandle = GETHIGHFLASHW(RMFT2::SignalDefinitions, sigslot * 8)) != 0)
+    {
+      // sigid is the signal id used in RED/AMBER/GREEN macro
+      // for a LED signal it will be same as redpin
+      // but for a servo signal it will also have SERVO_SIGNAL_FLAG set.
+      VPIN sigid = sighandle & SIGNAL_ID_MASK;
+      if (sigid == (VPIN)id) // cast to keep compiler happy but id is positive
+        return sigslot;      // found it
+      sigslot++;             // keep looking
+    };
+  }
+  // If we got here, we did not find the signal
+  DIAG(F("EXRAIL Signal %d not defined"), id);
+  return -1;
 }
 
 /* static */ void RMFT2::doSignal(int16_t id,char rag) {
@@ -1165,97 +1152,81 @@ SIGNAL_DEFINITION RMFT2::getSignalSlot(int16_t slot) {
   else if (rag==SIGNAL_GREEN) onGreenLookup->handleEvent(F("GREEN"),id);
   else onAmberLookup->handleEvent(F("AMBER"),id);
   
-  auto sigslot=signalLookup->find(id);
+  int16_t sigslot=getSignalSlot(id);
   if (sigslot<0) return; 
   
   // keep track of signal state 
   setFlag(sigslot,rag,SIGNAL_MASK);
  
   // Correct signal definition found, get the rag values
-  auto signal=getSignalSlot(sigslot);
+  int16_t sigpos=sigslot*8; 
+  int16_t sighandle=GETHIGHFLASHW(RMFT2::SignalDefinitions,sigpos);
+  VPIN redpin=GETHIGHFLASHW(RMFT2::SignalDefinitions,sigpos+2);
+  VPIN amberpin=GETHIGHFLASHW(RMFT2::SignalDefinitions,sigpos+4);
+  VPIN greenpin=GETHIGHFLASHW(RMFT2::SignalDefinitions,sigpos+6);
+  //if (diag) DIAG(F("signal %d %d %d %d %d"),sigid,id,redpin,amberpin,greenpin);
 
-  switch (signal.type) {
+  VPIN sigtype=sighandle & ~SIGNAL_ID_MASK;
-  case sigtypeSERVO: 
+  VPIN sigid = sighandle & SIGNAL_ID_MASK;
-    { 
+
-    auto servopos = rag==SIGNAL_RED? signal.redpin: (rag==SIGNAL_GREEN? signal.greenpin : signal.amberpin);
+  if (sigtype == SERVO_SIGNAL_FLAG) {
+    // A servo signal, the pin numbers are actually servo positions
+    // Note, setting a signal to a zero position has no effect.
+    int16_t servopos= rag==SIGNAL_RED? redpin: (rag==SIGNAL_GREEN? greenpin : amberpin);
     //if (diag) DIAG(F("sigA %d %d"),id,servopos);
     if  (servopos!=0) IODevice::writeAnalogue(id,servopos,PCA9685::Bounce);
     return;  
   }
 
-  case sigtypeDCC:
+  
-   {
+  if (sigtype== DCC_SIGNAL_FLAG) {
     // redpin,amberpin are the DCC addr,subaddr 
-    DCC::setAccessory(signal.redpin,signal.amberpin, rag!=SIGNAL_RED);
+    DCC::setAccessory(redpin,amberpin, rag!=SIGNAL_RED);
     return; 
   }
 
- case sigtypeDCCX:
+ if (sigtype== DCCX_SIGNAL_FLAG) {
-  {
     // redpin,amberpin,greenpin are the 3 aspects
-    auto value=signal.redpin;
+    byte value=redpin;
-    if (rag==SIGNAL_AMBER) value=signal.amberpin;
+    if (rag==SIGNAL_AMBER) value=amberpin;
-    if (rag==SIGNAL_GREEN) value=signal.greenpin; 
+    if (rag==SIGNAL_GREEN) value=greenpin; 
-    DCC::setExtendedAccessory(id, value);
+    DCC::setExtendedAccessory(sigid, value);
     return; 
   }
 
-case sigtypeNEOPIXEL: 
-  {
-    // redpin,amberpin,greenpin are the 3 RG values but with no blue permitted. . (code limitation hack) 
-    auto colour_RG=signal.redpin;
-    if (rag==SIGNAL_AMBER) colour_RG=signal.amberpin;
-    if (rag==SIGNAL_GREEN) colour_RG=signal.greenpin; 
 
-    // blue channel is in followng signal slot (a continuation)
-    auto signal2=getSignalSlot(sigslot+1);
-    auto colour_B=signal2.redpin;
-    if (rag==SIGNAL_AMBER) colour_B=signal2.amberpin;
-    if (rag==SIGNAL_GREEN) colour_B=signal2.greenpin; 
-    IODevice::writeAnalogue(id, colour_RG,true,colour_B);
-    return; 
-  }
-  
-  case sigtypeSIGNAL:
-  case sigtypeSIGNALH:
-  {
   // LED or similar 3 pin signal, (all pins zero would be a virtual signal)
   // If amberpin is zero, synthesise amber from red+green
   const byte SIMAMBER=0x00;
-  if (rag==SIGNAL_AMBER && (signal.amberpin==0)) rag=SIMAMBER; // special case this func only
+  if (rag==SIGNAL_AMBER && (amberpin==0)) rag=SIMAMBER; // special case this func only
    
   // Manage invert (HIGH on) pins
-  bool aHigh=signal.type==sigtypeSIGNALH;
+  bool aHigh=sighandle & ACTIVE_HIGH_SIGNAL_FLAG;
       
   // set the three pins 
-  if (signal.redpin) {
+  if (redpin) {
     bool redval=(rag==SIGNAL_RED || rag==SIMAMBER);
     if (!aHigh) redval=!redval;
-    killBlinkOnVpin(signal.redpin);
+    killBlinkOnVpin(redpin);
-    IODevice::write(signal.redpin,redval);
+    IODevice::write(redpin,redval);
   }
-  if (signal.amberpin) {
+  if (amberpin) {
     bool amberval=(rag==SIGNAL_AMBER);
     if (!aHigh) amberval=!amberval;
-    killBlinkOnVpin(signal.amberpin);
+    killBlinkOnVpin(amberpin);
-    IODevice::write(signal.amberpin,amberval);
+    IODevice::write(amberpin,amberval);
   }
-  if (signal.greenpin) {
+  if (greenpin) {
     bool greenval=(rag==SIGNAL_GREEN || rag==SIMAMBER);
     if (!aHigh) greenval=!greenval;
-    killBlinkOnVpin(signal.greenpin);
+    killBlinkOnVpin(greenpin);
-    IODevice::write(signal.greenpin,greenval);
+    IODevice::write(greenpin,greenval);
-  }
-}
-  case sigtypeVIRTUAL: break;
-  case sigtypeContinuation: break;
-  case sigtypeNoMoreSignals: break;
   }
 }
 
 /* static */ bool RMFT2::isSignal(int16_t id,char rag) {
   if (!(compileFeatures & FEATURE_SIGNAL)) return false; 
-  int16_t sigslot=signalLookup->find(id);
+  int16_t sigslot=getSignalSlot(id);
   if (sigslot<0) return false; 
   return (flags[sigslot] & SIGNAL_MASK) == rag;
 }
@@ -1267,23 +1238,26 @@ case sigtypeNEOPIXEL:
 // Otherwise false so the parser should send the command directly 
 bool RMFT2::signalAspectEvent(int16_t address, byte aspect ) {
   if (!(compileFeatures & FEATURE_SIGNAL)) return false; 
-  auto sigslot=signalLookup->find(address);
+  int16_t sigslot=getSignalSlot(address);
   if (sigslot<0) return false;  // this is not a defined signal 
-  auto signal=getSignalSlot(sigslot);
+  int16_t sigpos=sigslot*8; 
-  if (signal.type!=sigtypeDCCX) return false; // not a DCCX signal
+  int16_t sighandle=GETHIGHFLASHW(RMFT2::SignalDefinitions,sigpos);
+  VPIN sigtype=sighandle & ~SIGNAL_ID_MASK;
+  VPIN sigid = sighandle & SIGNAL_ID_MASK;
+  if (sigtype!=DCCX_SIGNAL_FLAG) return false; // not a DCCX signal
   // Turn an aspect change into a RED/AMBER/GREEN setting
-  if (aspect==signal.redpin) {
+  if (aspect==GETHIGHFLASHW(RMFT2::SignalDefinitions,sigpos+2)) {
-      doSignal(address,SIGNAL_RED);
+      doSignal(sigid,SIGNAL_RED);
       return true;
   }
   
-  if (aspect==signal.amberpin) {
+  if (aspect==GETHIGHFLASHW(RMFT2::SignalDefinitions,sigpos+4)) {
-      doSignal(address,SIGNAL_AMBER);
+      doSignal(sigid,SIGNAL_AMBER);
       return true;
   }
   
-  if (aspect==signal.greenpin) {
+  if (aspect==GETHIGHFLASHW(RMFT2::SignalDefinitions,sigpos+6)) {
-      doSignal(address,SIGNAL_GREEN);
+      doSignal(sigid,SIGNAL_GREEN);
       return true;
   }
 
@@ -1337,24 +1311,19 @@ void RMFT2::powerEvent(int16_t track, bool overload) {
 // This function is used when setting pins so that a SET or RESET
 // will cause any blink task on that pin to terminate.
 // It will be compiled out of existence if no BLINK feature is used.
-void RMFT2::killBlinkOnVpin(VPIN pin, uint16_t count) {
+void RMFT2::killBlinkOnVpin(VPIN pin) {
    if (!(compileFeatures & FEATURE_BLINK)) return; 
  
-  RMFT2 * stoptask=loopTask; // stop when we get back to here
   RMFT2 * task=loopTask;
-  VPIN lastPin=pin+count-1;
   while(task) {
-    auto nextTask=task->next;
     if (
       (task->blinkState==blink_high || task->blinkState==blink_low) 
-       && task->blinkPin>=pin
+       && task->blinkPin==pin) {
-       && task->blinkPin<=lastPin
-       )    {
-        if (diag)  DIAG(F("kill blink %d"),task->blinkPin,lastPin);
         task->kill();
+        return;
       }
-    task=nextTask;
+    task=task->next;
-    if (task==stoptask) return;
+    if (task==loopTask) return;
   }
 }
   

EXRAIL2.h

@@ -76,7 +76,6 @@ enum OPCODE : byte {OPCODE_THROW,OPCODE_CLOSE,OPCODE_TOGGLE_TURNOUT,
              OPCODE_ROUTE_DISABLED,
              OPCODE_STASH,OPCODE_CLEAR_STASH,OPCODE_CLEAR_ALL_STASH,OPCODE_PICKUP_STASH,
              OPCODE_ONBUTTON,OPCODE_ONSENSOR,
-             OPCODE_NEOPIXEL,
              // OPcodes below this point are skip-nesting IF operations
              // placed here so that they may be skipped as a group
              // see skipIfBlock()
@@ -110,23 +109,6 @@ enum BlinkState: byte {
     blink_high, // blink task running with pin high 
     at_timeout  // ATTIMEOUT timed out flag
     }; 
-enum SignalType {
-       sigtypeVIRTUAL,
-       sigtypeSIGNAL, 
-       sigtypeSIGNALH, 
-       sigtypeDCC,
-       sigtypeDCCX,
-       sigtypeSERVO,
-       sigtypeNEOPIXEL,
-       sigtypeContinuation,  // neopixels require a second line
-       sigtypeNoMoreSignals
-       }; 
-
-  struct SIGNAL_DEFINITION {
-       SignalType type;
-       VPIN id;  
-       VPIN  redpin,amberpin,greenpin; 
-  };
 
   // Flag bits for compile time features.
   static const byte FEATURE_SIGNAL= 0x80;
@@ -188,6 +170,11 @@ class LookList {
     static void rotateEvent(int16_t id, bool change);
     static void powerEvent(int16_t track, bool overload);
     static bool signalAspectEvent(int16_t address, byte aspect );    
+    static const int16_t SERVO_SIGNAL_FLAG=0x4000;
+    static const int16_t ACTIVE_HIGH_SIGNAL_FLAG=0x2000;
+    static const int16_t DCC_SIGNAL_FLAG=0x1000;
+    static const int16_t DCCX_SIGNAL_FLAG=0x3000;
+    static const int16_t SIGNAL_ID_MASK=0x0FFF;
  // Throttle Info Access functions built by exrail macros 
   static const byte rosterNameCount;
   static const int16_t HIGHFLASH routeIdList[];
@@ -203,7 +190,6 @@ class LookList {
   static void startNonRecursiveTask(const FSH* reason, int16_t id,int pc);
   static bool readSensor(uint16_t sensorId);
   static bool isSignal(int16_t id,char rag); 
-  static SIGNAL_DEFINITION getSignalSlot(int16_t slotno); 
    
 private: 
     static void ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16_t p[]);
@@ -213,6 +199,7 @@ private:
     static bool getFlag(VPIN id,byte mask); 
     static int16_t progtrackLocoId;
     static void doSignal(int16_t id,char rag); 
+    static int16_t getSignalSlot(int16_t id);
     static void setTurnoutHiddenState(Turnout * t);
     #ifndef IO_NO_HAL
     static void setTurntableHiddenState(Turntable * tto);
@@ -220,7 +207,7 @@ private:
     static LookList* LookListLoader(OPCODE op1,
                       OPCODE op2=OPCODE_ENDEXRAIL,OPCODE op3=OPCODE_ENDEXRAIL);
     static uint16_t getOperand(int progCounter,byte n);
-    static void killBlinkOnVpin(VPIN pin,uint16_t count=1);
+    static void killBlinkOnVpin(VPIN pin);
     static RMFT2 * loopTask;
     static RMFT2 * pausingTask;
     void delayMe(long millisecs);
@@ -236,11 +223,10 @@ private:
     
    static bool diag;
    static const  HIGHFLASH3  byte RouteCode[];
-   static const  HIGHFLASH  SIGNAL_DEFINITION SignalDefinitions[];
+   static const  HIGHFLASH  int16_t SignalDefinitions[];
    static byte flags[MAX_FLAGS];
    static Print * LCCSerial;
    static LookList * routeLookup;
-   static LookList * signalLookup;
    static LookList * onThrowLookup;
    static LookList * onCloseLookup;
    static LookList * onActivateLookup;

EXRAIL2MacroReset.h

@@ -99,9 +99,6 @@
 #undef LCCX 
 #undef LCN 
 #undef MOVETT
-#undef NEOPIXEL
-#undef NEOPIXEL_OFF
-#undef NEOPIXEL_SIGNAL
 #undef ACON
 #undef ACOF
 #undef ONACON
@@ -219,7 +216,7 @@
 #define CONFIGURE_SERVO(vpin,pos1,pos2,profile) 
 #define DCC_SIGNAL(id,add,subaddr)
 #define DCCX_SIGNAL(id,redAspect,amberAspect,greenAspect)
-#define DCC_TURNTABLE(id,home,description...)
+#define DCC_TURNTABLE(id,home,description)
 #define DEACTIVATE(addr,subaddr)
 #define DEACTIVATEL(addr)
 #define DELAY(mindelay)
@@ -233,7 +230,7 @@
 #define ENDTASK
 #define ESTOP 
 #define EXRAIL
-#define EXTT_TURNTABLE(id,vpin,home,description...)
+#define EXTT_TURNTABLE(id,vpin,home,description)
 #define FADE(pin,value,ms)
 #define FOFF(func)
 #define FOLLOW(route) 
@@ -272,8 +269,6 @@
 #define LCN(msg) 
 #define MESSAGE(msg)
 #define MOVETT(id,steps,activity)
-#define NEOPIXEL(id,r,g,b,count...)
-#define NEOPIXEL_SIGNAL(sigid,redcolour,ambercolour,greencolour)
 #define ACON(eventid)
 #define ACOF(eventid)
 #define ONACON(eventid)
@@ -309,7 +304,7 @@
 #define READ_LOCO 
 #define RED(signal_id) 
 #define RESERVE(blockid) 
-#define RESET(pin,count...) 
+#define RESET(pin) 
 #define RESUME 
 #define RETURN 
 #define REV(speed) 
@@ -335,7 +330,7 @@
 #define SERVO2(id,position,duration) 
 #define SERVO_SIGNAL(vpin,redpos,amberpos,greenpos)
 #define SERVO_TURNOUT(id,pin,activeAngle,inactiveAngle,profile,description...) 
-#define SET(pin,count...) 
+#define SET(pin) 
 #define SET_TRACK(track,mode)
 #define SET_POWER(track,onoff)
 #define SETLOCO(loco) 

EXRAIL2Parser.cpp

@@ -252,13 +252,13 @@ bool RMFT2::parseSlash(Print * stream, byte & paramCount, int16_t p[]) {
       // do the signals
       // flags[n] represents the state of the nth signal in the table 
       for (int sigslot=0;;sigslot++) {
-        SIGNAL_DEFINITION slot=getSignalSlot(sigslot);
+        int16_t sighandle=GETHIGHFLASHW(RMFT2::SignalDefinitions,sigslot*8);
-        if (slot.type==sigtypeNoMoreSignals) break; // end of signal list
+        if (sighandle==0) break; // end of signal list
-	      if (slot.type==sigtypeContinuation) continue; // continueation of previous line
+	VPIN sigid = sighandle & SIGNAL_ID_MASK;
-	      byte flag=flags[sigslot] & SIGNAL_MASK; // obtain signal flags for this ids
+	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"),
-			      slot.id);
+			      sigid);
       } 
     }
 
@@ -363,3 +363,4 @@ bool RMFT2::parseSlash(Print * stream, byte & paramCount, int16_t p[]) {
     return false;
   }
 }
+

EXRAILMacros.h

@@ -63,10 +63,6 @@
 // playing sounds with IO_I2CDFPlayer
 #define PLAYSOUND ANOUT
 
-// SEG7 is a helper to create ANOUT from a 7-segment request
-#define SEG7(vpin,value,format) \
-   ANOUT(vpin,(value & 0xFFFF),TM1638::DF_##format,((uint32_t)value)>>16)
-
 // helper macro to strip leading zeros off time inputs
 // (10#mins)%100)
 #define STRIP_ZERO(value) 10##value%100
@@ -75,8 +71,6 @@
 //const byte TRACK_POWER_0=0, TRACK_POWER_OFF=0;    
 //const byte TRACK_POWER_1=1, TRACK_POWER_ON=1;   
 
-// NEOPIXEL RG generator for NEOPIXEL_SIGNAL 
-#define NeoRGB(red,green,blue) (((uint32_t)(red & 0xff)<<16) | ((uint32_t)(green & 0xff)<<8) | (uint32_t)(blue & 0xff))  
 
 // Pass 1 Implements aliases 
 #include "EXRAIL2MacroReset.h"
@@ -186,8 +180,6 @@ bool exrailHalSetup() {
 #define DCC_SIGNAL(id,addr,subaddr) | FEATURE_SIGNAL
 #undef DCCX_SIGNAL
 #define DCCX_SIGNAL(id,redAspect,amberAspect,greenAspect) | FEATURE_SIGNAL
-#undef NEOPIXEL_SIGNAL
-#define NEOPIXEL_SIGNAL(sigid,redcolour,ambercolour,greencolour) | FEATURE_SIGNAL
 #undef VIRTUAL_SIGNAL
 #define VIRTUAL_SIGNAL(id) | FEATURE_SIGNAL
 
@@ -429,26 +421,21 @@ const FSH * RMFT2::getRosterFunctions(int16_t id) {
 // Pass 8 Signal definitions
 #include "EXRAIL2MacroReset.h"
 #undef SIGNAL
-#define SIGNAL(redpin,amberpin,greenpin) {sigtypeSIGNAL,redpin,redpin,amberpin,greenpin}, 
+#define SIGNAL(redpin,amberpin,greenpin) redpin,redpin,amberpin,greenpin, 
 #undef SIGNALH
-#define SIGNALH(redpin,amberpin,greenpin) {sigtypeSIGNALH,redpin,redpin,amberpin,greenpin}, 
+#define SIGNALH(redpin,amberpin,greenpin) redpin | RMFT2::ACTIVE_HIGH_SIGNAL_FLAG,redpin,amberpin,greenpin, 
 #undef SERVO_SIGNAL
-#define SERVO_SIGNAL(vpin,redval,amberval,greenval) {sigtypeSERVO,vpin,redval,amberval,greenval}, 
+#define SERVO_SIGNAL(vpin,redval,amberval,greenval) vpin | RMFT2::SERVO_SIGNAL_FLAG,redval,amberval,greenval, 
 #undef DCC_SIGNAL
-#define DCC_SIGNAL(id,addr,subaddr) {sigtypeDCC,id,addr,subaddr,0},
+#define DCC_SIGNAL(id,addr,subaddr) id | RMFT2::DCC_SIGNAL_FLAG,addr,subaddr,0,
 #undef DCCX_SIGNAL
-#define DCCX_SIGNAL(id,redAspect,amberAspect,greenAspect) {sigtypeDCCX,id,redAspect,amberAspect,greenAspect},
+#define DCCX_SIGNAL(id,redAspect,amberAspect,greenAspect) id | RMFT2::DCCX_SIGNAL_FLAG,redAspect,amberAspect,greenAspect,
-#undef NEOPIXEL_SIGNAL
-#define NEOPIXEL_SIGNAL(id,redRGB,amberRGB,greenRGB) \
-        {sigtypeNEOPIXEL,id,((VPIN)((redRGB)>>8)), ((VPIN)((amberRGB)>>8)), ((VPIN)((greenRGB)>>8))},\
-        {sigtypeContinuation,id,((VPIN)((redRGB) & 0xff)), ((VPIN)((amberRGB) & 0xFF)), ((VPIN)((greenRGB) & 0xFF))},
 #undef VIRTUAL_SIGNAL
-#define VIRTUAL_SIGNAL(id) {sigtypeVIRTUAL,id,0,0,0},
+#define VIRTUAL_SIGNAL(id) id,0,0,0,
 
-const  HIGHFLASH  SIGNAL_DEFINITION RMFT2::SignalDefinitions[] = {
+const  HIGHFLASH  int16_t RMFT2::SignalDefinitions[] = {
     #include "myAutomation.h"
-     {sigtypeNoMoreSignals,0,0,0,0}
+    0,0,0,0 };
-    };
 
 // Pass 9 ONLCC/ ONMERG counter and lookup array
 #include "EXRAIL2MacroReset.h"
@@ -565,12 +552,6 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
 #define LCN(msg) PRINT(msg)
 #define MESSAGE(msg) PRINT(msg)
 #define MOVETT(id,steps,activity) OPCODE_SERVO,V(id),OPCODE_PAD,V(steps),OPCODE_PAD,V(EXTurntable::activity),OPCODE_PAD,V(0),
-#define NEOPIXEL(id,r,g,b,count...) OPCODE_NEOPIXEL,V(id),\
-        OPCODE_PAD,V(((r & 0xff)<<8) | (g & 0xff)),\
-        OPCODE_PAD,V((b & 0xff)),\
-        OPCODE_PAD,V(#count[0]?(count+0):1),
-         
-#define NEOPIXEL_SIGNAL(sigid,redcolour,ambercolour,greencolour)
 #define ONACTIVATE(addr,subaddr) OPCODE_ONACTIVATE,V(addr<<2|subaddr),
 #define ONACTIVATEL(linear) OPCODE_ONACTIVATE,V(linear+3),
 #define ONAMBER(signal_id) OPCODE_ONAMBER,V(signal_id),
@@ -607,7 +588,7 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
 #define READ_LOCO OPCODE_READ_LOCO1,0,0,OPCODE_READ_LOCO2,0,0,
 #define RED(signal_id) OPCODE_RED,V(signal_id),
 #define RESERVE(blockid) OPCODE_RESERVE,V(blockid),
-#define RESET(pin,count...) OPCODE_RESET,V(pin),OPCODE_PAD,V(#count[0] ? count+0: 1),
+#define RESET(pin) OPCODE_RESET,V(pin),
 #define RESUME OPCODE_RESUME,0,0,
 #define RETURN OPCODE_RETURN,0,0,
 #define REV(speed) OPCODE_REV,V(speed),
@@ -635,7 +616,7 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
 #define SERVO2(id,position,ms) OPCODE_SERVO,V(id),OPCODE_PAD,V(position),OPCODE_PAD,V(PCA9685::Instant),OPCODE_PAD,V(ms/100L),
 #define SERVO_SIGNAL(vpin,redpos,amberpos,greenpos)
 #define SERVO_TURNOUT(id,pin,activeAngle,inactiveAngle,profile,description...) OPCODE_SERVOTURNOUT,V(id),OPCODE_PAD,V(pin),OPCODE_PAD,V(activeAngle),OPCODE_PAD,V(inactiveAngle),OPCODE_PAD,V(PCA9685::ProfileType::profile),
-#define SET(pin,count...) OPCODE_SET,V(pin),OPCODE_PAD,V(#count[0] ? count+0: 1),
+#define SET(pin) OPCODE_SET,V(pin),
 #define SET_TRACK(track,mode)  OPCODE_SET_TRACK,V(TRACK_MODE_##mode  <<8 | TRACK_NUMBER_##track),
 #define SET_POWER(track,onoff) OPCODE_SET_POWER,V(TRACK_POWER_##onoff),OPCODE_PAD, V(TRACK_NUMBER_##track),
 #define SETLOCO(loco) OPCODE_SETLOCO,V(loco),

EthernetInterface.cpp

@@ -1,10 +1,8 @@
 /*
- *  © 2024 Morten "Doc" Nielsen
- *  © 2023-2024 Paul M. Antoine
  *  © 2022 Bruno Sanches
  *  © 2021 Fred Decker
  *  © 2020-2022 Harald Barth
- *  © 2020-2024 Chris Harlow
+ *  © 2020-2021 Chris Harlow
  *  © 2020 Gregor Baues
  *  All rights reserved.
  *  
@@ -31,139 +29,76 @@
 #include "CommandDistributor.h"
 #include "WiThrottle.h"
 #include "DCCTimer.h"
-#if __has_include ( "MDNS_Generic.h")
-  #include "MDNS_Generic.h"
-  #define DO_MDNS 
-  EthernetUDP udp;
-  MDNS mdns(udp);
-#endif
-
-
-//extern void looptimer(unsigned long timeout, const FSH* message);
-#define looptimer(a,b)
-
-bool EthernetInterface::connected=false;
-EthernetServer * EthernetInterface::server= nullptr;
-EthernetClient EthernetInterface::clients[MAX_SOCK_NUM];                // accept up to MAX_SOCK_NUM client connections at the same time; This depends on the chipset used on the Shield
-bool EthernetInterface::inUse[MAX_SOCK_NUM];                // accept up to MAX_SOCK_NUM client connections at the same time; This depends on the chipset used on the Shield
-uint8_t EthernetInterface::buffer[MAX_ETH_BUFFER+1];                    // buffer used by TCP for the recv
-RingStream * EthernetInterface::outboundRing = nullptr;
 
+EthernetInterface * EthernetInterface::singleton=NULL;
 /**
  * @brief Setup Ethernet Connection
  * 
  */
-
 void EthernetInterface::setup()
 {
-  DIAG(F("Ethernet starting"
+  if (singleton!=NULL) {
-  #ifdef DO_MDNS
+    DIAG(F("Prog Error!"));
-    " (with mDNS)"
+    return;
-  #endif 
+  }
-    " Please be patient, especially if no cable is connected!"
+  if ((singleton=new EthernetInterface()))
-  ));
+    return;
+  DIAG(F("Ethernet not initialized"));
+};
 
-  #ifdef STM32_ETHERNET
-    // Set a HOSTNAME for the DHCP request - a nice to have, but hard it seems on LWIP for STM32
-    // The default is "lwip", which is **always** set in STM32Ethernet/src/utility/ethernetif.cpp
-    // for some reason. One can edit it to instead read:
-    //      #if LWIP_NETIF_HOSTNAME
-    //      /* Initialize interface hostname */
-    //      if (netif->hostname == NULL)
-    //         netif->hostname = "lwip";
-    //      #endif /* LWIP_NETIF_HOSTNAME */
-    // Which seems more useful! We should propose the patch... so the following line actually works!
-    netif_set_hostname(&gnetif, WIFI_HOSTNAME);   // Should probably be passed in the contructor...
-  #endif   
-
-    byte mac[6];
-    DCCTimer::getSimulatedMacAddress(mac);
 
 #ifdef IP_ADDRESS
 static IPAddress myIP(IP_ADDRESS);
+#endif
+
+/**
+ * @brief Aquire IP Address from DHCP and start server
+ * 
+ * @return true 
+ * @return false 
+ */
+EthernetInterface::EthernetInterface()
+{
+    byte mac[6];
+    DCCTimer::getSimulatedMacAddress(mac);
+    connected=false;
+   
+#ifdef IP_ADDRESS
     Ethernet.begin(mac, myIP);
 #else
     if (Ethernet.begin(mac) == 0)
     {
-    LCD(4,F("IP: No DHCP"));
+        DIAG(F("Ethernet.begin FAILED"));
         return;
     } 
 #endif
-
+    if (Ethernet.hardwareStatus() == EthernetNoHardware) {
-  auto ip = Ethernet.localIP();    // look what IP was obtained (dynamic or static)
+      DIAG(F("Ethernet shield not found or W5100"));
-  if (!ip) {
-    LCD(4,F("IP: None"));
-    return;
-  }
-  server = new EthernetServer(IP_PORT); // Ethernet Server listening on default port IP_PORT
-  server->begin();
-
-  // Arrange display of IP address and port
-  #ifdef LCD_DRIVER
-    const byte lcdData[]={LCD_DRIVER};
-    const bool wideDisplay=lcdData[1]>=24; // data[1] is cols. 
-  #else 
-    const bool wideDisplay=true;
-  #endif    
-  if (wideDisplay) {
-    // OLEDS or just usb diag is ok on one line. 
-    LCD(4,F("IP %d.%d.%d.%d:%d"), ip[0], ip[1], ip[2], ip[3], IP_PORT);    
-  } 
-  else { // LCDs generally too narrow, so take 2 lines
-    LCD(4,F("IP %d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
-    LCD(5,F("Port %d"), IP_PORT);
     }
   
-  outboundRing=new RingStream(OUTBOUND_RING_SIZE);
+    unsigned long startmilli = millis();
-  #ifdef DO_MDNS
+    while ((millis() - startmilli) < 5500) { // Loop to give time to check for cable connection
-    mdns.begin(Ethernet.localIP(), WIFI_HOSTNAME); // hostname
+        if (Ethernet.linkStatus() == LinkON)
-    mdns.addServiceRecord(WIFI_HOSTNAME "._withrottle", IP_PORT, MDNSServiceTCP);
+            break;
-  // Not sure if we need to run it once, but just in case!
+        DIAG(F("Ethernet waiting for link (1sec) "));
-    mdns.run();
+        delay(1000);
-  #endif  
+    }
-  connected=true;    
+    // now we either do have link of we have a W5100
+    // where we do not know if we have link. That's
+    // the reason to now run checkLink.
+    // CheckLinks sets up outboundRing if it does
+    // not exist yet as well.
+    checkLink();
 }
 
-#if defined (STM32_ETHERNET)
+/**
-void EthernetInterface::acceptClient() { // STM32 version
+ * @brief Cleanup any resources
-  auto client=server->available();
+ * 
-  if (!client) return;
+ * @return none
-  // check for existing client
+ */
-  for (byte socket = 0; socket < MAX_SOCK_NUM; socket++)
+EthernetInterface::~EthernetInterface() {
-    if (inUse[socket] && client == clients[socket]) return;
+  delete server;
-      
+  delete outboundRing;
-  // new client
-  for (byte socket = 0; socket < MAX_SOCK_NUM; socket++)
-  {
-    if (!inUse[socket])
-    {
-      clients[socket] = client;
-      inUse[socket]=true;
-      if (Diag::ETHERNET)
-        DIAG(F("Ethernet: New client socket %d"), socket);
-      return;
-    }
-  }
-  DIAG(F("Ethernet OVERFLOW"));
-}
-#else
-void EthernetInterface::acceptClient() { // non-STM32 version
-  auto client=server->accept();
-  if (!client) return;
-  auto socket=client.getSocketNumber();
-  clients[socket]=client;
-  inUse[socket]=true;
-  if (Diag::ETHERNET)
-    DIAG(F("Ethernet: New client socket %d"), socket);
-}
-#endif
-
-void EthernetInterface::dropClient(byte socket) 
-{ 
-  clients[socket].stop();
-  inUse[socket]=false;
-  CommandDistributor::forget(socket);
-	if (Diag::ETHERNET)  DIAG(F("Ethernet: Disconnect %d "), socket);  
 }
 
 /**
@@ -172,109 +107,134 @@ void EthernetInterface::dropClient(byte socket)
  */
 void EthernetInterface::loop()
 {
-    if (!connected) return;
+    if (!singleton || (!singleton->checkLink()))
-    looptimer(5000, F("E.loop"));
-	      
-    static bool warnedAboutLink=false;
-    if (Ethernet.linkStatus() == LinkOFF){
-        if (warnedAboutLink) return;
-        DIAG(F("Ethernet link OFF"));
-        warnedAboutLink=true;
       return;
-    }
-    looptimer(5000, F("E.loop warn"));
     
-    // link status must be ok here 
-    if (warnedAboutLink) {
-      DIAG(F("Ethernet link RESTORED"));
-      warnedAboutLink=false;
-    } 
-    
-  #ifdef DO_MDNS
-    // Always do this because we don't want traffic to intefere with being found!
-    mdns.run();
-    looptimer(5000, F("E.mdns"));
-	  
-  #endif
-
-    //
     switch (Ethernet.maintain()) {
     case 1:
         //renewed fail
         DIAG(F("Ethernet Error: renewed fail"));
-        connected=false;
+        singleton=NULL;
         return;
     case 3:
         //rebind fail
         DIAG(F("Ethernet Error: rebind fail"));
-        connected=false;
+        singleton=NULL;
         return;
     default:
         //nothing happened
-        //DIAG(F("maintained"));
         break;
     }
-    looptimer(5000, F("E.maintain"));
+   singleton->loop2();
+}
 
+/**
+ * @brief Checks ethernet link cable status and detects when it connects / disconnects
+ * 
+ * @return true when cable is connected, false otherwise
+ */
+bool EthernetInterface::checkLink() {
+  if (Ethernet.linkStatus() != LinkOFF) { // check for not linkOFF instead of linkON as the W5100 does return LinkUnknown
+    //if we are not connected yet, setup a new server
+    if(!connected) {
+      DIAG(F("Ethernet cable connected"));
+      connected=true;
+      #ifdef IP_ADDRESS
+      Ethernet.setLocalIP(myIP);      // for static IP, set it again
+      #endif
+      IPAddress ip = Ethernet.localIP();    // look what IP was obtained (dynamic or static)
+      server = new EthernetServer(IP_PORT); // Ethernet Server listening on default port IP_PORT
+      server->begin();
+      LCD(4,F("IP: %d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
+      LCD(5,F("Port:%d"), IP_PORT);
+      // only create a outboundRing it none exists, this may happen if the cable
+      // gets disconnected and connected again
+      if(!outboundRing)
+	outboundRing=new RingStream(OUTBOUND_RING_SIZE);
+    }
+    return true;
+  } else { // connected
+    DIAG(F("Ethernet cable disconnected"));
+    connected=false;
+    //clean up any client
+    for (byte socket = 0; socket < MAX_SOCK_NUM; socket++) {
+      if(clients[socket].connected())
+	clients[socket].stop();
+    }
+    // tear down server
+    delete server;
+    server = nullptr;
+    LCD(4,F("IP: None"));
+  }
+  return false;
+}
+
+void EthernetInterface::loop2() {
+    if (!outboundRing) { // no idea to call loop2() if we can't handle outgoing data in it
+      if (Diag::ETHERNET) DIAG(F("No outboundRing"));
+      return;
+    }
     // get client from the server
-    acceptClient();
+    EthernetClient client = server->accept();
 
-    // handle disconnected sockets because STM32 library doesnt
+    // check for new client
-    // do the read==0 response.
+    if (client)
-    for (byte socket = 0; socket < MAX_SOCK_NUM; socket++)
     {
-      if (inUse[socket] && !clients[socket].connected()) dropClient(socket);
+        if (Diag::ETHERNET) DIAG(F("Ethernet: New client "));
+        byte socket;
+        for (socket = 0; socket < MAX_SOCK_NUM; socket++)
+        {
+            if (!clients[socket])
+            {
+                // On accept() the EthernetServer doesn't track the client anymore
+                // so we store it in our client array
+                if (Diag::ETHERNET) DIAG(F("Socket %d"),socket);
+                clients[socket] = client;
+                break;
+            }
+        }
+        if (socket==MAX_SOCK_NUM) DIAG(F("new Ethernet OVERFLOW")); 
     }
 
     // check for incoming data from all possible clients
     for (byte socket = 0; socket < MAX_SOCK_NUM; socket++)
     {
-      if (!inUse[socket]) continue; // socket is not in use
+        if (clients[socket]) {
         
-	    // read any bytes from this client
+        int available=clients[socket].available();
-	    auto count = clients[socket].read(buffer, MAX_ETH_BUFFER);
+        if (available > 0) {
-      
+            if (Diag::ETHERNET)  DIAG(F("Ethernet: available socket=%d,avail=%d"), socket, available);
-      if (count<0) continue;  // -1 indicates nothing to read
+            // read bytes from a client
-	    
+            int count = clients[socket].read(buffer, MAX_ETH_BUFFER);
-      if (count > 0) {  // we have incoming data 
             buffer[count] = '\0'; // terminate the string properly
-	      if (Diag::ETHERNET) DIAG(F("Ethernet s=%d, c=%d b=:%e"), socket, count, buffer);
+            if (Diag::ETHERNET) DIAG(F(",count=%d:%e"), socket,buffer);
             // execute with data going directly back
             CommandDistributor::parse(socket,buffer,outboundRing);
-	      //looptimer(5000, F("Ethloop2 parse"));
             return; // limit the amount of processing that takes place within 1 loop() cycle. 
           }
+        }
+    }
 
-      // count=0 The client has disconnected
+    // stop any clients which disconnect
-	    dropClient(socket);
+   for (int socket = 0; socket<MAX_SOCK_NUM; socket++) {
+     if (clients[socket] && !clients[socket].connected()) {
+      clients[socket].stop();
+      CommandDistributor::forget(socket);          
+      if (Diag::ETHERNET)  DIAG(F("Ethernet: disconnect %d "), socket);             
+     }
     }
 
     WiThrottle::loop(outboundRing);
     
     // handle at most 1 outbound transmission 
-    auto socketOut=outboundRing->read();
+    int socketOut=outboundRing->read();
-    if (socketOut<0) return;  // no outbound pending
-
     if (socketOut >= MAX_SOCK_NUM) {
-      // This is a catastrophic code failure and unrecoverable.  
+      DIAG(F("Ethernet outboundRing socket=%d error"), socketOut);
-      DIAG(F("Ethernet outboundRing s=%d error"), socketOut);
+    } else if (socketOut >= 0) {
-      connected=false;
+      int count=outboundRing->count();
-      return;
+      if (Diag::ETHERNET) DIAG(F("Ethernet reply socket=%d, count=:%d"), socketOut,count);
+      for(;count>0;count--)  clients[socketOut].write(outboundRing->read());
+      clients[socketOut].flush(); //maybe 
     }
-
-    auto count=outboundRing->count();
-    {
-	    char tmpbuf[count+1]; // one extra for '\0'
-	    for(int i=0;i<count;i++) {
-	      tmpbuf[i] = outboundRing->read();
-	    }
-	    tmpbuf[count]=0;
-      if (inUse[socketOut]) {
-  	    if (Diag::ETHERNET) DIAG(F("Ethernet reply s=%d, c=%d, b:%e"),
-                              socketOut,count,tmpbuf);
-	      clients[socketOut].write(tmpbuf,count);
-      }
-    }
-    
 }
 #endif

EthernetInterface.h

@@ -1,10 +1,8 @@
 /*
- *  © 2023-2024 Paul M. Antoine
  *  © 2021 Neil McKechnie
  *  © 2021 Mike S
  *  © 2021 Fred Decker
- *  © 2020-2022 Harald Barth
+ *  © 2020-2021 Chris Harlow
- *  © 2020-2024 Chris Harlow
  *  © 2020 Gregor Baues
  *  All rights reserved.
  *  
@@ -37,15 +35,6 @@
 #if defined (ARDUINO_TEENSY41)
  #include <NativeEthernet.h>         //TEENSY Ethernet Treiber
  #include <NativeEthernetUdp.h>   
- #define MAX_SOCK_NUM 4
-#elif defined (ARDUINO_NUCLEO_F429ZI) || defined (ARDUINO_NUCLEO_F439ZI) || defined (ARDUINO_NUCLEO_F4X9ZI)
- #include <LwIP.h>
-//  #include "STM32lwipopts.h"
- #include <STM32Ethernet.h>
- #include <lwip/netif.h>
- extern "C" struct netif gnetif;
- #define STM32_ETHERNET
- #define MAX_SOCK_NUM 8
 #else
  #include "Ethernet.h"
 #endif
@@ -56,7 +45,7 @@
  * 
  */
 
-#define MAX_ETH_BUFFER 128
+#define MAX_ETH_BUFFER 512
 #define OUTBOUND_RING_SIZE 2048
 
 class EthernetInterface {
@@ -67,15 +56,16 @@ class EthernetInterface {
      static void loop();
    
  private:
-    static bool connected;
+    static EthernetInterface * singleton;
-    static EthernetServer * server;
+    bool connected;
-    static EthernetClient clients[MAX_SOCK_NUM];                // accept up to MAX_SOCK_NUM client connections at the same time; This depends on the chipset used on the Shield
+    EthernetInterface();
-    static bool inUse[MAX_SOCK_NUM];                // accept up to MAX_SOCK_NUM client connections at the same time; This depends on the chipset used on the Shield
+    ~EthernetInterface();
-    static uint8_t buffer[MAX_ETH_BUFFER+1];                    // buffer used by TCP for the recv
+    void loop2();
-    static RingStream * outboundRing;
+    bool checkLink();
-    static void acceptClient();
+    EthernetServer * server = NULL;
-    static void dropClient(byte socketnum);
+    EthernetClient clients[MAX_SOCK_NUM];                // accept up to MAX_SOCK_NUM client connections at the same time; This depends on the chipset used on the Shield
-    
+    uint8_t buffer[MAX_ETH_BUFFER+1];                    // buffer used by TCP for the recv
+    RingStream * outboundRing = NULL;
 };
 
 #endif

FSH.h

@@ -52,7 +52,6 @@ typedef __FlashStringHelper FSH;
 #define STRNCPY_P strncpy_P
 #define STRNCMP_P strncmp_P
 #define STRLEN_P strlen_P
-#define STRCHR_P strchr_P 
 
 #if defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560)
 // AVR_MEGA memory deliberately placed at end of link may need _far functions
@@ -61,8 +60,6 @@ typedef __FlashStringHelper FSH;
 #define GETFARPTR(data) pgm_get_far_address(data)
 #define GETHIGHFLASH(data,offset) pgm_read_byte_far(GETFARPTR(data)+offset)
 #define GETHIGHFLASHW(data,offset) pgm_read_word_far(GETFARPTR(data)+offset)
-#define COPYHIGHFLASH(target,base,offset,length) \
-  memcpy_PF(target,GETFARPTR(base) + offset,length)  
 #else
 // AVR_UNO/NANO runtime does not support _far functions so just use _near equivalent
 // as there is no progmem above 32kb anyway.
@@ -71,8 +68,6 @@ typedef __FlashStringHelper FSH;
 #define GETFARPTR(data) ((uint32_t)(data))
 #define GETHIGHFLASH(data,offset) pgm_read_byte_near(GETFARPTR(data)+(offset))
 #define GETHIGHFLASHW(data,offset) pgm_read_word_near(GETFARPTR(data)+(offset))
-#define COPYHIGHFLASH(target,base,offset,length) \
-  memcpy_P(target,(byte *)base + offset,length)  
 #endif
 
 #else 
@@ -92,13 +87,10 @@ typedef char FSH;
 #define GETFLASH(addr) (*(const byte *)(addr))
 #define GETHIGHFLASH(data,offset)  (*(const byte *)(GETFARPTR(data)+offset))
 #define GETHIGHFLASHW(data,offset) (*(const uint16_t *)(GETFARPTR(data)+offset))
-#define COPYHIGHFLASH(target,base,offset,length) \
-  memcpy(target,(byte *)&base + offset,length)  
 #define STRCPY_P strcpy
 #define STRCMP_P strcmp
 #define STRNCPY_P strncpy
 #define STRNCMP_P strncmp
 #define STRLEN_P strlen
-#define STRCHR_P strchr
 #endif
 #endif

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202411091200Z"
+#define GITHUB_SHA "devel-202408080849Z"

I2CManager.cpp

@@ -46,37 +46,27 @@
 
 // Helper function for listing device types
 static const FSH * guessI2CDeviceType(uint8_t address) {
-  if (address == 0x1A)
-    // 0x09-0x18 selectable, but for now handle the default
-    return F("Piicodev 865/915MHz Transceiver");
-  if (address == 0x1C)
-    return F("QMC6310 Magnetometer");
   if (address >= 0x20 && address <= 0x26)
     return F("GPIO Expander");
-  if (address == 0x27)
+  else if (address == 0x27)
     return F("GPIO Expander or LCD Display");
-  if (address == 0x29)
+  else if (address == 0x29)
     return F("Time-of-flight sensor");
-  if (address == 0x34)
+  else if (address >= 0x3c && address <= 0x3d)
-    return F("TCA8418 keypad scanner");
+    return F("OLED Display");
-  if (address >= 0x3c && address <= 0x3d)
+  else if (address >= 0x48 && address <= 0x57) // SC16IS752x UART detection
-    // 0x3c can also be an HMC883L magnetometer
-    return F("OLED Display or HMC583L Magnetometer");
-  if (address >= 0x48 && address <= 0x57) // SC16IS752x UART detection
     return F("SC16IS75x UART");
-  if (address >= 0x48 && address <= 0x4f)
+  else if (address >= 0x48 && address <= 0x4f)
     return F("Analogue Inputs or PWM");
-  if (address >= 0x40 && address <= 0x4f)
+  else if (address >= 0x40 && address <= 0x4f)
     return F("PWM");
-  if (address >= 0x50 && address <= 0x5f) 
+  else if (address >= 0x50 && address <= 0x5f) 
     return F("EEPROM"); 
-  if (address >= 0x60 && address <= 0x68) 
+  else if (address == 0x68) 
-    return F("Adafruit NeoPixel Driver"); 
-  if (address == 0x68) 
     return F("Real-time clock"); 
-  if (address >= 0x70 && address <= 0x77)
+  else if (address >= 0x70 && address <= 0x77)
     return F("I2C Mux");
-  // Unknown type
+  else
     return F("?");
 }
 

I2CManager_STM32.h

@@ -1,5 +1,5 @@
 /*
- *  © 2022-24 Paul M Antoine
+ *  © 2022-23 Paul M Antoine
  *  © 2023, Neil McKechnie
  *  All rights reserved.
  *
@@ -38,9 +38,8 @@
  *****************************************************************************/
 #if defined(I2C_USE_INTERRUPTS) && defined(ARDUINO_ARCH_STM32)
 #if defined(ARDUINO_NUCLEO_F401RE) || defined(ARDUINO_NUCLEO_F411RE) || defined(ARDUINO_NUCLEO_F446RE) \
-    || defined(ARDUINO_NUCLEO_F412ZG) || defined(ARDUINO_NUCLEO_F413ZH) || defined(ARDUINO_NUCLEO_F446ZE) \
+    || defined(ARDUINO_NUCLEO_F412ZG) || defined(ARDUINO_NUCLEO_F413ZH) \
-    || defined(ARDUINO_NUCLEO_F429ZI) || defined(ARDUINO_NUCLEO_F439ZI) || defined(ARDUINO_NUCLEO_F4X9ZI)
+    || defined(ARDUINO_NUCLEO_F429ZI) || defined(ARDUINO_NUCLEO_F446ZE)
-
 // Assume I2C1 for now - default I2C bus on Nucleo-F411RE and likely all Nucleo-64
 // and Nucleo-144 variants
 I2C_TypeDef *s = I2C1;
@@ -185,7 +184,7 @@ void I2CManagerClass::I2C_init()
   GPIOB->OTYPER |= (1<<8) | (1<<9);           // PB8 and PB9 set to open drain output capability
   GPIOB->OSPEEDR |= (3<<(8*2)) | (3<<(9*2));  // PB8 and PB9 set to High Speed mode
   GPIOB->PUPDR &= ~((3<<(8*2)) | (3<<(9*2))); // Clear all PUPDR bits for PB8 and PB9
-  // GPIOB->PUPDR |= (1<<(8*2)) | (1<<(9*2));    // PB8 and PB9 set to pull-up capability
+  GPIOB->PUPDR |= (1<<(8*2)) | (1<<(9*2));    // PB8 and PB9 set to pull-up capability
   // Alt Function High register routing pins PB8 and PB9 for I2C1:
   // Bits (3:2:1:0) = 0:1:0:0 --> AF4 for pin PB8
   // Bits (7:6:5:4) = 0:1:0:0 --> AF4 for pin PB9

IODevice.cpp

@@ -251,26 +251,6 @@ void IODevice::write(VPIN vpin, int value) {
 #endif
 }
 
-// Write value to count virtual pin(s).
-// these may be within one driver or separated over several drivers 
-void IODevice::writeRange(VPIN vpin, int value, int count) {  
-  
-  while(count) {  
-    auto dev = findDevice(vpin);
-    if (dev) {
-      auto vpinBefore=vpin; 
-      // write to driver, driver will return next vpin it cant handle
-      vpin=dev->_writeRange(vpin, value,count);
-      count-= vpin-vpinBefore;  // decrement by number of vpins changed
-    }
-    else {
-      // skip a vpin if no device handler
-      vpin++;
-      count--;
-    }
-  }
-}
-
 // Write analogue value to virtual pin(s).  If multiple devices are allocated
 // the same pin then only the first one found will be used.
 //
@@ -290,24 +270,6 @@ void IODevice::writeAnalogue(VPIN vpin, int value, uint8_t param1, uint16_t para
 #endif
 }
 
-//
-void IODevice::writeAnalogueRange(VPIN vpin, int value, uint8_t param1, uint16_t param2,int count) {
-  while(count) {  
-    auto dev = findDevice(vpin);
-    if (dev) {
-      auto vpinBefore=vpin; 
-      // write to driver, driver will return next vpin it cant handle
-      vpin=dev->_writeAnalogueRange(vpin, value, param1, param2,count);
-      count-= vpin-vpinBefore;  // decrement by number of vpins changed
-    }
-    else {
-      // skip a vpin if no device handler
-      vpin++;
-      count--;
-    }
-  }
-}
-
 // isBusy, when called for a device pin is always a digital output or analogue output,
 //  returns input feedback state of the pin, i.e. whether the pin is busy performing
 //  an animation or fade over a period of time.
@@ -627,3 +589,4 @@ bool ArduinoPins::fastReadDigital(uint8_t pin) {
 #endif
   return result;
 }
+

IODevice.h

@@ -128,11 +128,9 @@ public:
 
   // write invokes the IODevice instance's _write method.
   static void write(VPIN vpin, int value);
-  static void writeRange(VPIN vpin, int value,int count);
 
   // write invokes the IODevice instance's _writeAnalogue method (not applicable for digital outputs)
   static void writeAnalogue(VPIN vpin, int value, uint8_t profile=0, uint16_t duration=0);
-  static void writeAnalogueRange(VPIN vpin, int value, uint8_t profile, uint16_t duration, int count);
 
   // isBusy returns true if the device is currently in an animation of some sort, e.g. is changing
   //  the output over a period of time.
@@ -180,29 +178,11 @@ public:
     (void)vpin; (void)value;
   };
 
- // Method to write new state (optionally implemented within device class)
- // This will, by default just write to one vpin and return whet to do next.
- // the real power comes where a single driver can update many vpins in one call.
-  virtual VPIN _writeRange(VPIN vpin, int value, int count) {
-    (void)count;
-    _write(vpin,value); 
-    return vpin+1; // try next vpin 
-  };
-
   // Method to write an 'analogue' value (optionally implemented within device class)
   virtual void _writeAnalogue(VPIN vpin, int value, uint8_t param1=0, uint16_t param2=0) {
     (void)vpin; (void)value; (void) param1; (void)param2;
   };
 
-  // Method to write an 'analogue' value to a VPIN range (optionally implemented within device class)
-  // This will, by default just write to one vpin and return whet to do next.
-  // the real power comes where a single driver can update many vpins in one call.
-  virtual VPIN _writeAnalogueRange(VPIN vpin, int value, uint8_t param1, uint16_t param2, int count) {
-    (void) count;
-    _writeAnalogue(vpin, value,  param1, param2);
-    return vpin+1; 
-  };
-
   // Method to read digital pin state (optionally implemented within device class)
   virtual int _read(VPIN vpin) { 
     (void)vpin; 
@@ -568,9 +548,5 @@ protected:
 #include "IO_EXIOExpander.h"
 #include "IO_trainbrains.h"
 #include "IO_EncoderThrottle.h"
-#include "IO_TCA8418.h"
-#include "IO_NeoPixel.h"
-#include "IO_TM1638.h"
-#include "IO_EXSensorCAM.h"
 
 #endif // iodevice_h

IO_DCCAccessory.cpp

@@ -65,3 +65,4 @@ void DCCAccessoryDecoder::_display() {
   DIAG(F("DCCAccessoryDecoder Configured on Vpins:%u-%u Addresses %d/%d-%d/%d)"), _firstVpin, _firstVpin+_nPins-1,
       ADDRESS(_packedAddress), SUBADDRESS(_packedAddress), ADDRESS(endAddress), SUBADDRESS(endAddress));
 }
+

IO_EXSensorCAM.h

@@ -1,425 +0,0 @@
-/*  2024/08/14 
- *  © 2024, Barry Daniel ESP32-CAM revision 
- *
- *  This file is part of EX-CommandStation
- *
- *  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/>.
-*/
-#define driverVer 305
-// v305 less debug & alpha ordered switch
-// v304 static oldb0;  t(##[,%%]; 
-// v303 zipped with CS 5.2.76 and uploaded to repo (with debug)
-// v302 SEND=StringFormatter::send, remove Sp(), add 'q', memcpy( .8) -> .7); 
-// v301 improved 'f','p'&'q' code and driver version calc. Correct bsNo calc. for 'a'							 
-// v300 stripped & revised without expander functionality. Needs sensorCAM.h v300 AND CamParser.cpp
-// v222 uses '@'for EXIORDD read.  handles <NB $> and <NN $ ##>
-// v216 includes 'j' command and uses CamParser rather than myFilter.h Incompatible with v203 senorCAM
-// v203 added pvtThreshold to 'i' output
-// v201 deleted code for compatibility with CAM pre v171. Needs CAM ver201 with o06 only
-// v200 rewrite reduces need for double reads of ESP32 slave CAM. Deleted ESP32CAP. 
-//  Inompatible with pre-v170 sensorCAM, unless set S06 to 0 and S07 to 1 (o06 & l07 say)
-/*
- * The IO_EXSensorCAM.h device driver can integrate with the sensorCAM device.
- * It is modelled on the IO_EXIOExpander.h device driver to include specific needs of the ESP32 sensorCAM 
- * This device driver will configure the device on startup, along with CamParser.cpp
- * interacting with the sensorCAM device for all input/output duties.
- *
- * #include "CamParser.h"      in DCCEXParser.cpp
- * #include "IO_EXSensorCAM.h" in IODevice.h
- * To create EX-SensorCAM devices, define them in myHal.cpp: with
- * EXSensorCAM::create(baseVpin,num_vpins,i2c_address)  or
- * alternatively use HAL(EXSensorCAM baseVpin numpins i2c_address) in myAutomation.h
- * also #define SENSORCAM_VPIN baseVpin in config.h
- *
- * void halSetup() {
- *   // EXSensorCAM::create(vpin, num_vpins, i2c_address);
- *   EXSensorCAM::create(700, 80, 0x11);
- * }
- * 
- * I2C packet size of 32 bytes (in the Wire library).
-*/
-# define DIGITALREFRESH 20000UL      // min uSec delay between digital reads of digitalInputStates
-#ifndef IO_EX_EXSENSORCAM_H
-#define IO_EX_EXSENSORCAM_H
-#define SEND StringFormatter::send
-#include "IODevice.h"
-#include "I2CManager.h"
-#include "DIAG.h"
-#include "FSH.h"
-#include "CamParser.h"
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/*
- * IODevice subclass for EX-SensorCAM.
-*/
-class EXSensorCAM : public IODevice {
-  public:
-    static void create(VPIN vpin, int nPins, I2CAddress i2cAddress) {
-      if (checkNoOverlap(vpin, nPins, i2cAddress)) 
-      new EXSensorCAM(vpin, nPins, i2cAddress);
-    }
-  																
-    static VPIN CAMBaseVpin;					   
-
-  private:
-   // Constructor
-    EXSensorCAM(VPIN firstVpin, int nPins, I2CAddress i2cAddress) {
-      _firstVpin = firstVpin;
-     // Number of pins cannot exceed 255 (1 byte) because of I2C message structure.
-      if (nPins > 80) nPins = 80;
-      _nPins = nPins;
-      _I2CAddress = i2cAddress;
-      addDevice(this);
-    }
-//*************************
-void _begin() {
-    uint8_t status;
-    // Initialise EX-SensorCAM device
-    I2CManager.begin();
-    if (!I2CManager.exists(_I2CAddress)) {
-      DIAG(F("EX-SensorCAM I2C:%s device not found"), _I2CAddress.toString());
-      _deviceState = DEVSTATE_FAILED;
-      return;
-    }else {
-      uint8_t commandBuffer[4]={EXIOINIT,(uint8_t)_nPins,(uint8_t)(_firstVpin & 0xFF),(uint8_t)(_firstVpin>>8)};                                                                                 
-      status = I2CManager.read(_I2CAddress,_inputBuf,sizeof(_inputBuf),commandBuffer,sizeof(commandBuffer));
-        //EXIOINIT needed to trigger and send firstVpin to CAM
-
-      if (status == I2C_STATUS_OK) {
-        // Attempt to get version, non-blocking results in poor placement of response.  Can be blocking here! 
-        commandBuffer[0] = '^';    //new version code
-    
-        status = I2CManager.read(_I2CAddress, _inputBuf, sizeof(_inputBuf), commandBuffer, 1); 
-         // for ESP32 CAM, read again for good immediate response version data
-        status = I2CManager.read(_I2CAddress, _inputBuf, sizeof(_inputBuf), commandBuffer, 1);
-        
-        if (status == I2C_STATUS_OK) {
-          _majorVer= _inputBuf[1]/10;	
-          _minorVer= _inputBuf[1]%10;
-          _patchVer= _inputBuf[2];				
-          DIAG(F("EX-SensorCAM device found, I2C:%s, Version v%d.%d.%d"),
-                       _I2CAddress.toString(),_majorVer, _minorVer,_patchVer);
-        }  	
-      }
-      if (status != I2C_STATUS_OK)
-        reportError(status);
-    } 
-}
-//*************************
-// Digital input pin configuration, used to enable on EX-IOExpander device and set pullups if requested.
-// Configuration isn't done frequently so we can use blocking I2C calls here, and so buffers can
-// be allocated from the stack to reduce RAM allocation.
-bool _configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, int params[]) override { 
-  (void)configType; (void)params; // unused
-  if(_verPrint) DIAG(F("_configure() driver IO_EXSensorCAM v0.%d.%d vpin: %d "), driverVer/100,driverVer%100,vpin);
-  _verPrint=false;           //only give driver versions once
-  if (paramCount != 1) return false;
-  return true; //at least confirm that CAM is (always) configured (no vpin check!)
-}
-//*************************															 
-// Analogue input pin configuration, used to enable an EX-IOExpander device.
-int _configureAnalogIn(VPIN vpin) override { 
-  DIAG(F("_configureAnalogIn() IO_EXSensorCAM vpin %d"),vpin); 
-  return true;     // NOTE: use of EXRAIL IFGTE() etc use "analog" reads.
-}
-//*************************
-// Main loop, collect both digital and "analog" pin states continuously (faster sensor/input reads)
-void _loop(unsigned long currentMicros) override {
-    if (_deviceState == DEVSTATE_FAILED) return;    
-      // Request block is used for "analogue" (cmd. data) and digital reads from the sensorCAM, which 
-      // are performed on a cyclic basis.  Writes are performed synchronously as and when requested.
-    if (_readState != RDS_IDLE) {                  //expecting a return packet
-      if (_i2crb.isBusy()) return;                 // If I2C operation still in progress, return
-      uint8_t status = _i2crb.status;
-      if (status == I2C_STATUS_OK) {               // If device request ok, read input data
-        //apparently the above checks do not guarantee a good packet! error rate about 1 pkt per 1000
-        //there should be a packet in _CAMresponseBuff[32]            
-        if ((_CAMresponseBuff[0] & 0x60) >= 0x60) {   //Buff[0] seems to have ascii cmd header (bit6 high) (o06)    
-            int error = processIncomingPkt( _CAMresponseBuff, _CAMresponseBuff[0]);   // '~' 'i' 'm' 'n' 't' etc
-              if (error>0) DIAG(F("CAM packet header(0x%x) not recognised"),_CAMresponseBuff[0]);                   
-        }else{ // Header not valid - typically replaced by bank 0 data!  To avoid any bad responses set S06 to 0  
-               // Versions of sensorCAM.h after v300 should return header for '@' of '`'(0x60) (not 0xE6)  
-               // followed by digitalInputStates sensor state array
-        }
-      }else   reportError(status, false);   // report i2c eror but don't go offline.
-      _readState = RDS_IDLE;
-    }      
-  
-    // If we're not doing anything now, check to see if a new state table transfer, or for 't' repeat, is due.
-    if (_readState == RDS_IDLE) {    //check if time for digitalRefresh   
-      if ( currentMicros - _lastDigitalRead > _digitalRefresh) { 
-        // Issue new read request for digital states.  
-             
-        _readCommandBuffer[0] = '@';  //start new read of digitalInputStates Table     // non-blocking read 
-        I2CManager.read(_I2CAddress,_CAMresponseBuff, 32,_readCommandBuffer, 1, &_i2crb);     
-        _lastDigitalRead = currentMicros;
-        _readState = RDS_DIGITAL;
-        
-      }else{    //slip in a repeat <NT n> if pending
-        if (currentMicros - _lasttStateRead > _tStateRefresh)  // Delay for "analog" command repetitions
-         if (_savedCmd[2]>1) {   //repeat a 't' command         
-          for (int i=0;i<7;i++)  _readCommandBuffer[i] =_savedCmd[i];
-          int errors = ioESP32(_I2CAddress, _CAMresponseBuff, 32, _readCommandBuffer, 7);    
-          _lasttStateRead = currentMicros;
-          _savedCmd[2] -= 1;     //decrement repeats                  
-          if (errors==0) return;
-          DIAG(F("ioESP32 error %d header 0x%x"),errors,_CAMresponseBuff[0]);  
-          _readState = RDS_TSTATE;  //this should stop further cmd requests until packet read (or timeout)
-        }
-      }   //end repeat 't'
-    }
-  }   
-//*************************
-// Obtain the bank of 8 sensors as an "analog" value
-// can be used to track the position through a sequential sensor bank
-int _readAnalogue(VPIN vpin) override {
-  if (_deviceState == DEVSTATE_FAILED) return 0;        
-  return _digitalInputStates[(vpin - _firstVpin) / 8];
-}
-//*************************
-// Obtain the correct digital sensor input value
-int _read(VPIN vpin) override {
-  if (_deviceState == DEVSTATE_FAILED) return 0;
-  int pin = vpin - _firstVpin;
-  return bitRead(_digitalInputStates[pin / 8], pin % 8);
-}
-//*************************
-// Write digital value.  
-void _write(VPIN vpin, int value) override { 
-  DIAG(F("**_write() vpin %d = %d"),vpin,value);
-  return ;
-}
-//*************************
-// i2cAddr of ESP32 CAM
-// rBuf   buffer for return packet 
-// inbytes number of bytes to request from CAM
-// outBuff holds outbytes to be sent to CAM  
-int ioESP32(uint8_t i2cAddr,uint8_t *rBuf,int inbytes,uint8_t *outBuff,int outbytes) {
-  uint8_t status = _i2crb.status;
-
- while( _i2crb.status != I2C_STATUS_OK){status = _i2crb.status;}   //wait until bus free
-
-  status = I2CManager.read(i2cAddr, rBuf, inbytes, outBuff, outbytes);
-        
-  if (status != I2C_STATUS_OK){ 
-    DIAG(F("EX-SensorCAM I2C:%s Error:%d %S"), _I2CAddress.toString(), status, I2CManager.getErrorMessage(status));
-    reportError(status); return status;
-  }
-  return 0;  // 0 for no error != 0 for error number.
-}
-//*************************
-//function to interpret packet from sensorCAM.ino
-//i2cAddr to identify CAM# (if # >1)
-//rBuf contains packet of up to 32 bytes usually with (ascii) cmd header in rBuf[0]
-//sensorCmd command header byte from CAM (in rBuf[0]?)
-int processIncomingPkt(uint8_t *rBuf,uint8_t sensorCmd) {
-//static uint8_t oldb0;   //for debug only
-  int k; 
-  int b;
-  char str[] = "11111111";
- // if (sensorCmd <= '~') DIAG(F("processIncomingPkt %c %d %d %d"),rBuf[0],rBuf[1],rBuf[2],rBuf[3]);
-  switch (sensorCmd){
-    case '`':      //response to request for digitalInputStates[] table  '@'=>'`'  
-      memcpy(_digitalInputStates, rBuf+1, digitalBytesNeeded);
-//      if ( _digitalInputStates[0]!=oldb0) { oldb0=_digitalInputStates[0];  //debug
-//        for (k=0;k<5;k++) {Serial.print(" ");Serial.print(_digitalInputStates[k],HEX);}
-//      }
-      break;                                                 
-
-    case EXIORDY:  //some commands give back acknowledgement only
-      break;
-
-    case CAMERR:   //cmd format error code from CAM
-      DIAG(F("CAM cmd error 0xFE 0x%x"),rBuf[1]); 
-      break;
-
-    case '~':      //information from '^' version request <N v[er]>
-      DIAG(F("EX-SensorCAM device found, I2C:%s,CAM Version v%d.%d.%d vpins %u-%u"),
-              _I2CAddress.toString(), rBuf[1]/10, rBuf[1]%10, rBuf[2],(int) _firstVpin, (int) _firstVpin +_nPins-1);
-      DIAG(F("IO_EXSensorCAM driver  v0.%d.%d vpin: %d "), driverVer/100,driverVer%100,_firstVpin);
-      break;
- 
-    case 'f':
-      DIAG(F("(f %%%%) frame header 'f' for bsNo %d/%d - showing Quarter sample (1 row) only"), rBuf[1]/8,rBuf[1]%8);  
-      SEND(&USB_SERIAL,F("<n  row: %d  Ref bytes: "),rBuf[2]);
-      for(k=3;k<15;k++)
-        SEND(&USB_SERIAL,F("%x%x%s"), rBuf[k]>>4, rBuf[k]&15, k%3==2 ? "  " : " "); 
-      Serial.print(" latest grab: "); 
-      for(k=16;k<28;k++)
-        SEND(&USB_SERIAL,F("%x%x%s"), rBuf[k]>>4, rBuf[k]&15, (k%3==0) ? "  " : " ");
-      Serial.print(" n>\n");
-      break; 
-
-    case 'i':      //information from i%%
-      k=256*rBuf[5]+rBuf[4];
-      DIAG(F("(i%%%%[,$$]) Info: Sensor 0%o(%d) enabled:%d status:%d row=%d x=%d Twin=0%o pvtThreshold=%d A~%d")
-              ,rBuf[1],rBuf[1],rBuf[3],rBuf[2],rBuf[6],k,rBuf[7],rBuf[9],int(rBuf[8])*16);	 
-      break;
-
-    case 'm':
-      DIAG(F("(m$[,##]) Min/max: $ frames min2flip (trip) %d, maxSensors 0%o, minSensors 0%o, nLED %d,"
-              " threshold %d, TWOIMAGE_MAXBS 0%o"),rBuf[1],rBuf[3],rBuf[2],rBuf[4],rBuf[5],rBuf[6]);
-      break;
-
-    case 'n':
-      DIAG(F("(n$[,##]) Nominate: $ nLED %d, ## minSensors 0%o (maxSensors 0%o threshold %d)")
-                                       ,rBuf[4],rBuf[2],rBuf[3],rBuf[5]);                                                               
-      break;
-
-    case 'p':
-      b=rBuf[1]-2;  
-      if(b<4) { Serial.print("<n (p%%) Bank empty  n>\n"); break; }
-      SEND(&USB_SERIAL,F("<n (p%%) Bank: %d "),(0x7F&rBuf[2])/8);
-      for (int j=2; j<b; j+=3)  
-        SEND(&USB_SERIAL,F(" S[%d%d]: r=%d x=%d"),0x7F&rBuf[j]/8,0x7F&rBuf[j]%8,rBuf[j+1],rBuf[j+2]+2*(rBuf[j]&0x80));
-      Serial.print("  n>\n");
-      break;
-
-    case 'q':
-      for (int i =0; i<8; i++) str[i] = ((rBuf[2] << i) & 0x80 ? '1' : '0');
-      DIAG(F("(q $) Query bank %c ENABLED sensors(S%c7-%c0): %s "), rBuf[1], rBuf[1], rBuf[1], str);
-      break;
-
-    case 't':      //threshold etc. from t##           //bad pkt if 't' FF's
-      if(rBuf[1]==0xFF) {Serial.println("<n bad CAM 't' packet: 74 FF  n>");_savedCmd[2] +=1; return 0;}
-      SEND(&USB_SERIAL,F("<n (t[##[,%%%%]]) Threshold:%d sensor S00:-%d"),rBuf[1],min(rBuf[2]&0x7F,99));
-      if(rBuf[2]>127) Serial.print("##* "); 
-      else{ 
-        if(rBuf[2]>rBuf[1]) Serial.print("-?* "); 
-        else Serial.print("--* ");
-      }
-      for(int i=3;i<31;i+=2){
-        uint8_t valu=rBuf[i];        //get bsn
-        if(valu==80) break;          //80 = end flag
-        else{ 
-          SEND(&USB_SERIAL,F("%d%d:"), (valu&0x7F)/8,(valu&0x7F)%8);
-          if(valu>=128) Serial.print("?-"); 
-          else {if(rBuf[i+1]>=128) Serial.print("oo");else Serial.print("--");}
-          valu=rBuf[i+1]; 
-          SEND(&USB_SERIAL,F("%d%s"),min(valu&0x7F,99),(valu<128) ? "--* ":"##* ");
-        }
-      } 
-      Serial.print(" >\n");
-      break;
-
-    default:        //header not a recognised cmd character
-      DIAG(F("CAM packet header not valid (0x%x) (0x%x) (0x%x)"),rBuf[0],rBuf[1],rBuf[2]);
-      return 1;
-  }			 
-  return 0;  
-}
-//*************************											  
-// Write (analogue) 8bit (command) values.  Write the parameters to the sensorCAM
-void _writeAnalogue(VPIN vpin, int param1, uint8_t camop, uint16_t param3) override {
-    uint8_t outputBuffer[7];
-    int errors=0;
-    outputBuffer[0] = camop;  
-    int pin = vpin - _firstVpin;
-
-    if(camop >= 0x80) {   //case "a" (4p) also (3p) e.g. <N 713 210 310> 
-      camop=param1;        //put row (0-236) in expected place 
-      param1=param3;        //put column in expected place
-      outputBuffer[0] = 'A';
-      pin = (pin/8)*10 + pin%8;   //restore bsNo. as integer
-    }   
-    if (_deviceState == DEVSTATE_FAILED) return;
-   
-    outputBuffer[1] = pin;          //vpin => bsn
-    outputBuffer[2] = param1 & 0xFF;
-    outputBuffer[3] = param1 >> 8;
-    outputBuffer[4] = camop;        //command code
-    outputBuffer[5] = param3 & 0xFF;
-    outputBuffer[6] = param3 >> 8;
-
-    int count=param1+1;
-    if(camop=='Q'){
-      if(param3<=10) {count=param3; camop='B';}
-      //if(param1<10) outputBuffer[2] = param1*10;
-    }
-    if(camop=='B'){   //then 'b'(b%) cmd - can totally deal with that here. (but can't do b%,# (brightSF))
-      if(param1>97) return;
-      if(param1>9) param1 = param1/10;  //accept a bsNo
-      for(int bnk=param1;bnk<count;bnk++) {
-        uint8_t b=_digitalInputStates[bnk];
-        char str[] = "11111111";
-        for (int i=0;i<8;i++) if(((b<<i)&0x80) == 0) str[i]='0';
-        DIAG(F("(b $) Bank: %d activated byte: 0x%x%x (sensors S%d7->%d0) %s"), bnk,b>>4,b&15,bnk,bnk,str ); 
-      }
-      return;
-    } 
-    if (outputBuffer[4]=='T') {   //then 't' cmd
-      if(param1<31) {   //repeated calls if param < 31
-          //for (int i=0;i<7;i++) _savedCmd[i]=outputBuffer[i];
-        memcpy( _savedCmd, outputBuffer, 7);
-      }else _savedCmd[2] = 0;   //no repeats if ##>30 
-    }else _savedCmd[2] = 0;       //no repeats unless 't'
-  
-    _lasttStateRead = micros();    //don't repeat until _tStateRefresh mSec
-
-    errors = ioESP32(_I2CAddress, _CAMresponseBuff, 32 , outputBuffer, 7);  //send to esp32-CAM
-    if (errors==0) return;
-    else {    //       if (_CAMresponseBuff[0] != EXIORDY)   //can't be sure what is inBuff[0] !
-      DIAG(F("ioESP32 i2c error %d header 0x%x"),errors,_CAMresponseBuff[0]);  
-    }
-}
-//*************************
- // Display device information and status.
-  void _display() override {
-    DIAG(F("EX-SensorCAM I2C:%s v%d.%d.%d Vpins %u-%u %S"),
-              _I2CAddress.toString(), _majorVer, _minorVer, _patchVer,
-              (int)_firstVpin, (int)_firstVpin+_nPins-1,
-              _deviceState == DEVSTATE_FAILED ? F("OFFLINE") : F(""));
-  }
-//*************************
-// Helper function for error handling
-void reportError(uint8_t status, bool fail=true) {
-  DIAG(F("EX-SensorCAM I2C:%s Error:%d (%S)"), _I2CAddress.toString(), 
-        status, I2CManager.getErrorMessage(status));
-  if (fail)  _deviceState = DEVSTATE_FAILED;
-}
-//************************* 
-  uint8_t _numDigitalPins = 80;   
-  size_t  digitalBytesNeeded=10;
-  uint8_t _CAMresponseBuff[34];
-  
-  uint8_t _majorVer = 0;
-  uint8_t _minorVer = 0;
-  uint8_t _patchVer = 0;
-
-  uint8_t _digitalInputStates[10];
-  I2CRB _i2crb;
-  uint8_t _inputBuf[12];
-  byte _outputBuffer[8];
-
-  bool    _verPrint=true;
-
-  uint8_t _readCommandBuffer[8];
-  uint8_t _savedCmd[8];           //for repeat 't' command
-  //uint8_t _digitalPinBytes = 10;  // Size of allocated memory buffer (may be longer than needed)
-
-  enum {RDS_IDLE, RDS_DIGITAL, RDS_TSTATE};  // Read operation states
-  uint8_t _readState = RDS_IDLE;
-  //uint8_t cmdBuffer[7]={0,0,0,0,0,0,0};
-  unsigned long _lastDigitalRead = 0;
-  unsigned long _lasttStateRead = 0;
-  unsigned long _digitalRefresh = DIGITALREFRESH;  // Delay refreshing digital inputs for 10ms
-  const unsigned long _tStateRefresh = 120000UL;   // Delay refreshing repeat "tState" inputs
-
-  enum {
-    EXIOINIT = 0xE0,    // Flag to initialise setup procedure
-    EXIORDY = 0xE1,     // Flag we have completed setup procedure, also for EX-IO to ACK setup
-    CAMERR = 0xFE
-  };
-};
-#endif

IO_EncoderThrottle.cpp

@@ -141,3 +141,4 @@ const byte _DIR_MASK = 0x30;
   void EncoderThrottle::_display() {
     DIAG(F("DRIVE vpin %d loco %d notch %d"),_firstVpin,_locoid,_notch);
   }
+

IO_NeoPixel.h

@@ -1,334 +0,0 @@
-/*
- *  © 2024, Chris Harlow. All rights reserved.
- *
- *  This file is part of EX-CommandStation
- *
- *  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/>.
-*/
-
-/*
-* The IO_NEOPIXEL.h device driver integrates with one or more Adafruit neopixel drivers.
-* This device driver will configure the device on startup, along with
-* interacting with the device for all input/output duties.
-*
-* To create NEOPIXEL devices, these are defined in myAutomation.h:
-* (Note the device driver is included by default)
-*
-* HAL(NEOPIXEL,first vpin, number of pixels,mode, i2c address) 
-* e.g. HAL(NEOPIXEL,1000,64,NEO_RGB,0x60)
-* This gives each pixel in the chain an individual vpin
-* The number of pixels must match the physical pixels in the chain. 
-* 
-* This driver maintains a colour (rgb value in 5,5,5 bits only) plus an ON bit.
-* This can be written/read with an analog write/read call. 
-* The ON bit can be set on and off with a digital write. This allows for 
-* a pixel to be preset a colour and then turned on and off like any other light. 
-*/
-
-#ifndef IO_EX_NeoPixel_H
-#define IO_EX_NeoPixel_H
-
-#include "IODevice.h"
-#include "I2CManager.h"
-#include "DIAG.h"
-#include "FSH.h"
-
-
-// The following macros to define the Neopixel String type
-// have been copied from the Adafruit Seesaw Library under the 
-// terms of the GPL. 
-// Credit to: https://github.com/adafruit/Adafruit_Seesaw
-
-// The order of primary colors in the NeoPixel data stream can vary
-// among device types, manufacturers and even different revisions of
-// the same item.  The third parameter to the seesaw_NeoPixel
-// constructor encodes the per-pixel byte offsets of the red, green
-// and blue primaries (plus white, if present) in the data stream --
-// the following #defines provide an easier-to-use named version for
-// each permutation.  e.g. NEO_GRB indicates a NeoPixel-compatible
-// device expecting three bytes per pixel, with the first byte
-// containing the green value, second containing red and third
-// containing blue.  The in-memory representation of a chain of
-// NeoPixels is the same as the data-stream order; no re-ordering of
-// bytes is required when issuing data to the chain.
-
-// Bits 5,4 of this value are the offset (0-3) from the first byte of
-// a pixel to the location of the red color byte.  Bits 3,2 are the
-// green offset and 1,0 are the blue offset.  If it is an RGBW-type
-// device (supporting a white primary in addition to R,G,B), bits 7,6
-// are the offset to the white byte...otherwise, bits 7,6 are set to
-// the same value as 5,4 (red) to indicate an RGB (not RGBW) device.
-// i.e. binary representation:
-// 0bWWRRGGBB for RGBW devices
-// 0bRRRRGGBB for RGB
-
-// RGB NeoPixel permutations; white and red offsets are always same
-// Offset:         W          R          G          B
-#define NEO_RGB ((0 << 6) | (0 << 4) | (1 << 2) | (2))
-#define NEO_RBG ((0 << 6) | (0 << 4) | (2 << 2) | (1))
-#define NEO_GRB ((1 << 6) | (1 << 4) | (0 << 2) | (2))
-#define NEO_GBR ((2 << 6) | (2 << 4) | (0 << 2) | (1))
-#define NEO_BRG ((1 << 6) | (1 << 4) | (2 << 2) | (0))
-#define NEO_BGR ((2 << 6) | (2 << 4) | (1 << 2) | (0))
-
-// RGBW NeoPixel permutations; all 4 offsets are distinct
-// Offset:         W          R          G          B
-#define NEO_WRGB ((0 << 6) | (1 << 4) | (2 << 2) | (3))
-#define NEO_WRBG ((0 << 6) | (1 << 4) | (3 << 2) | (2))
-#define NEO_WGRB ((0 << 6) | (2 << 4) | (1 << 2) | (3))
-#define NEO_WGBR ((0 << 6) | (3 << 4) | (1 << 2) | (2))
-#define NEO_WBRG ((0 << 6) | (2 << 4) | (3 << 2) | (1))
-#define NEO_WBGR ((0 << 6) | (3 << 4) | (2 << 2) | (1))
-
-#define NEO_RWGB ((1 << 6) | (0 << 4) | (2 << 2) | (3))
-#define NEO_RWBG ((1 << 6) | (0 << 4) | (3 << 2) | (2))
-#define NEO_RGWB ((2 << 6) | (0 << 4) | (1 << 2) | (3))
-#define NEO_RGBW ((3 << 6) | (0 << 4) | (1 << 2) | (2))
-#define NEO_RBWG ((2 << 6) | (0 << 4) | (3 << 2) | (1))
-#define NEO_RBGW ((3 << 6) | (0 << 4) | (2 << 2) | (1))
-
-#define NEO_GWRB ((1 << 6) | (2 << 4) | (0 << 2) | (3))
-#define NEO_GWBR ((1 << 6) | (3 << 4) | (0 << 2) | (2))
-#define NEO_GRWB ((2 << 6) | (1 << 4) | (0 << 2) | (3))
-#define NEO_GRBW ((3 << 6) | (1 << 4) | (0 << 2) | (2))
-#define NEO_GBWR ((2 << 6) | (3 << 4) | (0 << 2) | (1))
-#define NEO_GBRW ((3 << 6) | (2 << 4) | (0 << 2) | (1))
-
-#define NEO_BWRG ((1 << 6) | (2 << 4) | (3 << 2) | (0))
-#define NEO_BWGR ((1 << 6) | (3 << 4) | (2 << 2) | (0))
-#define NEO_BRWG ((2 << 6) | (1 << 4) | (3 << 2) | (0))
-#define NEO_BRGW ((3 << 6) | (1 << 4) | (2 << 2) | (0))
-#define NEO_BGWR ((2 << 6) | (3 << 4) | (1 << 2) | (0))
-#define NEO_BGRW ((3 << 6) | (2 << 4) | (1 << 2) | (0))
-
-// If 400 KHz support is enabled, the third parameter to the constructor
-// requires a 16-bit value (in order to select 400 vs 800 KHz speed).
-// If only 800 KHz is enabled (as is default on ATtiny), an 8-bit value
-// is sufficient to encode pixel color order, saving some space.
-
-#define NEO_KHZ800 0x0000 // 800 KHz datastream
-#define NEO_KHZ400 0x0100 // 400 KHz datastream
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/*
- * IODevice subclass for NeoPixel.
- */
-
-class NeoPixel : public IODevice {
-public:
-  
-  static void create(VPIN vpin, int nPins, uint16_t mode=(NEO_GRB | NEO_KHZ800), I2CAddress i2cAddress=0x60) {
-    if (checkNoOverlap(vpin, nPins, mode, i2cAddress)) new NeoPixel(vpin, nPins, mode, i2cAddress);
-  }
-
-private:
-  
-  static const byte SEESAW_NEOPIXEL_BASE=0x0E;
-  static const byte SEESAW_NEOPIXEL_STATUS = 0x00;
-  static const byte SEESAW_NEOPIXEL_PIN = 0x01;
-  static const byte SEESAW_NEOPIXEL_SPEED = 0x02;
-  static const byte SEESAW_NEOPIXEL_BUF_LENGTH = 0x03;
-  static const byte SEESAW_NEOPIXEL_BUF=0x04;
-  static const byte SEESAW_NEOPIXEL_SHOW=0x05;
-
-  // all adafruit examples say this pin. Presumably its hard wired 
-  // in the adapter anyway. 
-  static const byte SEESAW_PIN15 = 15;
-  
-  // Constructor
-  NeoPixel(VPIN firstVpin, int nPins, uint16_t mode, I2CAddress i2cAddress) {
-    _firstVpin = firstVpin;
-    _nPins=nPins;
-    _I2CAddress = i2cAddress;
-    
-    // calculate the offsets into the seesaw buffer for each colour depending
-    // on the pixel strip type passed in mode.
-
-    _redOffset=4+(mode >> 4 & 0x03);
-    _greenOffset=4+(mode >> 2 & 0x03); 
-    _blueOffset=4+(mode & 0x03); 
-    if (4+(mode >>6 & 0x03) == _redOffset) _bytesPerPixel=3; 
-    else _bytesPerPixel=4; // string has a white byte.
-    
-    _kHz800=(mode & NEO_KHZ400)==0;
-    _showPendimg=false;
-    
-    // Each pixel requires 3 bytes RGB memory.
-    // Although the driver device can remember this, it cant do off/on without
-    // forgetting what the on colour was!
-    pixelBuffer=(RGB *) malloc(_nPins*sizeof(RGB)); 
-    stateBuffer=(byte *) calloc((_nPins+7)/8,sizeof(byte)); // all pixels off  
-    if (pixelBuffer==nullptr || stateBuffer==nullptr) {
-      DIAG(F("NeoPixel I2C:%s not enough RAM"), _I2CAddress.toString());
-      return;
-    }
-    // preset all pins to white so a digital on/off will do something even if no colour set.
-    memset(pixelBuffer,0xFF,_nPins*sizeof(RGB));
-    addDevice(this);
-  }
-
-  void _begin() {
-    
-    // Initialise Neopixel device
-    I2CManager.begin();
-    if (!I2CManager.exists(_I2CAddress)) {
-      DIAG(F("NeoPixel I2C:%s device not found"), _I2CAddress.toString());
-      _deviceState = DEVSTATE_FAILED;
-      return;
-    }
-    
-    byte speedBuffer[]={SEESAW_NEOPIXEL_BASE, SEESAW_NEOPIXEL_SPEED,_kHz800};
-    I2CManager.write(_I2CAddress, speedBuffer, sizeof(speedBuffer));
-    
-    // In the driver there are 3 of 4 byts per pixel
-    auto numBytes=_bytesPerPixel * _nPins; 
-    byte setbuffer[] = {SEESAW_NEOPIXEL_BASE, SEESAW_NEOPIXEL_BUF_LENGTH,
-                  (byte)(numBytes >> 8), (byte)(numBytes & 0xFF)};
-    I2CManager.write(_I2CAddress, setbuffer, sizeof(setbuffer));
-    
-    const byte pinbuffer[] = {SEESAW_NEOPIXEL_BASE, SEESAW_NEOPIXEL_PIN,SEESAW_PIN15};
-    I2CManager.write(_I2CAddress, pinbuffer, sizeof(pinbuffer));
-    
-    for (auto pin=0;pin<_nPins;pin++) transmit(pin);
-     _display();
-  }
-  
- // loop called by HAL supervisor 
-  void _loop(unsigned long currentMicros) override {
-    (void)currentMicros;
-    if (!_showPendimg) return;
-    byte showBuffer[]={SEESAW_NEOPIXEL_BASE,SEESAW_NEOPIXEL_SHOW};
-    I2CManager.write(_I2CAddress,showBuffer,sizeof(showBuffer));
-    _showPendimg=false;
-  }  
-  
-  
-  // read back pixel on/off
-  int _read(VPIN vpin) override {
-    if (_deviceState == DEVSTATE_FAILED) return 0;
-    return isPixelOn(vpin-_firstVpin);
-  }
-
-  // Write digital value. Sets pixel on or off
-  void _write(VPIN vpin, int value) override {
-    if (_deviceState == DEVSTATE_FAILED) return;
-    auto pixel=vpin-_firstVpin;
-    if (value) {
-      if (isPixelOn(pixel)) return;
-      setPixelOn(pixel);
-    }
-    else { // set off
-      if (!isPixelOn(pixel)) return;
-      setPixelOff(pixel);
-     }
-     transmit(pixel);
-  }
-   
-  VPIN _writeRange(VPIN vpin,int value, int count) {
-    // using write range cuts out the constant vpin to driver lookup so
-    // we can update multiple pixels much faster.
-    VPIN nextVpin=vpin +  (count>_nPins ? _nPins : count);
-    if (_deviceState != DEVSTATE_FAILED) while(vpin<nextVpin) {
-      _write(vpin,value);
-      vpin++;
-    }
-    return nextVpin;  // next pin we cant 
-  }  
-  // Write analogue value.
-  // The convoluted parameter mashing here is to allow passing the RGB and on/off
-  // information through the generic HAL _writeAnalog interface which was originally
-  // designed for servos and short integers  
-  void _writeAnalogue(VPIN vpin, int colour_RG, uint8_t onoff, uint16_t colour_B) override {
-    if (_deviceState == DEVSTATE_FAILED) return;
-    RGB newColour={(byte)((colour_RG>>8) & 0xFF), (byte)(colour_RG & 0xFF), (byte)(colour_B & 0xFF)};
-    auto pixel=vpin-_firstVpin;
-    if (pixelBuffer[pixel]==newColour && isPixelOn(pixel)==(bool)onoff) return; // no change  
-      
-    if (onoff) setPixelOn(pixel); else setPixelOff(pixel);
-    pixelBuffer[pixel]=newColour;
-    transmit(pixel);
-  }
- VPIN _writeAnalogueRange(VPIN vpin, int colour_RG, uint8_t onoff, uint16_t colour_B, int count) override {
-    // using write range cuts out the constant vpin to driver lookup so
-    VPIN nextVpin=vpin +  (count>_nPins ? _nPins : count); 
-    if (_deviceState != DEVSTATE_FAILED) while(vpin<nextVpin) {
-      _writeAnalogue(vpin,colour_RG, onoff,colour_B);
-      vpin++;
-    }
-    return nextVpin;  // next pin we cant 
- }
- 
-  // Display device information and status.
-  void _display() override {
-    DIAG(F("NeoPixel I2C:%s Vpins %u-%u %S"),
-              _I2CAddress.toString(), 
-              (int)_firstVpin, (int)_firstVpin+_nPins-1,
-              _deviceState == DEVSTATE_FAILED ? F("OFFLINE") : F(""));
-  }
-
-
-  
-  bool isPixelOn(int16_t pixel) {return stateBuffer[pixel/8] & (0x80>>(pixel%8));}
-  void setPixelOn(int16_t pixel) {stateBuffer[pixel/8] |= (0x80>>(pixel%8));}
-  void setPixelOff(int16_t pixel) {stateBuffer[pixel/8] &= ~(0x80>>(pixel%8));}
-  
-  // Helper function for error handling
-  void reportError(uint8_t status, bool fail=true) {
-    DIAG(F("NeoPixel I2C:%s Error:%d (%S)"), _I2CAddress.toString(), 
-      status, I2CManager.getErrorMessage(status));
-    if (fail)
-    _deviceState = DEVSTATE_FAILED;
-  }
-
-  
-  void transmit(uint16_t pixel) { 
-    byte buffer[]={SEESAW_NEOPIXEL_BASE,SEESAW_NEOPIXEL_BUF,0x00,0x00,0x00,0x00,0x00};
-    uint16_t offset= pixel * _bytesPerPixel;
-    buffer[2]=(byte)(offset>>8);
-    buffer[3]=(byte)(offset & 0xFF);
-    
-    if (isPixelOn(pixel)) {
-      auto colour=pixelBuffer[pixel];    
-      buffer[_redOffset]=colour.red;
-      buffer[_greenOffset]=colour.green;
-      buffer[_blueOffset]=colour.blue;
-    } // else leave buffer black (in buffer preset to zeros above)
-    
-    // Transmit pixel to driver
-    I2CManager.write(_I2CAddress,buffer,4 +_bytesPerPixel);
-    _showPendimg=true;
-  
-  }
-  struct RGB { 
-      byte red; 
-      byte green; 
-      byte blue; 
-      bool operator==(const RGB& other) const {
-        return red == other.red && green == other.green && blue == other.blue;
-      }
-    };
-
-  RGB*   pixelBuffer = nullptr;
-  byte*  stateBuffer = nullptr;  // 1 bit per pixel
-  bool _showPendimg;
-  
-  // mapping of RGB onto pixel buffer for seesaw.
-  byte _bytesPerPixel;
-  byte _redOffset;
-  byte _greenOffset;
-  byte _blueOffset;
-  bool _kHz800; 
-};
-
-#endif

IO_Servo.cpp

@@ -30,3 +30,4 @@
 //
 const uint8_t FLASH Servo::_bounceProfile[30] = 
     {0,2,3,7,13,33,50,83,100,83,75,70,65,60,60,65,74,84,100,83,75,70,70,72,75,80,87,92,97,100};
+

IO_TCA8418.h

@@ -1,371 +0,0 @@
-/*
- *  © 2023-2024, Paul M. Antoine
- *  © 2021, Neil McKechnie. All rights reserved.
- *  
- *  This file is part of DCC-EX 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/>.
- */
-
-#ifndef io_tca8418_h
-#define io_tca8418_h
-
-#include "IODevice.h"
-#include "I2CManager.h"
-#include "DIAG.h"
-#include "FSH.h"
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/*
- * IODevice subclass for TCA8418 80-key keypad encoder, which we'll treat as 80 available VPINs where
- * key down == 1 and key up == 0 by configuring just as an 8x10 keyboard matrix. Users can opt to use
- * up to all 80 of the available VPINs for now, allowing memory to be saved if not all events are required.
- * 
- * The datasheet says:
- * 
- * The TCA8418 can be configured to support many different configurations of keypad setups.
- * All 18 GPIOs for the rows and columns can be used to support up to 80 keys in an 8x10 key pad
- * array. Another option is that all 18 GPIOs be used for GPIs to read 18 buttons which are
- * not connected in an array. Any combination in between is also acceptable (for example, a
- * 3x4 keypad matrix and using the remaining 11 GPIOs as a combination of inputs and outputs).
- * 
- * With an 8x10 key event matrix, the events are numbered as such:
- * 
- *     C0  C1  C2  C3  C4  C5  C6  C7  C8  C9
- *    ========================================
- * R0|  0   1   2   3   4   5   6   7   8   9
- * R1| 10  11  12  13  14  15  16  17  18  19
- * R2| 20  21  22  23  24  25  26  27  28  29
- * R3| 30  31  32  33  34  35  36  37  38  39
- * R4| 40  41  42  43  44  45  46  47  48  49
- * R5| 50  51  52  53  54  55  56  57  58  59
- * R6| 60  61  62  63  64  65  66  67  68  69
- * R7| 70  71  72  73  74  75  76  77  78  79
- * 
- * So if you start with VPIN 300, R0/C0 will be 300, and R7/C9 will be 379.
- * 
- * HAL declaration for myAutomation.h is:
- * HAL(TCA8418, firstVpin, numPins, I2CAddress, interruptPin)
- * 
- * Where numPins can be 1-80, and interruptPin can be any spare Arduino pin.
- * 
- * Configure using the following on the main I2C bus:
- * HAL(TCA8418, 300, 80, 0x34)
- * 
- * Use something like this on a multiplexor, and with up to 8 of the 8-way multiplexors you could have 64 different TCA8418 boards:
- * HAL(TCA8418, 400, 80, {SubBus_1, 0x34})
- * 
- * And if needing an Interrupt pin to speed up operations:
- * HAL(TCA8418, 300, 80, 0x34, D21)
- * 
- * Note that using an interrupt pin speeds up button press acquisition considerably (less than a millisecond vs 10-100),
- * but even with interrupts enabled the code presently checks every 100ms in case the interrupt pin becomes disconnected.
- * Use any available Arduino pin for interrupt monitoring.
- */
- 
-class TCA8418 : public IODevice {
-public:
-
-  static void create(VPIN firstVpin, uint8_t nPins, I2CAddress i2cAddress, int interruptPin=-1) {
-    if (checkNoOverlap(firstVpin, nPins, i2cAddress))
-      new TCA8418(firstVpin, (nPins = (nPins > 80) ? 80 : nPins), i2cAddress, interruptPin);
-  }
-
-private:  
-
-  uint8_t* _digitalInputStates = NULL;  // Array of pin states
-  uint8_t _digitalPinBytes = 0;         // Number of bytes in pin state array
-
-  uint8_t _numKeyEvents = 0;            // Number of outsanding key events waiting for us
-
-  unsigned long _lastEventRead = 0;
-  unsigned long _eventRefresh = 10000UL;    // Delay refreshing events for 10ms
-  const unsigned long _eventRefreshSlow = 100000UL;   // Delay refreshing events for 100ms
-  bool _gpioInterruptsEnabled = false;
-
-  uint8_t _inputBuffer[1];
-  uint8_t _commandBuffer[1];
-  I2CRB _i2crb;
-
-  enum {RDS_IDLE, RDS_EVENT, RDS_KEYCODE};  // Read operation states
-  uint8_t _readState = RDS_IDLE;
-
-  // Constructor
-  TCA8418(VPIN firstVpin, uint8_t nPins, I2CAddress i2cAddress, int interruptPin=-1) {
-    if (nPins > 0)
-    {
-      _firstVpin = firstVpin;
-      _nPins = nPins;
-      _I2CAddress = i2cAddress;
-      _gpioInterruptPin = interruptPin;
-      addDevice(this);
-    }
-  }
-
-  void _begin() {
-
-    I2CManager.begin();
-
-    if (I2CManager.exists(_I2CAddress)) {
-      // Default all GPIO pins to INPUT
-      I2CManager.write(_I2CAddress, 2, REG_GPIO_DIR_1, 0x00);
-      I2CManager.write(_I2CAddress, 2, REG_GPIO_DIR_2, 0x00);
-      I2CManager.write(_I2CAddress, 2, REG_GPIO_DIR_3, 0x00);
-
-      // Remove all GPIO pins from events
-      I2CManager.write(_I2CAddress, 2, REG_GPI_EM_1, 0x00);
-      I2CManager.write(_I2CAddress, 2, REG_GPI_EM_2, 0x00);
-      I2CManager.write(_I2CAddress, 2, REG_GPI_EM_3, 0x00);
-
-      // Set all pins to FALLING interrupts
-      I2CManager.write(_I2CAddress, 2, REG_GPIO_INT_LVL_1, 0x00);
-      I2CManager.write(_I2CAddress, 2, REG_GPIO_INT_LVL_2, 0x00);
-      I2CManager.write(_I2CAddress, 2, REG_GPIO_INT_LVL_3, 0x00);
-
-      // Remove all GPIO pins from interrupts
-      I2CManager.write(_I2CAddress, 2, REG_GPIO_INT_EN_1, 0x00);
-      I2CManager.write(_I2CAddress, 2, REG_GPIO_INT_EN_2, 0x00);
-      I2CManager.write(_I2CAddress, 2, REG_GPIO_INT_EN_3, 0x00);
-
-      // Set up an 8 x 10 matrix by writing 0xFF to all the row and column configs
-      // Row config is maximum of 8, and in REG_KP_GPIO_1
-      I2CManager.write(_I2CAddress, 2, REG_KP_GPIO_1, 0xFF);
-      // Column config is maximum of 10, lower 8 bits in REG_KP_GPIO_2, upper in REG_KP_GPIO_3
-      // Set first 8 columns
-      I2CManager.write(_I2CAddress, 2, REG_KP_GPIO_2, 0xFF);
-      // Turn on cols 9/10
-      I2CManager.write(_I2CAddress, 2, REG_KP_GPIO_3, 0x03);
-
-      // // Set all pins to Enable Debounce
-      I2CManager.write(_I2CAddress, 2, REG_DEBOUNCE_DIS_1, 0x00);
-      I2CManager.write(_I2CAddress, 2, REG_DEBOUNCE_DIS_2, 0x00);
-      I2CManager.write(_I2CAddress, 2, REG_DEBOUNCE_DIS_3, 0x00);
-
-      // Let's assume an 8x10 matrix for now, and configure 
-      _digitalPinBytes = (_nPins + 7) / 8;
-      if ((_digitalInputStates = (byte *)calloc(_digitalPinBytes, 1)) == NULL) {
-        DIAG(F("TCA8418 I2C: Unable to alloc %d bytes"), _digitalPinBytes);
-        return;
-      }
-
-    // Configure pin used for GPIO extender notification of change (if allocated)
-    // and configure TCA8418 to produce key event interrupts
-    if (_gpioInterruptPin >= 0) {
-      DIAG(F("TCA8418 I2C: interrupt pin configured on %d"), _gpioInterruptPin);
-      _gpioInterruptsEnabled = true;
-      _eventRefresh = _eventRefreshSlow; // Switch to slower manual refreshes in case the INT pin isn't connected!
-      pinMode(_gpioInterruptPin, INPUT_PULLUP);
-      I2CManager.write(_I2CAddress, 2, REG_CFG, REG_CFG_KE_IEN);
-      // Clear any pending interrupts
-      I2CManager.write(_I2CAddress, 2, REG_INT_STAT, REG_STAT_K_INT);
-    }
-
-#ifdef DIAG_IO
-      _display();
-#endif
-    }
-  }
-
-  int _read(VPIN vpin) override {
-    if (_deviceState == DEVSTATE_FAILED)
-      return 0;
-    int pin = vpin - _firstVpin;
-    bool result = _digitalInputStates[pin / 8] & (1 << (pin % 8));
-    return result;
-  }
-
-
-  // Main loop, collect both digital and analogue pin states continuously (faster sensor/input reads)
-  void _loop(unsigned long currentMicros) override {
-    if (_deviceState == DEVSTATE_FAILED) return;    // If device failed, return
-
-    // Request block is used for key event reads from the TCA8418, which are performed
-    // on a cyclic basis.
-
-    if (_readState != RDS_IDLE) {
-      if (_i2crb.isBusy()) return;                // If I2C operation still in progress, return
-
-      uint8_t status = _i2crb.status;
-      if (status == I2C_STATUS_OK) {             // If device request ok, read input data
-
-        // First check if we have any key events waiting
-        if (_readState == RDS_EVENT) {
-          if ((_numKeyEvents = (_inputBuffer[0] & 0x0F)) != 0) {
-            // We could read each key event waiting in a synchronous loop, which may prove preferable
-            // but for now, schedule an async read of the first key event in the queue
-            _commandBuffer[0] = REG_KEY_EVENT_A;
-            I2CManager.read(_I2CAddress, _inputBuffer, 1, _commandBuffer, 1, &_i2crb);  // non-blocking read
-            _readState = RDS_KEYCODE; // Shift to reading key events!
-          }
-          else // We found no key events waiting, return to IDLE
-            _readState = RDS_IDLE;
-        }
-         else {
-          // RDS_KEYCODE
-          uint8_t key = _inputBuffer[0] & 0x7F;
-          bool keyDown = _inputBuffer[0] & 0x80;
-          // Check for just keypad events
-          key--; // R0/C0 is key #1, so subtract 1 to create an array offset
-          // We only want to record key events we're configured for, as we have calloc'd an
-          // appropriately sized _digitalInputStates array!
-          if (key < _nPins) {
-            if (keyDown)
-              _digitalInputStates[key / 8] |= (1 << (key % 8));
-            else
-              _digitalInputStates[key / 8] &= ~(1 << (key % 8));
-          }
-          else
-            DIAG(F("TCA8418 I2C: key event %d discarded, outside Vpin range"), key);
-          _numKeyEvents--; // One less key event to get
-          if (_numKeyEvents != 0)
-          {
-            // DIAG(F("TCA8418 I2C: more keys in read event queue, # waiting is: %x"), _numKeyEvents);
-            // We could read each key event waiting in a synchronous loop, which may prove preferable
-            // but for now, schedule an async read of the first key event in the queue
-            _commandBuffer[0] = REG_KEY_EVENT_A;
-            I2CManager.read(_I2CAddress, _inputBuffer, 1, _commandBuffer, 1, &_i2crb); // non-blocking read
-          }
-          else {
-            // DIAG(F("TCA8418 I2C: no more keys in read event queue"));
-            // Clear any pending interrupts
-            I2CManager.write(_I2CAddress, 2, REG_INT_STAT, REG_STAT_K_INT);
-            _readState = RDS_IDLE; // Shift to IDLE
-            return;
-          }
-         }
-      } else
-        reportError(status, false);   // report eror but don't go offline.
-    }
-
-    // If we're not doing anything now, check to see if we have an interrupt pin configured and it is low,
-    // or if our timer has elapsed and we should check anyway in case the interrupt pin is disconnected.
-    if (_readState == RDS_IDLE) {
-      if ((_gpioInterruptsEnabled && !digitalRead(_gpioInterruptPin)) ||
-        ((currentMicros - _lastEventRead) > _eventRefresh))
-      {
-        _commandBuffer[0] = REG_KEY_LCK_EC;
-        I2CManager.read(_I2CAddress, _inputBuffer, 1, _commandBuffer, 1, &_i2crb);  // non-blocking read
-        _lastEventRead = currentMicros;
-        _readState = RDS_EVENT; // Shift to looking for key events!
-      }
-    }
-  }
-
-  // Display device information and status
-  void _display() override {
-    DIAG(F("TCA8418 I2C:%s Vpins %u-%u%S"),
-              _I2CAddress.toString(),
-              _firstVpin, (_firstVpin+_nPins-1),
-              _deviceState == DEVSTATE_FAILED ? F(" OFFLINE") : F(""));
-    if (_gpioInterruptsEnabled)
-      DIAG(F("TCA8418 I2C:Interrupt on pin %d"), _gpioInterruptPin);
-  }
-
-  // Helper function for error handling
-  void reportError(uint8_t status, bool fail=true) {
-    DIAG(F("TCA8418 I2C:%s Error:%d (%S)"), _I2CAddress.toString(), 
-      status, I2CManager.getErrorMessage(status));
-    if (fail)
-    _deviceState = DEVSTATE_FAILED;
-  }
-
-  enum tca8418_registers
-  {
-    // REG_RESERVED = 0x00
-    REG_CFG = 0x01,             // Configuration register
-    REG_INT_STAT = 0x02,        // Interrupt status
-    REG_KEY_LCK_EC = 0x03,      // Key lock and event counter
-    REG_KEY_EVENT_A = 0x04,     // Key event register A
-    REG_KEY_EVENT_B = 0x05,     // Key event register B
-    REG_KEY_EVENT_C = 0x06,     // Key event register C
-    REG_KEY_EVENT_D = 0x07,     // Key event register D
-    REG_KEY_EVENT_E = 0x08,     // Key event register E
-    REG_KEY_EVENT_F = 0x09,     // Key event register F
-    REG_KEY_EVENT_G = 0x0A,     // Key event register G
-    REG_KEY_EVENT_H = 0x0B,     // Key event register H
-    REG_KEY_EVENT_I = 0x0C,     // Key event register I
-    REG_KEY_EVENT_J = 0x0D,     // Key event register J
-    REG_KP_LCK_TIMER = 0x0E,    // Keypad lock1 to lock2 timer
-    REG_UNLOCK_1 = 0x0F,        // Unlock register 1
-    REG_UNLOCK_2 = 0x10,        // Unlock register 2
-    REG_GPIO_INT_STAT_1 = 0x11, // GPIO interrupt status 1
-    REG_GPIO_INT_STAT_2 = 0x12, // GPIO interrupt status 2
-    REG_GPIO_INT_STAT_3 = 0x13, // GPIO interrupt status 3
-    REG_GPIO_DAT_STAT_1 = 0x14, // GPIO data status 1
-    REG_GPIO_DAT_STAT_2 = 0x15, // GPIO data status 2
-    REG_GPIO_DAT_STAT_3 = 0x16, // GPIO data status 3
-    REG_GPIO_DAT_OUT_1 = 0x17,  // GPIO data out 1
-    REG_GPIO_DAT_OUT_2 = 0x18,  // GPIO data out 2
-    REG_GPIO_DAT_OUT_3 = 0x19,  // GPIO data out 3
-    REG_GPIO_INT_EN_1 = 0x1A,   // GPIO interrupt enable 1
-    REG_GPIO_INT_EN_2 = 0x1B,   // GPIO interrupt enable 2
-    REG_GPIO_INT_EN_3 = 0x1C,   // GPIO interrupt enable 3
-    REG_KP_GPIO_1 = 0x1D,       // Keypad/GPIO select 1
-    REG_KP_GPIO_2 = 0x1E,       // Keypad/GPIO select 2
-    REG_KP_GPIO_3 = 0x1F,       // Keypad/GPIO select 3
-    REG_GPI_EM_1 = 0x20,        // GPI event mode 1
-    REG_GPI_EM_2 = 0x21,        // GPI event mode 2
-    REG_GPI_EM_3 = 0x22,        // GPI event mode 3
-    REG_GPIO_DIR_1 = 0x23,      // GPIO data direction 1
-    REG_GPIO_DIR_2 = 0x24,      // GPIO data direction 2
-    REG_GPIO_DIR_3 = 0x25,      // GPIO data direction 3
-    REG_GPIO_INT_LVL_1 = 0x26,  // GPIO edge/level detect 1
-    REG_GPIO_INT_LVL_2 = 0x27,  // GPIO edge/level detect 2
-    REG_GPIO_INT_LVL_3 = 0x28,  // GPIO edge/level detect 3
-    REG_DEBOUNCE_DIS_1 = 0x29,  // Debounce disable 1
-    REG_DEBOUNCE_DIS_2 = 0x2A,  // Debounce disable 2
-    REG_DEBOUNCE_DIS_3 = 0x2B,  // Debounce disable 3
-    REG_GPIO_PULL_1 = 0x2C,     // GPIO pull-up disable 1
-    REG_GPIO_PULL_2 = 0x2D,     // GPIO pull-up disable 2
-    REG_GPIO_PULL_3 = 0x2E,     // GPIO pull-up disable 3
-    // REG_RESERVED = 0x2F
-  };
-
-  enum tca8418_config_reg_fields
-  {
-    //  Config Register #1 fields
-    REG_CFG_AI = 0x80,           // Auto-increment for read/write
-    REG_CFG_GPI_E_CGF = 0x40,    // Event mode config
-    REG_CFG_OVR_FLOW_M = 0x20,   // Overflow mode enable
-    REG_CFG_INT_CFG = 0x10,      // Interrupt config
-    REG_CFG_OVR_FLOW_IEN = 0x08, // Overflow interrupt enable
-    REG_CFG_K_LCK_IEN = 0x04,    // Keypad lock interrupt enable
-    REG_CFG_GPI_IEN = 0x02,      // GPI interrupt enable
-    REG_CFG_KE_IEN = 0x01,       // Key events interrupt enable
-  };
-
-  enum tca8418_int_status_fields
-  {
-    //  Interrupt Status Register #2 fields
-    REG_STAT_CAD_INT = 0x10,      // Ctrl-alt-del seq status
-    REG_STAT_OVR_FLOW_INT = 0x08, // Overflow interrupt status
-    REG_STAT_K_LCK_INT = 0x04,    // Key lock interrupt status
-    REG_STAT_GPI_INT = 0x02,      // GPI interrupt status
-    REG_STAT_K_INT = 0x01,        // Key events interrupt status
-  };
-
-  enum tca8418_lock_ec_fields
-  {
-    // Key Lock Event Count Register #3
-    REG_LCK_EC_K_LCK_EN = 0x40, // Key lock enable
-    REG_LCK_EC_LCK_2 = 0x20,    // Keypad lock status 2
-    REG_LCK_EC_LCK_1 = 0x10,    // Keypad lock status 1
-    REG_LCK_EC_KLEC_3 = 0x08,   // Key event count bit 3
-    REG_LCK_EC_KLEC_2 = 0x04,   // Key event count bit 2
-    REG_LCK_EC_KLEC_1 = 0x02,   // Key event count bit 1
-    REG_LCK_EC_KLEC_0 = 0x01,   // Key event count bit 0
-  };
-};
-
-#endif

IO_TM1638.cpp

@@ -1,215 +0,0 @@
-/*
- *  © 2024, Chris Harlow. All rights reserved.
- *  
- *  This file is part of DCC++EX 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/>.
- */
-
-/* Credit to https://github.com/dvarrel/TM1638 for the basic formulae.*/
-
-
-#include <Arduino.h>
-#include "IODevice.h"
-#include "DIAG.h"
-
-   
-const uint8_t HIGHFLASH _digits[16]={
-      0b00111111,0b00000110,0b01011011,0b01001111,
-      0b01100110,0b01101101,0b01111101,0b00000111,
-      0b01111111,0b01101111,0b01110111,0b01111100,
-      0b00111001,0b01011110,0b01111001,0b01110001
-    };
-
-  // Constructor
-   TM1638::TM1638(VPIN firstVpin, byte clk_pin,byte dio_pin,byte stb_pin){
-    _firstVpin = firstVpin;
-    _nPins = 8;
-    _clk_pin = clk_pin;
-    _stb_pin = stb_pin;
-    _dio_pin = dio_pin;
-    pinMode(clk_pin,OUTPUT);
-    pinMode(stb_pin,OUTPUT);
-    pinMode(dio_pin,OUTPUT);
-    _pulse = PULSE1_16;
-      
-    _buttons=0;
-    _leds=0;
-    _lastLoop=micros();
-    addDevice(this);
-   } 
-
-    
-  void TM1638::create(VPIN firstVpin, byte clk_pin,byte dio_pin,byte stb_pin) {
-    if (checkNoOverlap(firstVpin,8)) 
-     new TM1638(firstVpin, clk_pin,dio_pin,stb_pin); 
-  }
-
-  void TM1638::_begin()  {
-    displayClear();
-    test();
-    _display();
-  }
-  
- 
-  void TM1638::_loop(unsigned long currentMicros)  {
-     if (currentMicros - _lastLoop > (1000000UL/LoopHz)) {
-         _buttons=getButtons();// Read the buttons
-         _lastLoop=currentMicros;   
-     } 
-  }
-           
-  void TM1638::_display()  {
-    DIAG(F("TM1638 Configured on Vpins:%u-%u"), _firstVpin, _firstVpin+_nPins-1);
-  }
-
-// digital read gets button state 
-int TM1638::_read(VPIN vpin)  {
-  byte pin=vpin - _firstVpin;
-  bool result=bitRead(_buttons,pin);
-  // DIAG(F("TM1638 read (%d) buttons %x = %d"),pin,_buttons,result);  
-  return result;
-}
-
-// digital write sets led state 
-void TM1638::_write(VPIN vpin, int value)  {
-  // TODO.. skip if no state change  
-  writeLed(vpin - _firstVpin + 1,value!=0);
-  }
-
-// Analog write sets digit displays 
-
-void TM1638::_writeAnalogue(VPIN vpin, int lowBytes, uint8_t mode, uint16_t highBytes)  {  
-   // mode is in DataFormat defined above.
-   byte formatLength=mode & 0x0F;  // last 4 bits 
-   byte formatType=mode & 0xF0;         //           
-   int8_t leftDigit=vpin-_firstVpin; // 0..7 from left
-   int8_t rightDigit=leftDigit+formatLength-1; // 0..7 from left
-   
-   // loading is done right to left startDigit first
-   int8_t startDigit=7-rightDigit; // reverse as 7 on left
-   int8_t lastDigit=7-leftDigit; // reverse as 7 on left
-   uint32_t value=highBytes;
-   value<<=16;
-   value |= (uint16_t)lowBytes;
-   
-   //DIAG(F("TM1638 fl=%d ft=%x sd=%d ld=%d v=%l vx=%X"),
-   // formatLength,formatType,startDigit,lastDigit,value,value);
-    while(startDigit<=lastDigit) {
-        switch (formatType) {
-            case _DF_DECIMAL:// decimal (leading zeros)
-                displayDig(startDigit,GETHIGHFLASH(_digits,(value%10))); 
-                value=value/10;
-                break; 
-            case _DF_HEX:// HEX (leading zeros)
-                displayDig(startDigit,GETHIGHFLASH(_digits,(value & 0x0F))); 
-                value>>=4;
-                break;  
-            case _DF_RAW:// Raw 7-segment pattern 
-                displayDig(startDigit,value & 0xFF); 
-                value>>=8;
-                break;
-            default:
-                DIAG(F("TM1368 invalid mode 0x%x"),mode);
-                return;
-            }
-    startDigit++;
-    } 
-}
-     
-uint8_t TM1638::getButtons(){
-  ArduinoPins::fastWriteDigital(_stb_pin, LOW);
-  writeData(INSTRUCTION_READ_KEY);
-  pinMode(_dio_pin, INPUT);
-  ArduinoPins::fastWriteDigital(_clk_pin, LOW);
-  uint8_t buttons=0;
-  for (uint8_t eachByte=0; eachByte<4;eachByte++) {
-    uint8_t value = 0;
-	  for (uint8_t eachBit = 0; eachBit < 8; eachBit++) {
-		  ArduinoPins::fastWriteDigital(_clk_pin, HIGH);
-			value |= ArduinoPins::fastReadDigital(_dio_pin) << eachBit;
-		  ArduinoPins::fastWriteDigital(_clk_pin, LOW);
-	  }
-    buttons |= value << eachByte; 
-    delayMicroseconds(1);
-  }
-  pinMode(_dio_pin, OUTPUT);
-  ArduinoPins::fastWriteDigital(_stb_pin, HIGH);
-  return buttons;
-}
-
-
-void TM1638::displayDig(uint8_t digitId, uint8_t pgfedcba){
-  if (digitId>7) return;
-  setDataInstruction(DISPLAY_TURN_ON | _pulse);
-  setDataInstruction(INSTRUCTION_WRITE_DATA| INSTRUCTION_ADDRESS_FIXED);
-  writeDataAt(FIRST_DISPLAY_ADDRESS+14-(digitId*2), pgfedcba);
-}
-
-void TM1638::displayClear(){
-  setDataInstruction(DISPLAY_TURN_ON | _pulse);
-  setDataInstruction(INSTRUCTION_WRITE_DATA | INSTRUCTION_ADDRESS_FIXED);
-  for (uint8_t i=0;i<15;i+=2){
-    writeDataAt(FIRST_DISPLAY_ADDRESS+i,0x00);
-  }
-}
-
-void TM1638::writeLed(uint8_t num,bool state){
-  if ((num<1) | (num>8)) return;
-  setDataInstruction(DISPLAY_TURN_ON | _pulse);
-  setDataInstruction(INSTRUCTION_WRITE_DATA | INSTRUCTION_ADDRESS_FIXED);
-  writeDataAt(FIRST_DISPLAY_ADDRESS + (num*2-1), state);
-}
-
-
-void TM1638::writeData(uint8_t data){
-	for (uint8_t i = 0; i < 8; i++)  {
-		ArduinoPins::fastWriteDigital(_dio_pin, data & 1);
-		data >>= 1;
-		ArduinoPins::fastWriteDigital(_clk_pin, HIGH);
-		ArduinoPins::fastWriteDigital(_clk_pin, LOW);		
-	}
-} 
-
-void TM1638::writeDataAt(uint8_t displayAddress, uint8_t data){
-    ArduinoPins::fastWriteDigital(_stb_pin, LOW);
-    writeData(displayAddress);
-    writeData(data);
-    ArduinoPins::fastWriteDigital(_stb_pin, HIGH);
-    delayMicroseconds(1);
-}
-
-void TM1638::setDataInstruction(uint8_t dataInstruction){
-  ArduinoPins::fastWriteDigital(_stb_pin, LOW);
-  writeData(dataInstruction);
-  ArduinoPins::fastWriteDigital(_stb_pin, HIGH);
-  delayMicroseconds(1);  
-}
-
-void TM1638::test(){
-  DIAG(F("TM1638 test"));
-  uint8_t val=0;
-  for(uint8_t i=0;i<5;i++){
-    setDataInstruction(DISPLAY_TURN_ON | _pulse);
-    setDataInstruction(INSTRUCTION_WRITE_DATA| INSTRUCTION_ADDRESS_AUTO);
-    ArduinoPins::fastWriteDigital(_stb_pin, LOW);
-    writeData(FIRST_DISPLAY_ADDRESS);
-    for(uint8_t i=0;i<16;i++)
-      writeData(val);
-    ArduinoPins::fastWriteDigital(_stb_pin, HIGH);
-    delay(1000);
-    val = ~val;
-  }
-
-}

IO_TM1638.h

@@ -1,134 +0,0 @@
-   /*
- *  © 2024, Chris Harlow. All rights reserved.
- *  
- *  This file is part of DCC++EX 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/>.
- */
-
-#ifndef IO_TM1638_h
-#define IO_TM1638_h
-#include <Arduino.h>
-#include "IODevice.h"
-#include "DIAG.h"
-
-class TM1638 : public IODevice {
-private: 
-      
-    uint8_t _buttons;
-    uint8_t _leds;
-    unsigned long _lastLoop;
-    static const int LoopHz=20; 
-
-    static const byte 
-    INSTRUCTION_WRITE_DATA=0x40,
-    INSTRUCTION_READ_KEY=0x42,
-    INSTRUCTION_ADDRESS_AUTO=0x40,
-    INSTRUCTION_ADDRESS_FIXED=0x44,
-    INSTRUCTION_NORMAL_MODE=0x40,
-    INSTRUCTION_TEST_MODE=0x48,
-
-    FIRST_DISPLAY_ADDRESS=0xC0,
-
-    DISPLAY_TURN_OFF=0x80,
-    DISPLAY_TURN_ON=0x88;
-
-        
-    uint8_t _clk_pin;
-    uint8_t _stb_pin;
-    uint8_t _dio_pin;
-    uint8_t _pulse;
-    bool _isOn;
-
-    
-  // Constructor
-   TM1638(VPIN firstVpin, byte clk_pin,byte dio_pin,byte stb_pin);
-
-public:
-  enum DigitFormat : byte {
-    // last 4 bits are length.
-    // DF_1.. DF_8 decimal 
-    DF_1=0x01,DF_2=0x02,DF_3=0x03,DF_4=0x04,
-    DF_5=0x05,DF_6=0x06,DF_7=0x07,DF_8=0x08,
-    // DF_1X.. DF_8X HEX 
-    DF_1X=0x11,DF_2X=0x12,DF_3X=0x13,DF_4X=0x14,
-    DF_5X=0x15,DF_6X=0x16,DF_7X=0x17,DF_8X=0x18,
-    // DF_1R .. DF_4R raw 7 segmnent data 
-    // only 4 because HAL analogWrite only passes 4 bytes 
-    DF_1R=0x21,DF_2R=0x22,DF_3R=0x23,DF_4R=0x24,
-    
-    //  bits of data conversion type  (ored with length) 
-    _DF_DECIMAL=0x00,// right adjusted decimal unsigned leading zeros
-    _DF_HEX=0x10,    // right adjusted hex leading zeros 
-    _DF_RAW=0x20 // bytes are raw 7-segment pattern (max length 4)
-  };
-
-  static void create(VPIN firstVpin, byte clk_pin,byte dio_pin,byte stb_pin);
-  
-  // Functions overridden in IODevice
-  void _begin();
-  void _loop(unsigned long currentMicros) override ;
-  void _writeAnalogue(VPIN vpin, int value, uint8_t param1, uint16_t param2) override;
-  void _display() override ;
-  int _read(VPIN pin) override;
-  void _write(VPIN pin,int value) override;
-
-  // Device driving functions 
-  private:
-   enum pulse_t {
-      PULSE1_16,
-      PULSE2_16,
-      PULSE4_16,
-      PULSE10_16,
-      PULSE11_16,
-      PULSE12_16,
-      PULSE13_16,
-      PULSE14_16
-    };
-
-  /**
-    * @fn getButtons
-    * @return state of 8 buttons
-    */
-    uint8_t getButtons();
-
-    /**
-    * @fn writeLed
-    * @brief put led ON or OFF
-    * @param num num of led(1-8)
-    * @param state (true or false)
-    */
-    void writeLed(uint8_t num, bool state);
-    
-    
-    /**
-    * @fn displayDig
-    * @brief set 7 segment display + dot
-    * @param digitId num of digit(0-7)
-    * @param val value 8 bits
-    */
-    void displayDig(uint8_t digitId, uint8_t pgfedcba);
-
-    /**
-    * @fn displayClear
-    * @brief switch off all leds and segment display
-    */
-    void displayClear();
-    void test();
-    void writeData(uint8_t data);
-    void writeDataAt(uint8_t displayAddress, uint8_t data);
-    void setDisplayMode(uint8_t displayMode);
-    void setDataInstruction(uint8_t dataInstruction);
-};
-#endif

KeywordHasher.h

@@ -54,43 +54,4 @@ static_assert("MAIN"_hk == 11339,"Keyword hasher error");
 static_assert("SLOW"_hk == -17209,"Keyword hasher error");
 static_assert("SPEED28"_hk == -17064,"Keyword hasher error");
 static_assert("SPEED128"_hk == 25816,"Keyword hasher error");
-
-// Compile time converter from "abcd"_s7  to the 7 segment nearest equivalent
-
-constexpr uint8_t seg7Digits[]={
-      0b00111111,0b00000110,0b01011011,0b01001111, // 0..3
-      0b01100110,0b01101101,0b01111101,0b00000111, // 4..7
-      0b01111111,0b01101111 // 8..9
-    };
-    
-constexpr uint8_t seg7Letters[]={
-        0b01110111,0b01111100,0b00111001,0b01011110, // ABCD
-        0b01111001,0b01110001,0b00111101,0b01110110, // EFGH 
-        0b00000100,0b00011110,0b01110010,0b00111000,  //IJKL
-        0b01010101,0b01010100,0b01011100,0b01110011, // MNOP
-        0b10111111,0b01010000,0b01101101,0b01111000, // QRST
-        0b00111110,0b00011100,0b01101010,0b01001001,  //UVWX
-        0b01100110,0b01011011  //YZ
-    };
-constexpr uint8_t seg7Space=0b00000000;
-constexpr uint8_t seg7Minus=0b01000000;
-constexpr uint8_t seg7Equals=0b01001000;
-    
-
-constexpr uint32_t CompiletimeSeg7(const char *  sv, uint32_t running, size_t rlen) {
-    return (*sv==0 || rlen==0) ? running << (8*rlen) : CompiletimeSeg7(sv+1,
-          (*sv >= '0' && *sv <= '9') ? (running<<8) | seg7Digits[*sv-'0'] : 
-          (*sv >= 'A' && *sv <= 'Z') ? (running<<8) | seg7Letters[*sv-'A'] : 
-          (*sv >= 'a' && *sv <= 'z') ? (running<<8) | seg7Letters[*sv-'a'] : 
-          (*sv == '-') ? (running<<8) | seg7Minus : 
-          (*sv == '=') ? (running<<8) | seg7Equals : 
-                         (running<<8) | seg7Space,
-          rlen-1               
-        );  // 
-}
-
-constexpr uint32_t operator""_s7(const char * keyword, size_t len) 
-{
-    return  CompiletimeSeg7(keyword,0*len,4);
-}
 #endif

MotorDriver.cpp

@@ -576,7 +576,7 @@ void MotorDriver::checkPowerOverload(bool useProgLimit, byte trackno) {
 	DIAG(F("TRACK %c ALERT FAULT"), trackno + 'A');
       }
       setPower(POWERMODE::ALERT);
-      if ((trackMode & TRACK_MODIFIER_AUTO) && (trackMode & (TRACK_MODE_MAIN|TRACK_MODE_EXT|TRACK_MODE_BOOST))){
+      if ((trackMode & TRACK_MODE_AUTOINV) && (trackMode & (TRACK_MODE_MAIN|TRACK_MODE_EXT|TRACK_MODE_BOOST))){
 	DIAG(F("TRACK %c INVERT"), trackno + 'A');
 	invertOutput();
       }

MotorDriver.h

@@ -29,33 +29,21 @@
 #include <wiring_private.h>
 
 // use powers of two so we can do logical and/or on the track modes in if clauses.
-// For example TRACK_MODE_DC_INV is (TRACK_MODE_DC|TRACK_MODIFIER_INV)
+// 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 {
+enum TRACK_MODE : byte {TRACK_MODE_NONE = 1, TRACK_MODE_MAIN = 2, TRACK_MODE_PROG = 4,
-  // main modes
-  TRACK_MODE_NONE = 1, TRACK_MODE_MAIN = 2, TRACK_MODE_PROG = 4,
                         TRACK_MODE_DC = 8, TRACK_MODE_EXT = 16,
-  // modifiers
-  TRACK_MODIFIER_INV = 64, TRACK_MODIFIER_AUTO = 128,
 #ifdef ARDUINO_ARCH_ESP32
 			TRACK_MODE_BOOST = 32,
-  TRACK_MODE_BOOST_INV = TRACK_MODE_BOOST|TRACK_MODIFIER_INV,
-  TRACK_MODE_BOOST_AUTO = TRACK_MODE_BOOST|TRACK_MODIFIER_AUTO,
 #else
 			TRACK_MODE_BOOST = 0,
-  TRACK_MODE_BOOST_INV = 0,
-  TRACK_MODE_BOOST_AUTO = 0,
 #endif
-  // derived modes; TRACK_ALL is calles that so it does not match TRACK_MODE_*
+                        TRACK_MODE_ALL = TRACK_MODE_MAIN|TRACK_MODE_PROG|TRACK_MODE_DC|TRACK_MODE_EXT|TRACK_MODE_BOOST,
-  TRACK_ALL = TRACK_MODE_MAIN|TRACK_MODE_PROG|TRACK_MODE_DC|TRACK_MODE_EXT|TRACK_MODE_BOOST,
+                        TRACK_MODE_INV = 64,
-  TRACK_MODE_MAIN_INV  =  TRACK_MODE_MAIN|TRACK_MODIFIER_INV,
+			TRACK_MODE_DCX = TRACK_MODE_DC|TRACK_MODE_INV, TRACK_MODE_AUTOINV = 128};
-  TRACK_MODE_MAIN_AUTO =  TRACK_MODE_MAIN|TRACK_MODIFIER_AUTO,
-  TRACK_MODE_DC_INV =  TRACK_MODE_DC|TRACK_MODIFIER_INV,
-  TRACK_MODE_DCX = TRACK_MODE_DC_INV // DCX is other name for historical reasons
-};
 
 #define setHIGH(fastpin)  *fastpin.inout |= fastpin.maskHIGH
 #define setLOW(fastpin)   *fastpin.inout &= fastpin.maskLOW
@@ -285,7 +273,7 @@ class MotorDriver {
 #endif
   inline void setMode(TRACK_MODE m) {
     trackMode = m;
-    invertOutput(trackMode & TRACK_MODIFIER_INV);
+    invertOutput(trackMode & TRACK_MODE_INV);
   };
   inline void invertOutput() {               // toggles output inversion
     invertPhase = !invertPhase;

MotorDrivers.h

@@ -75,19 +75,11 @@
 #define SAMD_STANDARD_MOTOR_SHIELD STANDARD_MOTOR_SHIELD
 #define STM32_STANDARD_MOTOR_SHIELD STANDARD_MOTOR_SHIELD
 
-#if defined(ARDUINO_NUCLEO_F429ZI) || defined(ARDUINO_NUCLEO_F439ZI) || defined(ARDUINO_NUCLEO_F4X9ZI)
-// EX 8874 based shield connected to a 3V3 system with 12-bit (4096) ADC
-// The Ethernet capable STM32 models cannot use Channel B BRAKE on D8, and must use the ALT pin of D6,
-// AND cannot use Channel B PWN on D11, but must use the ALT pin of D5
-#define EX8874_SHIELD F("EX8874"), \
- new MotorDriver( 3, 12, UNUSED_PIN, 9, A0, 1.27, 5000, A4), \
- new MotorDriver( 5, 13, UNUSED_PIN, 6, A1, 1.27, 5000, A5)
-#else
 // EX 8874 based shield connected to a 3V3 system with 12-bit (4096) ADC
 #define EX8874_SHIELD F("EX8874"), \
  new MotorDriver( 3, 12, UNUSED_PIN, 9, A0, 1.27, 5000, A4), \
  new MotorDriver(11, 13, UNUSED_PIN, 8, A1, 1.27, 5000, A5)
-#endif
+
 
 #elif defined(ARDUINO_ARCH_ESP32)
 // STANDARD shield on an ESPDUINO-32 (ESP32 in Uno form factor). The shield must be eiter the

Release_Notes/NeoPixel.md

@@ -1,77 +0,0 @@
-NeoPixel support
-
-The IO_NeoPixel.h driver supports the adafruit neopixel seesaw board. It turns each pixel into an individual VPIN which can be given a colour and turned on or off using the new <o> command or the NEOPIXEL Exrail macro. Exrail SIGNALS can also drive a single pixel signal or multiple separate pixels.
-
-
-1.  Defining the hardware driver:
-    Add a driver definition in myAutomation.h for each adafruit I2C driver.
-
-    HAL(neoPixel, firstVpin, numberOfPixels [, mode [, i2caddress])
-      Where mode is selected from the various pixel string types which have varying
-      colour order or refresh frequency. For MOST strings this mode will be NEO_GRB but for others refer to the comments in IO_NeoPixel.h
-      If omitted the node and i2caddress default to NEO_GRB, 0x60.
-
-    HAL(NeoPixel,1000,20)
-       This is a NeoPixel driver defaulting to I2C aqddress 0x60 for a GRB pixel string. Pixels are given vpin numbers from 1000 to 1019. 
-    HAL(NeoPixel,1020,20,NEO_GRB,0x61)
-       This is a NeoPixel driver on i2c address 0x61    
-
-2. Setting pixels from the < > commands.
-    By default, each pixel in the string is created as white but switched off.
-    Each pixel has a vpin starting from the first vpin in the HAL definitions.
-
-    <o vpin>   switches pixel on  (same as <z vpin>) e.g. <o 1005>
-    <o -vpin> switches pixel off (same as <z -vpin>) e.g. <o -1003>
-    (the z commands work on pixels the same as other gpio pins.)
-
-    <o [-]vpin count> switches on/off count pixels starting at vpin. e.g <o 1000 5>
-    Note: it IS acceptable to switch across 2 strings of pixels if they are contiguous vpin ranges.  It is also interesting that this command doesnt care if the vpins are NeoPixel or any other type, so it can be used to switch a range of other pin types. 
-
-    <o [-]vpin red green blue [count]> sets the colour and on/off status of a pin or pins. Each colour is 0..255 e.g. <o 1005 255 255 0>  sets pin 1005 to bright yellow and ON, <0 -1006 0 0 255 10>  sets pins 1006 to 1015 (10 pins) to bright blue but OFF.     
-    Note: If you set a pin to a colour, you can turn it on and off without having to reset the colour every time. This is something the adafruit seesaw library can't do and is just one of several reasons why we dont use it.  
-
-3. Setting pixels from EXRAIL
-    The new NEOPIXEL macro provides the same functionality as the    <o [-]vpin red green blue [count]> command above. 
-    NEOPIXEL([-]vpin, red, green, blue [,count])
-    
-    Setting pixels on or off (without colour change) can be done with SET/RESET [currently there is no set range facility but that may be added as a general exrail thing... watch this space]
-
-    Because the pixels obey set/reset, the BLINK command can also be used to control blinking a pixel.
-
-4. EXRAIL pixel signals.
-    There are two types possible, a mast with separate fixed colour pixels for each aspect, or a mast with one multiple colour pixel for all aspects.
-
-    For separate pixels, the colours should be established at startup and a normal SIGNALH macro used.
-    
-  AUTOSTART 
-    SIGNALH(1010,1011,1012)
-    NEOPIXEL(1010,255,0,0)       
-    NEOPIXEL(1011,128,128,0)
-    NEOPIXEL(1012,0,255,0)
-    RED(1010)  // force signal state otherwise all 3 lights will be on
-    DONE 
-
-    For signals with 1 pixel, the NEOPIXEL_SIGNAL macro will create a signal 
-    NEOPIXEL_SIGNAL(vpin,redfx,amberfx,greenfx)
-
-    ** Changed... ****
-    The fx values above can be created by the NeoRGB macro so a bright red would be NeoRGB(255,0,0)  bright green NeoRGB(0,255,0) and amber something like NeoRGB(255,100,0)
-    NeoRGB creates a single int32_t value so it can be used in several ways as convenient.
-
-// create 1-lamp signal with NeoRGB colours
-NEOPIXEL_SIGNAL(1000,NeoRGB(255,0,0),NeoRGB(255,100,0),NeoRGB(0,255,0))
-
-// Create 1-lamp signal with named colours.
-// This is better if you have multiple signals.
-// (Note: ALIAS is not suitable due to word length defaults) 
-#define REDLAMP NeoRGB(255,0,0)
-#define AMBERLAMP NeoRGB(255,100,0)
-#define GREENLAMP NeoRGB(0,255,0)
-NEOPIXEL_SIGNAL(1001,REDLAMP,AMBERLAMP,GREENLAMP)
-
-// Create 1-lamp signal with web type RGB colours 
-// (Using blue for the amber  signal , just testing) 
-NEOPIXEL_SIGNAL(1002,0xFF0000,0x0000FF,0x00FF00)
-
-      
-  

Release_Notes/TCA8418.md

@@ -1,44 +0,0 @@
-## TCA8418 ##
-
-The TCA8418 IC from Texas Instruments is a low cost and very capable GPIO and keyboard scanner. Used as a keyboard scanner, it has 8 rows of 10 columns of IO pins which allow encoding of up to 80 buttons. The IC is available on an Adafruit board with Qwiic I2C interconnect called the "Adafruit TCA8418 Keypad Matrix and GPIO Expander Breakout" and available here for the modest sum of $US6 or so: https://www.adafruit.com/product/4918
-
-The great advantage of this IC is that the keyboard scanning is done continuously, and it has a 10-element event queue, so even if you don't get to the interrupt immediately, keypress and release events will be held for you. Since it's I2C its very easy to use with any DCC-EX command station.
-
-The TCA8418 driver presently configures the IC in the full 8x10 keyboard scanning mode, and then maps each key down/key up event to the state of a single vpin for extremely easy use from within EX-RAIL and JMRI as each key looks like an individual sensor.
-
-This is ideal for mimic panels where you may need a lot of buttons, but with this board you can use just 18 wires to handle as many as 80 buttons.
-
-By adding a simple HAL statement to myAutomation.h it creates between 1 and 80 buttons it will report back.
-
-`HAL(TCA8418, firstVpin, numPins, I2CAddress, interruptPin)`
-
-For example:
-
-`HAL(TCA8418, 300, 80, 0x34)`
-
-Creates VPINs 300-379 which you can monitor with EX-RAIL, JMRI sensors etc.
-
-With an 8x10 key event matrix, the events are numbered using the Rn row pins and Cn column pins as such:
-
-     C0  C1  C2  C3  C4  C5  C6  C7  C8  C9
-    ========================================
- R0|  0   1   2   3   4   5   6   7   8   9
- R1| 10  11  12  13  14  15  16  17  18  19
- R2| 20  21  22  23  24  25  26  27  28  29
- R3| 30  31  32  33  34  35  36  37  38  39
- R4| 40  41  42  43  44  45  46  47  48  49
- R5| 50  51  52  53  54  55  56  57  58  59
- R6| 60  61  62  63  64  65  66  67  68  69
- R7| 70  71  72  73  74  75  76  77  78  79
-
-So if you start with the first pin definition being VPIN 300, R0/C0 will be 300 + 0, and R7/C9 will be 300+79 or 379.
-
-Use something like this on a multiplexor, and with up to 8 of the 8-way multiplexors you could have 64 different TCA8418 boards:
-
-`HAL(TCA8418, 400, 80, {SubBus_1, 0x34})`
-
-And if needing an Interrupt pin to speed up operations:
-`HAL(TCA8418, 300, 80, 0x34, 21)`
-
-Note that using an interrupt pin speeds up button press acquisition considerably (less than a millisecond vs 10-100), but even with interrupts enabled the code presently checks every 100ms in case the interrupt pin becomes disconnected. Use any available Arduino pin for interrupt monitoring.
-

Release_Notes/TM1638.md

@@ -1,84 +0,0 @@
-## TM1638 ##
-
-The TM1638 board provides a very cheap way of implementing 8 buttons, 8 leds and an 8 digit 7segment display in a package requiring just 5 Dupont wires (vcc, gnd + 3 GPIO pins) from the command station without soldering.
-
-
-This is ideal for prototyping and testing, simulating sensors and signals, displaying states etc. For a built layout, this could provide a control for things that are not particularly suited to throttle 'route' buttons, perhaps lineside automations or fiddle yard lane selection.  
-
-By adding a simple HAL statement to myAutomation.h it creates 8 buttons/sensors and 8 leds.
-
-`HAL(TM1638,500,29,31,33)`
-Creates VPINs 500-507 And desscribes the GPIO pins used to connect the clk,dio,stb pins on the TM1638 board. 
-
-Setting each of the VPINs will control the associated LED (using for example SET, RESET or BLINK in Exrail or `<z 500> <z -501>  from a command).
-
-Unlike most pins, you can also read the same pin number and get the button state, using Exrail IF/AT/ONBUTTON etc.
-
-For example:
-`
-HAL(TM1638,500,29,31,33)
-`
-All the folowing examples assume you are using VPIN 500 as the first, leftmost,  led/button on the TM1638 board.
-
- 
-`ONBUTTON(500) 
-  SET(500)     // light the first led
-  BLINK(501,500,500) // blink the second led
-  SETLOCO(3) FWD(50) // set a loco going   
-  AT(501) STOP // press second button to stop
-  RESET(500) RESET(501)  // turn leds off
-  DONE
-`
-
-Buttons behave like any other sensor, so using `<S 500 500 1>`  will cause the command station to issue `<Q 500>` and `<q 500>` messages when the first button is pressed or released.
-
-Exrail `JMRI_SENSOR(500,8)` will create `<S` commands for all 8 buttons.  
-
-## Using the 7 Segment display ##
-
-The 8 digit display can be treated as 8 separate digits (left most being the same VPIN as the leftmost button and led) or be written to in sections of any length. Writing uses the existing analogue interface to the common HAL but is awkward to use directly.  To make this easier from Exrail, a SEG7 macro provides a remapping to the ANOUT facility that makes more sense. 
-
-SEG7(vpin,value,format)
-
-The vpin determins which digit to start writing at. 
-The value can be a 32bit unsigned integer but is interpreted differentlky according to the format.
-
-Format values:
- 1..8  give the length (number of display digits) to fill, and defaults to decimal number with leading zeros.
-
- 1X..8X give the length but display in hex.
-
- 1R..4R treats each byte of the value as raw 7-segment patterns so that it can write letters and symbols using any compination of the 7segments and deciml point.
-
- There is a useful description here:
- https://jetpackacademy.com/wp-content/uploads/2018/06/TM1638_cheat_sheet_download.pdf
-
-
- e.g.  SEG7(500,3,4)
-        writes 0003 to first 4 digits of the display
-       SEG7(504,0xcafe,4X)
-        writes CAFE to the last 4 digits
-       SEG7(500,0xdeadbeef,8X) 
-        writes dEAdbEEF to all 8 digits. 
-
-    Writing raw segment patters requires knowledge of the bit pattern to segment relationship:
-`      0
-    == 0 ==
-   5|     | 1
-    == 6 ==
-  4 |     | 2
-    == 3 ==  
-            7=decimal point
-
-            Thus Letter A is segments  6 5 4 2 1 0, in bits  that is (0 bit on right)          
-               0b01110111  or 0x77
-    This is not easy to do my hand and thus a new string type suffix has been introduced to make simple text messages. Note that the HAL interface only has width for 32 bits which is only 4 symbols so writing 8 digits requires two calls.
-
-    e.g.  SEG7(500,"Hell"_s7,4R) SEG7(504,"o"_s7,4R)
-          DELAY(1000)
-          SEG7(500,"Worl"_s7,4R) SEG7(504,"d"_s7,4R)
-
-    Note that some letters like k,m,v,x do not have particularly readable 7-segment representations. 
-                     
-    Credit to https://github.com/dvarrel/TM1638 for the basic formulae.
-

SerialManager.cpp

@@ -1,7 +1,7 @@
  /*
  *  © 2022 Paul M. Antoine
  *  © 2021 Chris Harlow
- *  © 2022 2024 Harald Barth
+ *  © 2022 Harald Barth
  *  All rights reserved.
  *  
  *  This file is part of DCC++EX
@@ -23,7 +23,6 @@
 #include "SerialManager.h"
 #include "DCCEXParser.h"
 #include "StringFormatter.h"
-#include "DIAG.h"
 
 #ifdef ARDUINO_ARCH_ESP32
 #ifdef SERIAL_BT_COMMANDS
@@ -37,10 +36,6 @@ BluetoothSerial SerialBT;
 #endif //COMMANDS
 #endif //ESP32
 
-static const byte PAYLOAD_FALSE = 0;
-static const byte PAYLOAD_NORMAL = 1;
-static const byte PAYLOAD_STRING = 2;
-
 SerialManager * SerialManager::first=NULL;
 
 SerialManager::SerialManager(Stream * myserial) {
@@ -48,7 +43,7 @@ SerialManager::SerialManager(Stream * myserial) {
   next=first;
   first=this;
   bufferLength=0;
-  inCommandPayload=PAYLOAD_FALSE; 
+  inCommandPayload=false; 
 } 
 
 void SerialManager::init() {
@@ -73,11 +68,7 @@ void SerialManager::init() {
   new SerialManager(&Serial3);
 #endif
 #ifdef SERIAL2_COMMANDS
-#ifdef ARDUINO_ARCH_ESP32
-  Serial2.begin(115200, SERIAL_8N1, 16, 17); // GPIO 16 RXD2; GPIO 17 TXD2 on ESP32
-#else  // not ESP32
   Serial2.begin(115200);
-#endif // ESP32
   new SerialManager(&Serial2);
 #endif
 #ifdef SERIAL1_COMMANDS
@@ -97,11 +88,7 @@ void SerialManager::init() {
   }
 #endif
 #ifdef SABERTOOTH
-#ifdef ARDUINO_ARCH_ESP32
   Serial2.begin(9600, SERIAL_8N1, 16, 17); // GPIO 16 RXD2; GPIO 17 TXD2 on ESP32
-#else
-  Serial2.begin(9600);
-#endif
 #endif
 }
 
@@ -119,37 +106,21 @@ void SerialManager::loop() {
 void SerialManager::loop2() {
     while (serial->available()) {
         char ch = serial->read();
-    if (!inCommandPayload) {
         if (ch == '<') {
-        inCommandPayload = PAYLOAD_NORMAL;
+            inCommandPayload = true;
             bufferLength = 0;
             buffer[0] = '\0';
         }
-    } else { // if (inCommandPayload)
+        else if  (inCommandPayload) {
 	  if (bufferLength <  (COMMAND_BUFFER_SIZE-1))
 	    buffer[bufferLength++] = ch;
-      if (inCommandPayload > PAYLOAD_NORMAL) {
-        if (inCommandPayload > 32 + 2) {    // String way too long
-          ch = '>';                         // we end this nonsense
-          inCommandPayload = PAYLOAD_NORMAL;
-          DIAG(F("Parse error: Unbalanced string"));
-          // fall through to ending parsing below
-        } else if (ch == '"') {               // String end
-          inCommandPayload = PAYLOAD_NORMAL;
-          continue; // do not fall through
-        } else
-          inCommandPayload++;
-      }
-      if (inCommandPayload == PAYLOAD_NORMAL) {
 	  if (ch == '>') {
 	    buffer[bufferLength] = '\0';
 	    DCCEXParser::parse(serial, buffer, NULL); 
-          inCommandPayload = PAYLOAD_FALSE;
+	    inCommandPayload = false;
 	    break;
-        } else if (ch == '"') {
-          inCommandPayload = PAYLOAD_STRING;
-        }
 	  }
         }
     }
+    
 }

SerialManager.h

@@ -44,6 +44,6 @@ private:
   SerialManager * next;
   byte bufferLength;
   byte buffer[COMMAND_BUFFER_SIZE]; 
-  byte inCommandPayload;
+  bool inCommandPayload;
 };
 #endif

StringBuffer.cpp

@@ -41,3 +41,5 @@ size_t StringBuffer::write(uint8_t b) {
   _buffer[_pos_write]='\0';
   return 1;
 }
+
+

TrackManager.cpp

@@ -151,8 +151,8 @@ void TrackManager::setDCCSignal( bool on) {
   HAVE_PORTD(shadowPORTD=PORTD);
   HAVE_PORTE(shadowPORTE=PORTE);
   HAVE_PORTF(shadowPORTF=PORTF);
-  HAVE_PORTG(shadowPORTG=PORTG);
+  HAVE_PORTG(shadowPORTF=PORTG);
-  HAVE_PORTH(shadowPORTH=PORTH);
+  HAVE_PORTH(shadowPORTF=PORTH);
   APPLY_BY_MODE(TRACK_MODE_MAIN,setSignal(on));
   HAVE_PORTA(PORTA=shadowPORTA);
   HAVE_PORTB(PORTB=shadowPORTB);
@@ -160,8 +160,8 @@ void TrackManager::setDCCSignal( bool on) {
   HAVE_PORTD(PORTD=shadowPORTD);
   HAVE_PORTE(PORTE=shadowPORTE);
   HAVE_PORTF(PORTF=shadowPORTF);
-  HAVE_PORTG(PORTG=shadowPORTG);
+  HAVE_PORTG(shadowPORTF=PORTG);
-  HAVE_PORTH(PORTH=shadowPORTH);
+  HAVE_PORTH(shadowPORTF=PORTH);
 }
 
 // setPROGSignal(), called from interrupt context
@@ -173,8 +173,8 @@ void TrackManager::setPROGSignal( bool on) {
   HAVE_PORTD(shadowPORTD=PORTD);
   HAVE_PORTE(shadowPORTE=PORTE);
   HAVE_PORTF(shadowPORTF=PORTF);
-  HAVE_PORTG(shadowPORTG=PORTG);
+  HAVE_PORTG(shadowPORTF=PORTG);
-  HAVE_PORTH(shadowPORTH=PORTH);
+  HAVE_PORTH(shadowPORTF=PORTH);
   APPLY_BY_MODE(TRACK_MODE_PROG,setSignal(on));
   HAVE_PORTA(PORTA=shadowPORTA);
   HAVE_PORTB(PORTB=shadowPORTB);
@@ -182,8 +182,8 @@ void TrackManager::setPROGSignal( bool on) {
   HAVE_PORTD(PORTD=shadowPORTD);
   HAVE_PORTE(PORTE=shadowPORTE);
   HAVE_PORTF(PORTF=shadowPORTF);
-  HAVE_PORTG(PORTG=shadowPORTG);
+  HAVE_PORTG(shadowPORTF=PORTG);
-  HAVE_PORTH(PORTH=shadowPORTH);
+  HAVE_PORTH(shadowPORTF=PORTH);
 }
 
 // setDCSignal(), called from normal context
@@ -389,10 +389,6 @@ bool TrackManager::parseEqualSign(Print *stream, int16_t params, int16_t p[])
     
     if (params==2  && p[1]=="MAIN"_hk) // <= id MAIN>
         return setTrackMode(p[0],TRACK_MODE_MAIN);
-    if (params==2  && p[1]=="MAIN_INV"_hk)                 // <= id MAIN_INV>
-        return setTrackMode(p[0],TRACK_MODE_MAIN_INV);
-    if (params==2  && p[1]=="MAIN_AUTO"_hk)                // <= id MAIN_AUTO>
-        return setTrackMode(p[0],TRACK_MODE_MAIN_AUTO);
     
 #ifndef DISABLE_PROG
     if (params==2  && p[1]=="PROG"_hk) // <= id PROG>
@@ -408,25 +404,18 @@ bool TrackManager::parseEqualSign(Print *stream, int16_t params, int16_t p[])
     if (TRACK_MODE_BOOST != 0 &&        // compile time optimization
 	params==2  && p[1]=="BOOST"_hk) // <= id BOOST>
         return setTrackMode(p[0],TRACK_MODE_BOOST);
-    if (TRACK_MODE_BOOST_INV != 0 &&        // compile time optimization
-	params==2  && p[1]=="BOOST_INV"_hk)                // <= id BOOST_INV>
-        return setTrackMode(p[0],TRACK_MODE_BOOST_INV);
-    if (TRACK_MODE_BOOST_AUTO != 0 &&        // compile time optimization
-	params==2  && p[1]=="BOOST_AUTO"_hk)               // <= id BOOST_AUTO>
-        return setTrackMode(p[0],TRACK_MODE_BOOST_AUTO);
 #endif
     if (params==2  && p[1]=="AUTO"_hk) // <= id AUTO>
-      return setTrackMode(p[0], track[p[0]]->getMode() | TRACK_MODIFIER_AUTO);
+      return setTrackMode(p[0], track[p[0]]->getMode() | TRACK_MODE_AUTOINV);
 
     if (params==2  && p[1]=="INV"_hk) // <= id INV>
-      return setTrackMode(p[0], track[p[0]]->getMode() | TRACK_MODIFIER_INV);
+      return setTrackMode(p[0], track[p[0]]->getMode() | TRACK_MODE_INV);
 
     if (params==3  && p[1]=="DC"_hk && p[2]>0) // <= id DC cab>
         return setTrackMode(p[0],TRACK_MODE_DC,p[2]);
     
-    if (params==3  && (p[1]=="DC_INV"_hk ||                // <= id DC_INV cab>
+    if (params==3  && p[1]=="DCX"_hk && p[2]>0) // <= id DCX cab>
-		       p[1]=="DCX"_hk) && p[2]>0)          // <= id DCX cab>
+        return setTrackMode(p[0],TRACK_MODE_DC|TRACK_MODE_INV,p[2]);
-        return setTrackMode(p[0],TRACK_MODE_DC_INV,p[2]);
 
     return false;
 }
@@ -435,9 +424,9 @@ const FSH* TrackManager::getModeName(TRACK_MODE tm) {
   const FSH *modename=F("---");
   
   if (tm & TRACK_MODE_MAIN) {
-    if(tm & TRACK_MODIFIER_AUTO)
+    if(tm & TRACK_MODE_AUTOINV)
       modename=F("MAIN A");
-    else if (tm & TRACK_MODIFIER_INV)
+    else if (tm & TRACK_MODE_INV)
       modename=F("MAIN I>\n");
     else
       modename=F("MAIN");
@@ -451,15 +440,15 @@ const FSH* TrackManager::getModeName(TRACK_MODE tm) {
   else if(tm & TRACK_MODE_EXT)
     modename=F("EXT");
   else if(tm & TRACK_MODE_BOOST) {
-        if(tm & TRACK_MODIFIER_AUTO)
+        if(tm & TRACK_MODE_AUTOINV)
       modename=F("BOOST A");
-    else if (tm & TRACK_MODIFIER_INV)
+    else if (tm & TRACK_MODE_INV)
       modename=F("BOOST I");
     else
       modename=F("BOOST");
   }
   else if (tm & TRACK_MODE_DC) {
-    if (tm & TRACK_MODIFIER_INV)
+    if (tm & TRACK_MODE_INV)
       modename=F("DCX");
     else
       modename=F("DC");
@@ -697,3 +686,4 @@ TRACK_MODE TrackManager::getMode(byte t) {
 int16_t TrackManager::returnDCAddr(byte t) {
     return (trackDCAddr[t]);
 }
+

Turnouts.cpp

@@ -527,3 +527,4 @@
     StringFormatter::send(stream, F("<H %d LCN %d>\n"), _turnoutData.id, 
     !_turnoutData.closed); 
   }
+

WiThrottle.cpp

@@ -322,15 +322,6 @@ void WiThrottle::locoAction(RingStream * stream, byte* aval, char throttleChar,
       }
       break;  
     }
-  case 'f': // Function key set, force function variant
-    {
-      bool pressed=aval[1]=='1';
-      int fKey = getInt(aval+2);
-      LOOPLOCOS(throttleChar, cab) {
-	DCC::setFn(myLocos[loco].cab,fKey, pressed);
-      }
-      break;
-    }
   case 'q':
     if (aval[1]=='V' || aval[1]=='R' ) {   //qV or qR
       // just flag the loco for broadcast and it will happen.

WifiESP32.cpp

@@ -23,13 +23,13 @@
 #include <vector>
 #include "defines.h"
 #include "ESPmDNS.h"
+#include <WiFi.h>
 #include "esp_wifi.h"
 #include "WifiESP32.h"
 #include "DIAG.h"
 #include "RingStream.h"
 #include "CommandDistributor.h"
 #include "WiThrottle.h"
-#include "DCC.h"
 /*
 #include "soc/rtc_wdt.h"
 #include "esp_task_wdt.h"
@@ -109,13 +109,10 @@ private:
   bool inUse;
 };
 
-// file scope variables
 static std::vector<NetworkClient> clients; // a list to hold all clients
+static WiFiServer *server = NULL;
 static RingStream *outboundRing = new RingStream(10240);
 static bool APmode = false;
-// init of static class scope variables
-bool WifiESP::wifiUp = false;
-WiFiServer *WifiESP::server = NULL;
 
 #ifdef WIFI_TASK_ON_CORE0
 void wifiLoop(void *){
@@ -131,30 +128,6 @@ char asciitolower(char in) {
   return in;
 }
 
-void WifiESP::teardown() {
-  // stop all locos
-  DCC::setThrottle(0,1,1); // this broadcasts speed 1(estop) and sets all reminders to speed 1.
-  // terminate all clients connections
-  while (!clients.empty()) {
-    // pop_back() should invoke destructor which does stop()
-    // on the underlying TCP connction
-    clients.pop_back();
-  }
-  // stop server
-  if (server != NULL) {
-    server->stop();
-    server->close();
-    server->end();
-    DIAG(F("server stop, close, end"));
-  }
-  // terminate MDNS anouncement
-  mdns_service_remove_all();
-  mdns_free();
-  // stop WiFi
-  WiFi.disconnect(true);
-  wifiUp = false;
-}
-
 bool WifiESP::setup(const char *SSid,
                     const char *password,
                     const char *hostname,
@@ -163,10 +136,8 @@ bool WifiESP::setup(const char *SSid,
                     const bool forceAP) {
   bool havePassword = true;
   bool haveSSID = true;
-//  bool wifiUp = false;
+  bool wifiUp = false;
   uint8_t tries = 40;
-  if (wifiUp)
-    teardown();
 
   //#ifdef SERIAL_BT_COMMANDS
   //return false;
@@ -294,7 +265,7 @@ bool WifiESP::setup(const char *SSid,
   if(!MDNS.begin(hostname)) {
     DIAG(F("Wifi setup failed to start mDNS"));
   }
-  if(!MDNS.addService("withrottle", "tcp", port)) {
+  if(!MDNS.addService("withrottle", "tcp", 2560)) {
     DIAG(F("Wifi setup failed to add withrottle service to mDNS"));
   }
 

WifiESP32.h

@@ -22,7 +22,6 @@
 #ifndef WifiESP32_h
 #define WifiESP32_h
 
-#include <WiFi.h>
 #include "FSH.h"
 
 class WifiESP
@@ -37,9 +36,6 @@ public:
 			const bool forceAP);
   static void loop();
 private:
-  static void teardown();
-  static bool wifiUp;
-  static WiFiServer *server;
 };
 #endif //WifiESP8266_h
 #endif //ESP8266

WifiInterface.cpp

@@ -72,9 +72,8 @@ Stream * WifiInterface::wifiStream;
 #elif defined(ARDUINO_NUCLEO_F413ZH) || defined(ARDUINO_NUCLEO_F429ZI) \
     || defined(ARDUINO_NUCLEO_F446ZE) || defined(ARDUINO_NUCLEO_F412ZG) \
     || defined(ARDUINO_NUCLEO_F439ZI) || defined(ARDUINO_NUCLEO_F4X9ZI)
-#define NUM_SERIAL 3
+#define NUM_SERIAL 2
 #define SERIAL1 Serial6
-#define SERIAL3 Serial2
 #else
 #warning This variant of Nucleo not yet explicitly supported
 #endif

config.example.h

@@ -337,19 +337,5 @@ The configuration file for DCC-EX Command Station
 // to the sabertooth controller _as_well_. Default: Undefined.
 //
 //#define SABERTOOTH 1
-//
+
-/////////////////////////////////////////////////////////////////////////////////////
-//
-// SENSORCAM
-// ESP32-CAM based video sensors require #define to use appropriate base vpin number.
-//#define SENSORCAM_VPIN 700
-// To bypass vPin number, define CAM for ex-rail use e.g. AT(CAM 012) for S12 etc.
-//#define CAM SENSORCAM_VPIN+
-//
-//#define SENSORCAM2_VPIN 600   //define other CAM's if installed.
-//#define CAM2 SENSORCAM2_VPIN+ //for EX-RAIL commands e.g. IFLT(CAM2 020,1)
-//
-// For smoother power-up, define a STARTUP_DELAY to allow CAM to initialise ref images
-//#define STARTUP_DELAY 5000    // up to 20sec. CS delay
-//
 /////////////////////////////////////////////////////////////////////////////////////

platformio.ini

@@ -104,35 +104,10 @@ lib_deps =
 	${env.lib_deps}
 	arduino-libraries/Ethernet
 	SPI
-	MDNS_Generic
-
-lib_ignore = WiFi101
-			WiFi101_Generic
-			WiFiEspAT
-			WiFiMulti_Generic
-			WiFiNINA_Generic
-
 monitor_speed = 115200
 monitor_echo = yes
 build_flags = 
 
-[env:mega2560-eth]
-platform = atmelavr
-board = megaatmega2560
-framework = arduino
-lib_deps = 
-    ${env.lib_deps}
-    arduino-libraries/Ethernet
-    MDNS_Generic
-    SPI
-lib_ignore = WiFi101
-            WiFi101_Generic
-            WiFiEspAT
-            WiFiMulti_Generic
-            WiFiNINA_Generic
-monitor_speed = 115200
-monitor_echo = yes
-
 [env:mega328]
 platform = atmelavr
 board = uno
@@ -202,7 +177,7 @@ monitor_speed = 115200
 monitor_echo = yes
 
 [env:Nucleo-F411RE]
-platform = ststm32 @ 17.6.0
+platform = ststm32
 board = nucleo_f411re
 framework = arduino
 lib_deps = ${env.lib_deps}
@@ -211,7 +186,7 @@ monitor_speed = 115200
 monitor_echo = yes
 
 [env:Nucleo-F446RE]
-platform = ststm32 @ 17.6.0
+platform = ststm32
 board = nucleo_f446re
 framework = arduino
 lib_deps = ${env.lib_deps}
@@ -223,7 +198,7 @@ monitor_echo = yes
 ; tested as yet
 ;
 [env:Nucleo-F401RE]
-platform = ststm32 @ 17.6.0
+platform = ststm32
 board = nucleo_f401re
 framework = arduino
 lib_deps = ${env.lib_deps}
@@ -236,7 +211,7 @@ monitor_echo = yes
 ; installed before you can let PlatformIO see this
 ;
 ; [env:Nucleo-F413ZH]
-; platform = ststm32 @ 17.6.0
+; platform = ststm32
 ; board = nucleo_f413zh
 ; framework = arduino
 ; lib_deps = ${env.lib_deps}
@@ -247,21 +222,21 @@ monitor_echo = yes
 ; Commented out by default as the F446ZE needs variant files
 ; installed before you can let PlatformIO see this
 ;
-[env:Nucleo-F446ZE]
+; [env:Nucleo-F446ZE]
-platform = ststm32 @ 17.6.0
+; platform = ststm32
-board = nucleo_f446ze
+; board = nucleo_f446ze
-framework = arduino
+; framework = arduino
-lib_deps = ${env.lib_deps}
+; lib_deps = ${env.lib_deps}
-build_flags = -std=c++17  -Os -g2 -Wunused-variable
+; build_flags = -std=c++17  -Os -g2 -Wunused-variable
-monitor_speed = 115200
+; monitor_speed = 115200
-monitor_echo = yes
+; monitor_echo = yes
 
 ; Commented out by default as the F412ZG needs variant files
 ; installed before you can let PlatformIO see this
 ;
 ; [env:Nucleo-F412ZG]
-; platform = ststm32 @ 17.6.0
+; platform = ststm32
-; board = nucleo_f412zg
+; board = blah_f412zg
 ; framework = arduino
 ; lib_deps = ${env.lib_deps}
 ; build_flags = -std=c++17 -Os -g2 -Wunused-variable
@@ -271,47 +246,18 @@ monitor_echo = yes
 
 ; Experimental - Ethernet work still in progress
 ;
-[env:Nucleo-F429ZI]
+; [env:Nucleo-F429ZI]
-platform = ststm32 @ 17.6.0
+; platform = ststm32
-board = nucleo_f429zi
+; board = nucleo_f429zi
-framework = arduino
+; framework = arduino
-lib_deps = ${env.lib_deps}
+; lib_deps = ${env.lib_deps}
-			stm32duino/STM32Ethernet @ ^1.4.0
+; 			arduino-libraries/Ethernet @ ^2.0.1
-			stm32duino/STM32duino LwIP @ ^2.1.3
+; 			stm32duino/STM32Ethernet @ ^1.3.0
-			MDNS_Generic
+; 			stm32duino/STM32duino LwIP @ ^2.1.2
-lib_ignore = WiFi101
+; build_flags = -std=c++17 -Os -g2 -Wunused-variable
-			WiFi101_Generic
+; monitor_speed = 115200
-			WiFiEspAT
+; monitor_echo = yes
-			WiFiMulti_Generic
+; upload_protocol = stlink
-			WiFiNINA_Generic
-build_flags = -std=c++17 -Os -g2 -Wunused-variable
-monitor_speed = 115200
-monitor_echo = yes
-upload_protocol = stlink
-
-; Experimental - Ethernet work still in progress
-;
-[env:Nucleo-F439ZI]
-platform = ststm32 @ 17.6.0
-; board = nucleo_f439zi
-; Temporarily treat it as an F429ZI (they are code compatible) until
-; the PR to PlatformIO to update the F439ZI JSON file is available
-; PMA - 28-Sep-2024
-board = nucleo_f429zi
-framework = arduino
-lib_deps = ${env.lib_deps}
-			stm32duino/STM32Ethernet @ ^1.4.0
-			stm32duino/STM32duino LwIP @ ^2.1.3
-			MDNS_Generic
-lib_ignore = WiFi101
-			WiFi101_Generic
-			WiFiEspAT
-			WiFiMulti_Generic
-			WiFiNINA_Generic
-build_flags = -std=c++17 -Os -g2 -Wunused-variable
-monitor_speed = 115200
-monitor_echo = yes
-upload_protocol = stlink
 
 [env:Teensy3_2]
 platform = teensy

version.h

@@ -3,27 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.2.90"
+#define VERSION "5.2.74"
-// 5.2.90 - Bugfix: EXRAIL EXTT_TURNTABLE() now has description as optional in line with ocumentation (also fixed DCC_TURNTABLE) 
-// 5.2.89 - EXRAIL SET(vpin[,npins]) RESET(vpin,[,npins]) pin range manipulation 
-// 5.2.88 - Fix bug where EX-Turntable objects return incorrect angle for home with <JP x>
-// 5.2.87 - CamParser and IO_EXSensorCam driver
-// 5.2.86 - IO_TCA8418 driver for keypad matrix input now fully functioning, including being able to use an interrupt pin
-// 5.2.85 - IO_TM1638 driver, SEG7 Exrail macro and _s7 segment pattern generator.
-// 5.2.84 - Fix TrackManager setDCCSignal and setPROGSignal for STM32 shadowing of PORTG/PORTH - this time it really is correct!
-// 5.2.83 - Various STM32 related fixes for serial ports, I2C pullups now turned off, and shadowing of PORTG/PORTH for TrackManager now correct
-// 5.2.82 - TrackManager and EXRAIL: Introduce more consistent names for <= ...> and SET_TRACK
-// 5.2.81 - STM32 Ethernet boards support, also now have specific EX8874 motor driver definition
-// 5.2.80 - EthernetInterface upgrade, including STM32 Ethernet support
-// 5.2.79 - serial manager loop that handles quoted strings
-//        - WiFiESP32 reconfig
-// 5.2.78 - NeoPixel support.
-//        - <o command
-//        - HAL driver 
-//        - EXRAIL NEOPIXEL and NEOPIXEL_SIGNAL   
-// 5.2.77 - Withrottle: Implement "force function" subcommand "f"
-// 5.2.76 - Bugfix: EXRAIL: Catch CV read errors in the callback
-// 5.2.75 - Bugfix: Serial lines 4 to 6 OK
 // 5.2.74 - Bugfix: ESP32 turn on the joined prog (as main) again after a prog operation
 // 5.2.73 - Bugfix: STM32 further fixes to shadowPORT entries in TrackManager.cpp for PORTG and PORTH
 // 5.2.72 - Bugfix: added shadowPORT entries in TrackManager.cpp for PORTG and PORTH on STM32, fixed typo in MotorDriver.cpp