fix typo and remove debug stuff

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-github: DCC-EX
-patreon: dccex

.github/workflows/label-sponsors.yml

@@ -1,14 +0,0 @@
-name: Label sponsors
-on:
-  pull_request:
-    types: [opened]
-  issues:
-    types: [opened]
-jobs:
-  build:
-    name: is-sponsor-label
-    runs-on: ubuntu-latest
-    steps:
-      - uses: JasonEtco/is-sponsor-label-action@v1.2.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sha.yml

@@ -24,11 +24,10 @@ jobs:
           sha=$(git rev-parse --short "$GITHUB_SHA")
           echo "#define GITHUB_SHA \"$sha\"" > GITHUB_SHA.h
 
-      - uses: EndBug/add-and-commit@v8 # You can change this to use a specific version
+      - uses: EndBug/add-and-commit@v4 # You can change this to use a specific version
         with:
           add: 'GITHUB_SHA.h'
           message: 'Committing a SHA'
-          commit: --amend
 
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Leave this line unchanged

.gitignore

@@ -7,14 +7,11 @@ Release/*
 .pio/
 .vscode/
 config.h
-.vscode/*
+.vscode/extensions.json
 mySetup.h
 mySetup.cpp
-myHal.cpp
 myAutomation.h
 myFilter.cpp
 myAutomation.h
 myFilter.cpp
 myLayout.h
-.vscode/extensions.json
-.vscode/extensions.json

.vscode/extensions.json

@@ -3,8 +3,5 @@
     // for the documentation about the extensions.json format
     "recommendations": [
         "platformio.platformio-ide"
-    ],
-    "unwantedRecommendations": [
-        "ms-vscode.cpptools-extension-pack"
     ]
 }

CommandDistributor.cpp

@@ -1,9 +1,6 @@
 /*
- *  © 2022 Harald Barth
- *  © 2020-2021 Chris Harlow
- *  © 2020 Gregor Baues
- *  All rights reserved.
- *
+ *  © 2020,Gregor Baues,  Chris Harlow. All rights reserved.
+ *  
  *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
@@ -19,171 +16,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
-
 #include <Arduino.h>
 #include "CommandDistributor.h"
-#include "SerialManager.h"
 #include "WiThrottle.h"
-#include "DIAG.h"
-#include "defines.h"
-#include "DCCWaveform.h"
-#include "DCC.h"
-#include "TrackManager.h"
 
+DCCEXParser * CommandDistributor::parser=0; 
 
-#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){
-  broadcastBufferWriter->flush();
-  StringFormatter::send(broadcastBufferWriter, msg...);
-  broadcastToClients(type);
-}
-#else
-// on a single USB connection config, write direct to Serial and ignore flush/shove
-template<typename... Targs> void CommandDistributor::broadcastReply(clientType type, Targs... msg){
-  (void)type; //shut up compiler warning
-  StringFormatter::send(&Serial, msg...);
-}
-#endif 
-
-#ifdef CD_HANDLE_RING
-  // wifi or ethernet ring streams with multiple client types
-  RingStream *  CommandDistributor::ring=0;
-  CommandDistributor::clientType  CommandDistributor::clients[8]={
-    NONE_TYPE,NONE_TYPE,NONE_TYPE,NONE_TYPE,NONE_TYPE,NONE_TYPE,NONE_TYPE,NONE_TYPE};
-
-// Parse is called by Withrottle or Ethernet interface to determine which
-// protocol the client is using and call the appropriate part of dcc++Ex
-void  CommandDistributor::parse(byte clientId,byte * buffer, RingStream * stream) {
-  if (Diag::WIFI && Diag::CMD)
-    DIAG(F("Parse C=%d T=%d B=%s"),clientId, clients[clientId], buffer);
-  ring=stream;
-
-  // First check if the client is not known
-  // yet and in that case determinine type
-  // NOTE: First character of transmission determines if this
-  // client is using the DCC++ protocol where all commands start
-  // with '<'
-  if (clients[clientId] == NONE_TYPE) {
-    if (buffer[0] == '<')
-      clients[clientId]=COMMAND_TYPE;
-    else
-      clients[clientId]=WITHROTTLE_TYPE;
-  }
-
-  // mark buffer that is sent to parser
-  ring->mark(clientId);
-
-  // When type is known, send the string
-  // to the right parser
-  if (clients[clientId] == COMMAND_TYPE) {
-    DCCEXParser::parse(stream, buffer, ring);
-  } else if (clients[clientId] == WITHROTTLE_TYPE) {
-    WiThrottle::getThrottle(clientId)->parse(ring, buffer);
-  }
-
-  if (ring->peekTargetMark()!=RingStream::NO_CLIENT) {
-    // The commit call will either write the length bytes
-    // OR rollback to the mark because the reply is empty
-    // or the command generated more output than fits in
-    // the buffer
-    if (!ring->commit()) {
-      DIAG(F("OUTBOUND FULL processing cmd:%s"),buffer);
-    }
-  } else {
-    DIAG(F("CD parse: was alredy committed")); //XXX Could have been committed by broadcastClient?!
+void  CommandDistributor::parse(byte clientId,byte * buffer, RingStream * streamer) {
+ if (buffer[0] == '<')  {
+    if (!parser) parser = new DCCEXParser();
+    parser->parse(streamer, buffer, streamer); 
   }
-}
-
-void CommandDistributor::forget(byte clientId) {
-  // keep for later if (clients[clientId]==WITHROTTLE_TYPE) WiThrottle::forget(clientId);
-  clients[clientId]=NONE_TYPE;
-}
-#endif 
-
-// This will not be called on a uno 
-void CommandDistributor::broadcastToClients(clientType type) {
-
-  byte rememberClient;
-  (void)rememberClient; // shut up compiler warning
-
-  // Broadcast to Serials
-  if (type==COMMAND_TYPE) SerialManager::broadcast(broadcastBufferWriter->getString());
-
-#ifdef CD_HANDLE_RING
-  // If we are broadcasting from a wifi/eth process we need to complete its output
-  // before merging broadcasts in the ring, then reinstate it in case
-  // the process continues to output to its client.
-  if (ring) {
-    if ((rememberClient = ring->peekTargetMark()) != RingStream::NO_CLIENT) {
-      //DIAG(F("CD precommit client %d"), rememberClient);
-      ring->commit();
-    }
-    // loop through ring clients
-    for (byte clientId=0; clientId<sizeof(clients); clientId++) {
-      if (clients[clientId]==type)  {
-	//DIAG(F("CD mark client %d"), clientId);
-	ring->mark(clientId);
-	ring->print(broadcastBufferWriter->getString());
-	//DIAG(F("CD commit client %d"), clientId);
-	ring->commit();
-      }
-    }
-    // at this point ring is committed (NO_CLIENT) either from
-    // 4 or 13 lines above.
-    if (rememberClient != RingStream::NO_CLIENT) {
-      //DIAG(F("CD postmark client %d"), rememberClient);
-      ring->mark(rememberClient);
-    }
-  }
-#endif
-}
-
-// Public broadcast functions below 
-void  CommandDistributor::broadcastSensor(int16_t id, bool on ) {
-  broadcastReply(COMMAND_TYPE, F("<%c %d>\n"), on?'Q':'q', id);
-}
-
-void  CommandDistributor::broadcastTurnout(int16_t id, bool isClosed ) {
-  // For DCC++ classic compatibility, state reported to JMRI is 1 for thrown and 0 for closed;
-  // The string below contains serial and Withrottle protocols which should
-  // be safe for both types.
-  broadcastReply(COMMAND_TYPE, F("<H %d %d>\n"),id, !isClosed);
-#ifdef CD_HANDLE_RING
-  broadcastReply(WITHROTTLE_TYPE, F("PTA%c%d\n"), isClosed?'2':'4', id);
-#endif
-}
-
-void  CommandDistributor::broadcastLoco(byte slot) {
-  DCC::LOCO * sp=&DCC::speedTable[slot];
-  broadcastReply(COMMAND_TYPE, F("<l %d %d %d %l>\n"), sp->loco,slot,sp->speedCode,sp->functions);
-#ifdef CD_HANDLE_RING
-  WiThrottle::markForBroadcast(sp->loco);
-#endif
-}
-
-void  CommandDistributor::broadcastPower() {
-  bool main=TrackManager::getMainPower()==POWERMODE::ON;
-  bool prog=TrackManager::getProgPower()==POWERMODE::ON;
-  bool join=TrackManager::isJoined();
-  const FSH * reason=F("");
-  char state='1';
-  if (main && prog && join) reason=F(" JOIN");
-  else if (main && prog);
-  else if (main) reason=F(" MAIN");
-  else if (prog) reason=F(" PROG");
-  else state='0';
-  broadcastReply(COMMAND_TYPE, F("<p%c%S>\n"),state,reason);
-#ifdef CD_HANDLE_RING
-  broadcastReply(WITHROTTLE_TYPE, F("PPA%c\n"), main?'1':'0');
-#endif
-  LCD(2,F("Power %S%S"),state=='1'?F("On"):F("Off"),reason);  
-}
-
-void CommandDistributor::broadcastText(const FSH * msg) {
-  broadcastReply(COMMAND_TYPE, F("<I %S>\n"),msg);
-#ifdef CD_HANDLE_RING
-  broadcastReply(WITHROTTLE_TYPE, F("Hm%S\n"), msg);
-#endif
+  else WiThrottle::getThrottle(clientId)->parse(streamer, buffer);
 }

CommandDistributor.h

@@ -1,9 +1,6 @@
 /*
- *  © 2022 Harald Barth
- *  © 2020-2021 Chris Harlow
- *  © 2020 Gregor Baues
- *  All rights reserved.
- *
+ *  © 2020,Gregor Baues,  Chris Harlow. All rights reserved.
+ *  
  *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
@@ -23,32 +20,13 @@
 #define CommandDistributor_h
 #include "DCCEXParser.h"
 #include "RingStream.h"
-#include "StringBuffer.h"
-#include "defines.h"
-
-#if WIFI_ON | ETHERNET_ON 
-  // Command Distributor must handle a RingStream of clients
-  #define CD_HANDLE_RING
-#endif 
 
 class CommandDistributor {
-private:
-  enum clientType: byte {NONE_TYPE,COMMAND_TYPE,WITHROTTLE_TYPE};
-  static void broadcastToClients(clientType type);
-  static StringBuffer * broadcastBufferWriter;
-  #ifdef CD_HANDLE_RING
-    static RingStream * ring;
-    static clientType clients[8];
-  #endif
+
 public :
-  static void parse(byte clientId,byte* buffer, RingStream * ring);
-  static void broadcastLoco(byte slot);
-  static void broadcastSensor(int16_t id, bool value);
-  static void broadcastTurnout(int16_t id, bool isClosed);
-  static void broadcastPower();
-  static void broadcastText(const FSH * msg);
-  template<typename... Targs> static void broadcastReply(clientType type, Targs... msg);
-  static void forget(byte clientId);
+  static void parse(byte clientId,byte* buffer, RingStream * streamer);
+private:
+   static DCCEXParser * parser;
 };
 
 #endif

CommandStation-EX.ino

@@ -1,37 +1,33 @@
 ////////////////////////////////////////////////////////////////////////////////////
-//  DCC-EX CommandStation-EX   Please see https://DCC-EX.com
+//  DCC-EX CommandStation-EX   Please see https://DCC-EX.com 
 //
 // This file is the main sketch for the Command Station.
-//
-// CONFIGURATION:
+// 
+// CONFIGURATION: 
 // Configuration is normally performed by editing a file called config.h.
 // This file is NOT shipped with the code so that if you pull a later version
 // of the code, your configuration will not be overwritten.
 //
 // If you used the automatic installer program, config.h will have been created automatically.
-//
-// To obtain a starting copy of config.h please copy the file config.example.h which is
-// shipped with the code and may be updated as new features are added.
-//
+// 
+// To obtain a starting copy of config.h please copy the file config.example.h which is 
+// shipped with the code and may be updated as new features are added. 
+// 
 // If config.h is not found, config.example.h will be used with all defaults.
 ////////////////////////////////////////////////////////////////////////////////////
 
 #if __has_include ( "config.h")
   #include "config.h"
-  #ifndef MOTOR_SHIELD_TYPE
-  #error Your config.h must include a MOTOR_SHIELD_TYPE definition. If you see this warning in spite not having a config.h, you have a buggy preprocessor and must copy config.example.h to config.h
-  #endif
 #else
-  #warning config.h not found. Using defaults from config.example.h
+  #warning config.h not found. Using defaults from config.example.h 
   #include "config.example.h"
 #endif
 
+
 /*
- *  © 2021 Neil McKechnie
- *  © 2020-2021 Chris Harlow, Harald Barth, David Cutting,
- *  Fred Decker, Gregor Baues, Anthony W - Dayton
- *  All rights reserved.
- *
+ *  © 2020,2021 Chris Harlow, Harald Barth, David Cutting, 
+ *  Fred Decker, Gregor Baues, Anthony W - Dayton  All rights reserved.
+ *  
  *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
@@ -50,19 +46,10 @@
 
 #include "DCCEX.h"
 
-#ifdef CPU_TYPE_ERROR
-#error CANNOT COMPILE - DCC++ EX ONLY WORKS WITH THE ARCHITECTURES LISTED IN defines.h
-#endif
-
-#ifdef WIFI_WARNING
-#warning You have defined that you want WiFi but your hardware has not enough memory to do that, so WiFi DISABLED
-#endif
-#ifdef ETHERNET_WARNING
-#warning You have defined that you want Ethernet but your hardware has not enough memory to do that, so Ethernet DISABLED
-#endif
-#ifdef EXRAIL_WARNING
-#warning You have myAutomation.h but your hardware has not enough memory to do that, so EX-RAIL DISABLED
-#endif
+// Create a serial command parser for the USB connection, 
+// This supports JMRI or manual diagnostics and commands
+// to be issued from the USB serial console.
+DCCEXParser serialParser;
 
 void setup()
 {
@@ -70,60 +57,59 @@ void setup()
 
   // Responsibility 1: Start the usb connection for diagnostics
   // This is normally Serial but uses SerialUSB on a SAMD processor
-  SerialManager::init();
+  Serial.begin(115200);
 
   DIAG(F("License GPLv3 fsf.org (c) dcc-ex.com"));
 
   CONDITIONAL_LCD_START {
-    // This block is still executed for DIAGS if LCD not in use
+    // This block is still executed for DIAGS if LCD not in use 
     LCD(0,F("DCC++ EX v%S"),F(VERSION));
-    LCD(1,F("Lic GPLv3"));
-  }
+    LCD(1,F("Lic GPLv3")); 
+    }   
 
   // Responsibility 2: Start all the communications before the DCC engine
   // Start the WiFi interface on a MEGA, Uno cannot currently handle WiFi
   // Start Ethernet if it exists
-#ifndef ARDUINO_ARCH_ESP32
 #if WIFI_ON
   WifiInterface::setup(WIFI_SERIAL_LINK_SPEED, F(WIFI_SSID), F(WIFI_PASSWORD), F(WIFI_HOSTNAME), IP_PORT, WIFI_CHANNEL);
 #endif // WIFI_ON
-#else
-  // ESP32 needs wifi on always
-  WifiESP::setup(WIFI_SSID, WIFI_PASSWORD, WIFI_HOSTNAME, IP_PORT, WIFI_CHANNEL);
-#endif // ARDUINO_ARCH_ESP32
 
 #if ETHERNET_ON
   EthernetInterface::setup();
 #endif // ETHERNET_ON
 
-  // Initialise HAL layer before reading EEprom or setting up MotorDrivers 
-  IODevice::begin();
-
   // Responsibility 3: Start the DCC engine.
   // Note: this provides DCC with two motor drivers, main and prog, which handle the motor shield(s)
   // Standard supported devices have pre-configured macros but custome hardware installations require
   //  detailed pin mappings and may also require modified subclasses of the MotorDriver to implement specialist logic.
   // STANDARD_MOTOR_SHIELD, POLOLU_MOTOR_SHIELD, FIREBOX_MK1, FIREBOX_MK1S are pre defined in MotorShields.h
-  TrackManager::Setup(MOTOR_SHIELD_TYPE);
-
-  // Start RMFT aka EX-RAIL (ignored if no automnation)
+  DCC::begin(MOTOR_SHIELD_TYPE);
+         
+  // Start RMFT (ignored if no automnation)
   RMFT::begin();
+  
+  // Link to and call mySetup() function (if defined in the build in mySetup.cpp).
+  //  The contents will depend on the user's system hardware configuration.
+  //  The mySetup.cpp file is a standard C++ module so has access to all of the DCC++EX APIs.
+  extern __attribute__((weak)) void mySetup();
+  if (mySetup) {
+    mySetup();
+  }
 
-
-  // Invoke any DCC++EX commands in the form "SETUP("xxxx");"" found in optional file mySetup.h.
-  //  This can be used to create turnouts, outputs, sensors etc. through the normal text commands.
+  // Invoke any DCC++EX commands in the form "SETUP("xxxx");"" found in optional file mySetup.h.  
+  //  This can be used to create turnouts, outputs, sensors etc. throught the normal text commands.
   #if __has_include ( "mySetup.h")
-    #define SETUP(cmd) DCCEXParser::parse(F(cmd))
-    #include "mySetup.h"
-    #undef SETUP
-  #endif
+        #define SETUP(cmd) serialParser.parse(F(cmd))  
+        #include "mySetup.h"
+        #undef SETUP
+       #endif
 
   #if defined(LCN_SERIAL)
-  LCN_SERIAL.begin(115200);
-  LCN::init(LCN_SERIAL);
+      LCN_SERIAL.begin(115200); 
+      LCN::init(LCN_SERIAL);
   #endif
-  LCD(3, F("Ready"));
-  CommandDistributor::broadcastPower();
+
+  LCD(1,F("Ready")); 
 }
 
 void loop()
@@ -135,41 +121,34 @@ void loop()
   DCC::loop();
 
   // Responsibility 2: handle any incoming commands on USB connection
-  SerialManager::loop();
+  serialParser.loop(Serial);
 
-  // Responsibility 3: Optionally handle any incoming WiFi traffic
-#ifndef ARDUINO_ARCH_ESP32
+// Responsibility 3: Optionally handle any incoming WiFi traffic
 #if WIFI_ON
   WifiInterface::loop();
-#endif //WIFI_ON
-#else  //ARDUINO_ARCH_ESP32
-#ifndef WIFI_TASK_ON_CORE0
-  WifiESP::loop();
 #endif
-#endif //ARDUINO_ARCH_ESP32
 #if ETHERNET_ON
   EthernetInterface::loop();
 #endif
 
   RMFT::loop();  // ignored if no automation
 
-  #if defined(LCN_SERIAL)
-  LCN::loop();
+  #if defined(LCN_SERIAL) 
+      LCN::loop();
   #endif
 
-  LCDDisplay::loop();  // ignored if LCD not in use
+  LCDDisplay::loop();  // ignored if LCD not in use 
 
   // Handle/update IO devices.
   IODevice::loop();
-
-  Sensor::checkAll(); // Update and print changes
-
+  
   // Report any decrease in memory (will automatically trigger on first call)
-  static int ramLowWatermark = __INT_MAX__; // replaced on first loop
+  static int ramLowWatermark = __INT_MAX__; // replaced on first loop 
 
-  int freeNow = DCCTimer::getMinimumFreeMemory();
-  if (freeNow < ramLowWatermark) {
+  int freeNow = minimumFreeMemory();
+  if (freeNow < ramLowWatermark)
+  {
     ramLowWatermark = freeNow;
-    LCD(3,F("Free RAM=%5db"), ramLowWatermark);
+    LCD(2,F("Free RAM=%5db"), ramLowWatermark);
   }
 }

DCC.h

@@ -1,10 +1,5 @@
 /*
- *  © 2021 Mike S
- *  © 2021 Fred Decker
- *  © 2021 Herb Morton
- *  © 2020-2021 Harald Barth
- *  © 2020-2021 Chris Harlow
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
  *  
  *  This file is part of Asbelos DCC API
  *
@@ -28,48 +23,76 @@
 #include "MotorDrivers.h"
 #include "FSH.h"
 
-#include "defines.h"
-#ifndef HIGHEST_SHORT_ADDR
-#define HIGHEST_SHORT_ADDR 127
-#else
-#if HIGHEST_SHORT_ADDR > 127
-#error short addr greater than 127 does not make sense
-#endif
-#endif
-#include "DCCACK.h"
-const uint16_t LONG_ADDR_MARKER = 0x4000;
+typedef void (*ACK_CALLBACK)(int16_t result);
+
+enum ackOp : byte
+{           // Program opcodes for the ack Manager
+  BASELINE, // ensure enough resets sent before starting and obtain baseline current
+  W0,
+  W1,               // issue write bit (0..1) packet
+  WB,               // issue write byte packet
+  VB,               // Issue validate Byte packet
+  V0,               // Issue validate bit=0 packet
+  V1,               // issue validate bit=1 packlet
+  WACK,             // wait for ack (or absence of ack)
+  ITC1,             // If True Callback(1)  (if prevous WACK got an ACK)
+  ITC0,             // If True callback(0);
+  ITCB,             // If True callback(byte)
+  ITCB7,            // If True callback(byte &0x7F)
+  NAKFAIL,          // if false callback(-1)
+  FAIL,             // callback(-1)
+  STARTMERGE,       // Clear bit and byte settings ready for merge pass
+  MERGE,            // Merge previous wack response with byte value and decrement bit number (use for readimng CV bytes)
+  SETBIT,           // sets bit number to next prog byte
+  SETCV,            // sets cv number to next prog byte
+  SETBYTE,          // sets current byte to next prog byte
+  SETBYTEH,         // sets current byte to word high byte
+  SETBYTEL,         // sets current byte to word low byte
+  STASHLOCOID,      // keeps current byte value for later
+  COMBINELOCOID,    // combines current value with stashed value and returns it
+  ITSKIP,           // skip to SKIPTARGET if ack true
+  SKIPTARGET = 0xFF // jump to target
+};
+
+enum   CALLBACK_STATE : byte {
+  AFTER_WRITE,  // Start callback sequence after something was written to the decoder  
+  WAITING_100,        // Waiting for 100mS of stable power 
+  WAITING_30,         // waiting to 30ms of power off gap. 
+  READY,              // Ready to complete callback  
+  }; 
 
 
 // Allocations with memory implications..!
 // Base system takes approx 900 bytes + 8 per loco. Turnouts, Sensors etc are dynamically created
-#if defined(HAS_ENOUGH_MEMORY)
-const byte MAX_LOCOS = 50;
+#ifdef ARDUINO_AVR_UNO
+const byte MAX_LOCOS = 20;
 #else
-const byte MAX_LOCOS = 30;
+const byte MAX_LOCOS = 50;
 #endif
 
 class DCC
 {
 public:
-  static void begin(const FSH * motorShieldName);
+  static void begin(const FSH * motorShieldName, MotorDriver *mainDriver, MotorDriver *progDriver);
+  static void setJoinRelayPin(byte joinRelayPin);
   static void loop();
 
   // Public DCC API functions
   static void setThrottle(uint16_t cab, uint8_t tSpeed, bool tDirection);
-  static int8_t getThrottleSpeed(int cab);
-  static uint8_t getThrottleSpeedByte(int cab);
+  static uint8_t getThrottleSpeed(int cab);
   static bool getThrottleDirection(int cab);
   static void writeCVByteMain(int cab, int cv, byte bValue);
   static void writeCVBitMain(int cab, int cv, byte bNum, bool bValue);
   static void setFunction(int cab, byte fByte, byte eByte);
-  static bool setFn(int cab, int16_t functionNumber, bool on);
-  static void changeFn(int cab, int16_t functionNumber);
+  static void setFn(int cab, int16_t functionNumber, bool on);
+  static int changeFn(int cab, int16_t functionNumber, bool pressed);
   static int  getFn(int cab, int16_t functionNumber);
-  static uint32_t getFunctionMap(int cab);
   static void updateGroupflags(byte &flags, int16_t functionNumber);
-  static void setAccessory(int address, byte port, bool gate, byte onoff = 2);
+  static void setAccessory(int aAdd, byte aNum, bool activate);
   static bool writeTextPacket(byte *b, int nBytes);
-  
+  static void setProgTrackSyncMain(bool on); // when true, prog track becomes driveable
+  static void setProgTrackBoost(bool on);    // when true, special prog track current limit does not apply
+
   // ACKable progtrack calls  bitresults callback 0,0 or -1, cv returns value or -1
   static void readCV(int16_t cv, ACK_CALLBACK callback);
   static void readCVBit(int16_t cv, byte bitNum, ACK_CALLBACK callback); // -1 for error
@@ -85,11 +108,13 @@ public:
   static void forgetLoco(int cab); // removes any speed reminders for this loco
   static void forgetAllLocos();    // removes all speed reminders
   static void displayCabList(Print *stream);
+
   static FSH *getMotorShieldName();
   static inline void setGlobalSpeedsteps(byte s) {
     globalSpeedsteps = s;
   };
-  
+
+private:
   struct LOCO
   {
     int loco;
@@ -97,12 +122,7 @@ public:
     byte groupFlags;
     unsigned long functions;
   };
- static LOCO speedTable[MAX_LOCOS];
- static int lookupSpeedTable(int locoId, bool autoCreate=true);
- static byte cv1(byte opcode, int cv);
- static byte cv2(int cv);
- 
-private:
+  static byte joinRelay;
   static byte loopStatus;
   static void setThrottle2(uint16_t cab, uint8_t speedCode);
   static void updateLocoReminder(int loco, byte speedCode);
@@ -112,9 +132,29 @@ private:
   static FSH *shieldName;
   static byte globalSpeedsteps;
 
+  static LOCO speedTable[MAX_LOCOS];
+  static byte cv1(byte opcode, int cv);
+  static byte cv2(int cv);
+  static int lookupSpeedTable(int locoId);
   static void issueReminders();
   static void callback(int value);
 
+  // ACK MANAGER
+  static ackOp const *ackManagerProg;
+  static byte ackManagerByte;
+  static byte ackManagerBitNum;
+  static int ackManagerCv;
+  static int ackManagerWord;
+  static byte ackManagerStash;
+  static bool ackReceived;
+  static bool ackManagerRejoin;
+  static ACK_CALLBACK ackManagerCallback;
+  static CALLBACK_STATE callbackState;
+  static void ackManagerSetup(int cv, byte bitNumOrbyteValue, ackOp const program[], ACK_CALLBACK callback);
+  static void ackManagerSetup(int wordval, ackOp const program[], ACK_CALLBACK callback);
+  static void ackManagerLoop();
+  static bool checkResets( uint8_t numResets);
+  static const int PROG_REPEATS = 8; // repeats of programming commands (some decoders need at least 8 to be reliable)
   
   // NMRA codes #
   static const byte SET_SPEED = 0x3f;
@@ -129,4 +169,31 @@ private:
   static const byte BIT_OFF = 0x00;
 };
 
+#ifdef ARDUINO_AVR_MEGA // is using Mega 1280, define as Mega 2560 (pinouts and functionality are identical)
+#define ARDUINO_AVR_MEGA2560
+#endif
+
+#if defined(ARDUINO_AVR_UNO)
+#define ARDUINO_TYPE "UNO"
+#elif defined(ARDUINO_AVR_NANO)
+#define ARDUINO_TYPE "NANO"
+#elif defined(ARDUINO_AVR_MEGA2560)
+#define ARDUINO_TYPE "MEGA"
+#elif defined(ARDUINO_ARCH_MEGAAVR)
+#define ARDUINO_TYPE "MEGAAVR"
+#elif defined(ARDUINO_TEENSY32)
+#define ARDUINO_TYPE "TEENSY32"
+#elif defined(ARDUINO_TEENSY35)
+#define ARDUINO_TYPE "TEENSY35"
+#elif defined(ARDUINO_TEENSY36)
+#define ARDUINO_TYPE "TEENSY36"
+#elif defined(ARDUINO_TEENSY40)
+#define ARDUINO_TYPE "TEENSY40"
+#elif defined(ARDUINO_TEENSY41)
+#define ARDUINO_TYPE "TEENSY41"
+#else
+#error CANNOT COMPILE - DCC++ EX ONLY WORKS WITH AN ARDUINO UNO, NANO 328, OR ARDUINO MEGA 1280/2560
+#endif
+
+
 #endif

DCCACK.cpp

@@ -1,469 +0,0 @@
-/*
- *  © 2021 M Steve Todd
- *  © 2021 Mike S
- *  © 2021 Fred Decker
- *  © 2020-2021 Harald Barth
- *  © 2020-2022 Chris Harlow
- *  All rights reserved.
- *  
- *  This file is part of CommandStation-EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-#include "DCCACK.h"
-#include "DIAG.h"
-#include "DCC.h"
-#include "DCCWaveform.h"
-#include "TrackManager.h"
-
-unsigned int DCCACK::minAckPulseDuration = 2000; // micros
-unsigned int DCCACK::maxAckPulseDuration = 20000; // micros
-  
-MotorDriver *  DCCACK::progDriver=NULL;
-ackOp  const *  DCCACK::ackManagerProg;
-ackOp  const *  DCCACK::ackManagerProgStart;
-byte   DCCACK::ackManagerByte;
-byte   DCCACK::ackManagerByteVerify;
-byte   DCCACK::ackManagerStash;
-int    DCCACK::ackManagerWord;
-byte   DCCACK::ackManagerRetry;
-byte   DCCACK::ackRetry = 2;
-int16_t  DCCACK::ackRetrySum;
-int16_t  DCCACK::ackRetryPSum;
-int    DCCACK::ackManagerCv;
-byte   DCCACK::ackManagerBitNum;
-bool   DCCACK::ackReceived;
-bool   DCCACK::ackManagerRejoin;
-volatile uint8_t DCCACK::numAckGaps=0;
-volatile uint8_t DCCACK::numAckSamples=0;
-uint8_t DCCACK::trailingEdgeCounter=0;
-
-
- unsigned int DCCACK::ackPulseDuration;  // micros
- unsigned long DCCACK::ackPulseStart; // micros
- volatile bool DCCACK::ackDetected;
- unsigned long DCCACK::ackCheckStart; // millis
- volatile bool DCCACK::ackPending;
-  bool   DCCACK::autoPowerOff;
-   int  DCCACK::ackThreshold; 
-   int  DCCACK::ackLimitmA = 50;
-     int DCCACK::ackMaxCurrent;
-      unsigned int DCCACK::ackCheckDuration; // millis       
-    
-    
-CALLBACK_STATE DCCACK::callbackState=READY;
-
-ACK_CALLBACK DCCACK::ackManagerCallback;
-
-void  DCCACK::Setup(int cv, byte byteValueOrBitnum, ackOp const program[], ACK_CALLBACK callback) {
-  ackManagerRejoin=TrackManager::isJoined();
-  if (ackManagerRejoin) {
-    // Change from JOIN must zero resets packet.
-    TrackManager::setJoin(false);
-    DCCWaveform::progTrack.clearResets();
-  }
-
-  progDriver=TrackManager::getProgDriver();
-  if (progDriver==NULL) {
-    TrackManager::setJoin(ackManagerRejoin);
-    callback(-3); // we dont have a prog track!
-    return;
-  }
-  if (!progDriver->canMeasureCurrent()) {
-    TrackManager::setJoin(ackManagerRejoin);
-    callback(-2); // our prog track cant measure current
-    return;
-  }
-
-   autoPowerOff=false;
-   if (progDriver->getPower() == POWERMODE::OFF) {
-        autoPowerOff=true;  // power off afterwards
-        if (Diag::ACK) DIAG(F("Auto Prog power on"));
-        progDriver->setPower(POWERMODE::ON);
-	
-    /* TODO !!! in MotorDriver surely!
-    if (MotorDriver::commonFaultPin)
-	  DCCWaveform::mainTrack.setPowerMode(POWERMODE::ON);
-        DCCWaveform::progTrack.clearResets();
-   **/
-      }
-
-
-  ackManagerCv = cv;
-  ackManagerProg = program;
-  ackManagerProgStart = program;
-  ackManagerRetry = ackRetry;
-  ackManagerByte = byteValueOrBitnum;
-  ackManagerByteVerify = byteValueOrBitnum;
-  ackManagerBitNum=byteValueOrBitnum;
-  ackManagerCallback = callback;
-}
-
-void  DCCACK::Setup(int wordval, ackOp const program[], ACK_CALLBACK callback) {
-  ackManagerWord=wordval;
-  Setup(0, 0, program, callback);
-  }
-
-const byte RESET_MIN=8;  // tuning of reset counter before sending message
-
-// checkRessets return true if the caller should yield back to loop and try later.
-bool DCCACK::checkResets(uint8_t numResets) {
-  return DCCWaveform::progTrack.getResets() < numResets;
-}
-// Operations applicable to PROG track ONLY.
-// (yes I know I could have subclassed the main track but...) 
-
-void DCCACK::setAckBaseline() {
-      int baseline=progDriver->getCurrentRaw();
-      ackThreshold= baseline + progDriver->mA2raw(ackLimitmA);
-      if (Diag::ACK) DIAG(F("ACK baseline=%d/%dmA Threshold=%d/%dmA Duration between %uus and %uus"),
-			  baseline,progDriver->raw2mA(baseline),
-			  ackThreshold,progDriver->raw2mA(ackThreshold),
-                          minAckPulseDuration, maxAckPulseDuration);
-}
-
-void DCCACK::setAckPending() {
-      ackMaxCurrent=0;
-      ackPulseStart=0;
-      ackPulseDuration=0;
-      ackDetected=false;
-      ackCheckStart=millis();
-      numAckSamples=0;
-      numAckGaps=0;
-      ackPending=true;  // interrupt routines will now take note
-}
-
-byte DCCACK::getAck() {
-      if (ackPending) return (2);  // still waiting
-      if (Diag::ACK) DIAG(F("%S after %dmS max=%d/%dmA pulse=%uuS samples=%d gaps=%d"),ackDetected?F("ACK"):F("NO-ACK"), ackCheckDuration,
-			  ackMaxCurrent,progDriver->raw2mA(ackMaxCurrent), ackPulseDuration, numAckSamples, numAckGaps);
-      if (ackDetected) return (1); // Yes we had an ack
-      return(0);  // pending set off but not detected means no ACK.   
-}
-
-
-void DCCACK::loop() {
-  while (ackManagerProg) {
-    byte opcode=GETFLASH(ackManagerProg);
-
-    // breaks from this switch will step to next prog entry
-    // returns from this switch will stay on same entry
-    // (typically waiting for a reset counter or ACK waiting, or when all finished.)
-    switch (opcode) {
-      case BASELINE:
-          if (progDriver->getPower()==POWERMODE::OVERLOAD) return;
-      	  if (checkResets(autoPowerOff || ackManagerRejoin  ? 20 : 3)) return;
-          setAckBaseline();
-          callbackState=AFTER_READ;
-          break;
-      case W0:    // write 0 bit
-      case W1:    // write 1 bit
-            {
-	      if (checkResets(RESET_MIN)) return;
-              if (Diag::ACK) DIAG(F("W%d cv=%d bit=%d"),opcode==W1, ackManagerCv,ackManagerBitNum);
-              byte instruction = WRITE_BIT | (opcode==W1 ? BIT_ON : BIT_OFF) | ackManagerBitNum;
-              byte message[] = {DCC::cv1(BIT_MANIPULATE, ackManagerCv), DCC::cv2(ackManagerCv), instruction };
-              DCCWaveform::progTrack.schedulePacket(message, sizeof(message), PROG_REPEATS);
-              setAckPending();
-             callbackState=AFTER_WRITE;
-         }
-            break;
-
-      case WB:   // write byte
-            {
-	      if (checkResets( RESET_MIN)) return;
-              if (Diag::ACK) DIAG(F("WB cv=%d value=%d"),ackManagerCv,ackManagerByte);
-              byte message[] = {DCC::cv1(WRITE_BYTE, ackManagerCv), DCC::cv2(ackManagerCv), ackManagerByte};
-              DCCWaveform::progTrack.schedulePacket(message, sizeof(message), PROG_REPEATS);
-              setAckPending();
-              callbackState=AFTER_WRITE;
-            }
-            break;
-
-      case   VB:     // Issue validate Byte packet
-        {
-	  if (checkResets( RESET_MIN)) return;
-          if (Diag::ACK) DIAG(F("VB cv=%d value=%d"),ackManagerCv,ackManagerByte);
-          byte message[] = { DCC::cv1(VERIFY_BYTE, ackManagerCv), DCC::cv2(ackManagerCv), ackManagerByte};
-          DCCWaveform::progTrack.schedulePacket(message, sizeof(message), PROG_REPEATS);
-          setAckPending();
-        }
-        break;
-
-      case V0:
-      case V1:      // Issue validate bit=0 or bit=1  packet
-        {
-	  if (checkResets(RESET_MIN)) return;
-          if (Diag::ACK) DIAG(F("V%d cv=%d bit=%d"),opcode==V1, ackManagerCv,ackManagerBitNum);
-          byte instruction = VERIFY_BIT | (opcode==V0?BIT_OFF:BIT_ON) | ackManagerBitNum;
-          byte message[] = {DCC::cv1(BIT_MANIPULATE, ackManagerCv), DCC::cv2(ackManagerCv), instruction };
-          DCCWaveform::progTrack.schedulePacket(message, sizeof(message), PROG_REPEATS);
-          setAckPending();
-        }
-        break;
-
-      case WACK:   // wait for ack (or absence of ack)
-         {
-          byte ackState=2; // keep polling
-
-          ackState=getAck();
-          if (ackState==2) return; // keep polling
-          ackReceived=ackState==1;
-          break;  // we have a genuine ACK result
-         }
-     case ITC0:
-     case ITC1:   // If True Callback(0 or 1)  (if prevous WACK got an ACK)
-        if (ackReceived) {
-            callback(opcode==ITC0?0:1);
-            return;
-          }
-        break;
-
-      case ITCB:   // If True callback(byte)
-          if (ackReceived) {
-            callback(ackManagerByte);
-            return;
-          }
-        break;
-		
-      case ITCBV:   // If True callback(byte) - Verify
-          if (ackReceived) {
-            if (ackManagerByte == ackManagerByteVerify) {
-               ackRetrySum ++;
-               LCD(1, F("v %d %d Sum=%d"), ackManagerCv, ackManagerByte, ackRetrySum);
-            }
-            callback(ackManagerByte);
-            return;
-          }
-        break;
-		
-      case ITCB7:   // If True callback(byte & 0x7F)
-          if (ackReceived) {
-            callback(ackManagerByte & 0x7F);
-            return;
-          }
-        break;
-
-      case NAKFAIL:   // If nack callback(-1)
-          if (!ackReceived) {
-            callback(-1);
-            return;
-          }
-        break;
-
-      case CALLFAIL:  // callback(-1)
-           callback(-1);
-           return;
-
-      case BIV:     // ackManagerByte initial value
-           ackManagerByte = ackManagerByteVerify;
-           break;
-
-      case STARTMERGE:
-           ackManagerBitNum=7;
-           ackManagerByte=0;
-          break;
-
-      case MERGE:  // Merge previous Validate zero wack response with byte value and update bit number (use for reading CV bytes)
-          ackManagerByte <<= 1;
-          // ackReceived means bit is zero.
-          if (!ackReceived) ackManagerByte |= 1;
-          ackManagerBitNum--;
-          break;
-
-      case SETBIT:
-          ackManagerProg++;
-          ackManagerBitNum=GETFLASH(ackManagerProg);
-          break;
-
-     case SETCV:
-          ackManagerProg++;
-          ackManagerCv=GETFLASH(ackManagerProg);
-          break;
-
-     case SETBYTE:
-          ackManagerProg++;
-          ackManagerByte=GETFLASH(ackManagerProg);
-          break;
-
-    case SETBYTEH:
-          ackManagerByte=highByte(ackManagerWord);
-          break;
-
-    case SETBYTEL:
-          ackManagerByte=lowByte(ackManagerWord);
-          break;
-
-     case STASHLOCOID:
-          ackManagerStash=ackManagerByte;  // stash value from CV17
-          break;
-
-     case COMBINELOCOID:
-          // ackManagerStash is  cv17, ackManagerByte is CV 18
-          callback( LONG_ADDR_MARKER | ( ackManagerByte + ((ackManagerStash - 192) << 8)));
-          return;
-
-     case ITSKIP:
-          if (!ackReceived) break;
-          // SKIP opcodes until SKIPTARGET found
-          while (opcode!=SKIPTARGET) {
-            ackManagerProg++;
-            opcode=GETFLASH(ackManagerProg);
-          }
-          break;
-     case SKIPTARGET:
-          break;
-     default:
-          DIAG(F("!! ackOp %d FAULT!!"),opcode);
-          callback( -1);
-          return;
-
-      }  // end of switch
-    ackManagerProg++;
-  }
-}
-
-void DCCACK::callback(int value) {
-    // check for automatic retry
-    if (value == -1 && ackManagerRetry > 0) {
-      ackRetrySum ++;
-      LCD(0, F("Retry %d %d Sum=%d"), ackManagerCv, ackManagerRetry, ackRetrySum);
-      ackManagerRetry --;
-      ackManagerProg = ackManagerProgStart;
-      return;
-    }
-
-    static unsigned long callbackStart;
-    // We are about to leave programming mode
-    // Rule 1: If we have written to a decoder we must maintain power for 100mS
-    // Rule 2: If we are re-joining the main track we must power off for 30mS
-
-    switch (callbackState) {
-      case AFTER_READ:
-         if (ackManagerRejoin && autoPowerOff) {
-                progDriver->setPower(POWERMODE::OFF);
-                callbackStart=millis();
-                callbackState=WAITING_30;
-                if (Diag::ACK) DIAG(F("OFF 30mS"));
-        } else {
-               callbackState=READY;
-        }
-        break;
-
-      case AFTER_WRITE:  // first attempt to callback after a write operation
-	    if (!ackManagerRejoin && !autoPowerOff) {
-               callbackState=READY;
-               break;
-            }                              // lines 906-910 added. avoid wait after write. use 1 PROG
-            callbackStart=millis();
-            callbackState=WAITING_100;
-            if (Diag::ACK) DIAG(F("Stable 100mS"));
-            break;
-
-       case WAITING_100:  // waiting for 100mS
-            if (millis()-callbackStart < 100) break;
-            // stable after power maintained for 100mS
-
-            // If we are going to power off anyway, it doesnt matter
-            // but if we will keep the power on, we must off it for 30mS
-            if (autoPowerOff) callbackState=READY;
-            else { // Need to cycle power off and on
-                progDriver->setPower(POWERMODE::OFF);
-                callbackStart=millis();
-                callbackState=WAITING_30;
-                if (Diag::ACK) DIAG(F("OFF 30mS"));
-            }
-            break;
-
-        case WAITING_30:  // waiting for 30mS with power off
-            if (millis()-callbackStart < 30) break;
-            //power has been off for 30mS
-            progDriver->setPower(POWERMODE::ON);
-            callbackState=READY;
-            break;
-
-       case READY:  // ready after read, or write after power delay and off period.
-            // power off if we powered it on
-           if (autoPowerOff) {
-              if (Diag::ACK) DIAG(F("Auto Prog power off"));
-              progDriver->setPower(POWERMODE::OFF);
-              /* TODO 
-	      if (MotorDriver::commonFaultPin)
-		DCCWaveform::mainTrack.setPowerMode(POWERMODE::OFF);
-        **/
-           }
-          // Restore <1 JOIN> to state before BASELINE
-          if (ackManagerRejoin) {
-              TrackManager::setJoin(true);
-              if (Diag::ACK) DIAG(F("Auto JOIN"));
-          }
-
-          ackManagerProg=NULL;  // no more steps to execute
-          if (Diag::ACK) DIAG(F("Callback(%d)"),value);
-          (ackManagerCallback)( value);
-    }
-}
-
-
-void DCCACK::checkAck(byte sentResetsSincePacket) {
-    if (!ackPending) return; 
-    // This function operates in interrupt() time so must be fast and can't DIAG 
-    if (sentResetsSincePacket > 6) {  //ACK timeout
-        ackCheckDuration=millis()-ackCheckStart;
-        ackPending = false;
-        return; 
-    }
-      
-    int current=progDriver->getCurrentRawInInterrupt();
-    numAckSamples++;
-    if (current > ackMaxCurrent) ackMaxCurrent=current;
-    // An ACK is a pulse lasting between minAckPulseDuration and maxAckPulseDuration uSecs (refer @haba)
-        
-    if (current>ackThreshold) {
-       if (trailingEdgeCounter > 0) {
-	 numAckGaps++;
-	 trailingEdgeCounter = 0;
-       }
-       if (ackPulseStart==0) ackPulseStart=micros();    // leading edge of pulse detected
-       return;
-    }
-    
-    // not in pulse
-    if (ackPulseStart==0) return; // keep waiting for leading edge 
-    
-    // if we reach to this point, we have
-    // detected trailing edge of pulse
-    if (trailingEdgeCounter == 0) {
-      ackPulseDuration=micros()-ackPulseStart;
-    }
-
-    // but we do not trust it yet and return (which will force another
-    // measurement) and first the third time around with low current
-    // the ack detection will be finalized. 
-    if (trailingEdgeCounter < 2) {
-      trailingEdgeCounter++;
-      return;
-    }
-    trailingEdgeCounter = 0;
-
-    if (ackPulseDuration>=minAckPulseDuration && ackPulseDuration<=maxAckPulseDuration) {
-        ackCheckDuration=millis()-ackCheckStart;
-        ackDetected=true;
-        ackPending=false;
-        DCCWaveform::progTrack.clearRepeats();  // shortcut remaining repeat packets 
-        return;  // we have a genuine ACK result
-    }      
-    ackPulseStart=0;  // We have detected a too-short or too-long pulse so ignore and wait for next leading edge 
-}
-

DCCACK.h

@@ -1,156 +0,0 @@
-/*
- *  © 2021 M Steve Todd
- *  © 2021 Mike S
- *  © 2021 Fred Decker
- *  © 2020-2021 Harald Barth
- *  © 2020-2022 Chris Harlow
- *  All rights reserved.
- *  
- *  This file is part of CommandStation-EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-#ifndef DCCACK_h
-#define DCCACK_h
-
-#include "MotorDriver.h"
-
-typedef void (*ACK_CALLBACK)(int16_t result);
-
-enum ackOp : byte
-{           // Program opcodes for the ack Manager
-  BASELINE, // ensure enough resets sent before starting and obtain baseline current
-  W0,
-  W1,               // issue write bit (0..1) packet
-  WB,               // issue write byte packet
-  VB,               // Issue validate Byte packet
-  V0,               // Issue validate bit=0 packet
-  V1,               // issue validate bit=1 packlet
-  WACK,             // wait for ack (or absence of ack)
-  ITC1,             // If True Callback(1)  (if prevous WACK got an ACK)
-  ITC0,             // If True callback(0);
-  ITCB,             // If True callback(byte)
-  ITCBV,            // If True callback(byte) - end of Verify Byte
-  ITCB7,            // If True callback(byte &0x7F)
-  NAKFAIL,          // if false callback(-1)
-  CALLFAIL,         // callback(-1)
-  BIV,              // Set ackManagerByte to initial value for Verify retry
-  STARTMERGE,       // Clear bit and byte settings ready for merge pass
-  MERGE,            // Merge previous wack response with byte value and decrement bit number (use for readimng CV bytes)
-  SETBIT,           // sets bit number to next prog byte
-  SETCV,            // sets cv number to next prog byte
-  SETBYTE,          // sets current byte to next prog byte
-  SETBYTEH,         // sets current byte to word high byte
-  SETBYTEL,         // sets current byte to word low byte
-  STASHLOCOID,      // keeps current byte value for later
-  COMBINELOCOID,    // combines current value with stashed value and returns it
-  ITSKIP,           // skip to SKIPTARGET if ack true
-  SKIPTARGET = 0xFF // jump to target
-};
-
-enum   CALLBACK_STATE : byte {
-
-  AFTER_READ,   // Start callback sequence after something was read from the decoder  
-  AFTER_WRITE,  // Start callback sequence after something was written to the decoder  
-  WAITING_100,        // Waiting for 100mS of stable power 
-  WAITING_30,         // waiting to 30ms of power off gap. 
-  READY,              // Ready to complete callback  
-  }; 
-
-
-
-class DCCACK {
-  public:
-    static byte getAck();               //prog track only 0=NACK, 1=ACK 2=keep waiting
-    static void checkAck(byte sentResetsSincePacket); // Interrupt time ack checker
-    static inline void setAckLimit(int mA) {
-	ackLimitmA = mA;
-    }
-    static inline void setMinAckPulseDuration(unsigned int i) {
-	minAckPulseDuration = i;
-    }
-    static inline void setMaxAckPulseDuration(unsigned int i) {
-	maxAckPulseDuration = i;
-    }
-
-    static void  Setup(int cv, byte byteValueOrBitnum, ackOp const program[], ACK_CALLBACK callback);
-    static void  Setup(int wordval, ackOp const program[], ACK_CALLBACK callback);
-    static void loop();
-    static bool isActive() { return ackManagerProg!=NULL;}
-  static inline int16_t setAckRetry(byte retry) {
-    ackRetry = retry;
-    ackRetryPSum = ackRetrySum;
-    ackRetrySum = 0;  // reset running total
-    return ackRetryPSum;
-  };
-
-
-  private:
-    static const byte SET_SPEED = 0x3f;
-    static const byte WRITE_BYTE = 0x7C;
-    static const byte VERIFY_BYTE = 0x74;
-    static const byte BIT_MANIPULATE = 0x78;
-    static const byte WRITE_BIT = 0xF0;
-    static const byte VERIFY_BIT = 0xE0;
-    static const byte BIT_ON = 0x08;
-    static const byte BIT_OFF = 0x00;
- 
-    static void setAckBaseline();
-    static void setAckPending();  
-    static void callback(int value);
-    
-    static const int PROG_REPEATS = 8; // repeats of programming commands (some decoders need at least 8 to be reliable)
-    
-    // ACK management (Prog track only)  
-    static void checkAck();
-    static bool checkResets(uint8_t numResets);
-
-    static volatile bool ackPending;
-    static volatile bool ackDetected;
-    static int  ackThreshold; 
-    static int  ackLimitmA;
-    static int ackMaxCurrent;
-    static unsigned long ackCheckStart; // millis
-    static unsigned int ackCheckDuration; // millis       
-    
-    static unsigned int ackPulseDuration;  // micros
-    static unsigned long ackPulseStart; // micros
-
-    static unsigned int minAckPulseDuration ; // micros
-    static unsigned int maxAckPulseDuration ; // micros
-    static MotorDriver* progDriver;
-    static volatile uint8_t numAckGaps;
-    static volatile uint8_t numAckSamples;
-    static uint8_t trailingEdgeCounter;
-    static ackOp  const *  ackManagerProg;
-static ackOp  const *  ackManagerProgStart;
-static byte   ackManagerByte;
-static byte   ackManagerByteVerify;
-static byte   ackManagerStash;
-static int    ackManagerWord;
-static byte   ackManagerRetry;
-static byte   ackRetry;
-static int16_t ackRetrySum;
-static int16_t  ackRetryPSum;
-static int    ackManagerCv;
-static byte   ackManagerBitNum;
-static bool   ackReceived;
-static bool   ackManagerRejoin;
-static bool   autoPowerOff;
-static CALLBACK_STATE callbackState;
-static ACK_CALLBACK ackManagerCallback;
-
-
-};
-#endif

DCCEX.h

@@ -1,8 +1,7 @@
 /*
- *  © 2021 Fred Decker
- *  © 2020-2021 Harald Barth
- *  © 2020-2021 Chris Harlow
- *  All rights reserved.
+ *  (c) 2020 Chris Harlow. All rights reserved.
+ *  (c) 2021 Fred Decker.  All rights reserved.
+ *  (c) 2020 Harald Barth. All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
@@ -30,25 +29,19 @@
 #include "DCC.h"
 #include "DIAG.h"
 #include "DCCEXParser.h"
-#include "SerialManager.h"
 #include "version.h"
-#ifndef ARDUINO_ARCH_ESP32
 #include "WifiInterface.h"
-#else
-#include "WifiESP32.h"
-#endif
 #if ETHERNET_ON == true
 #include "EthernetInterface.h"
 #endif
 #include "LCD_Implementation.h"
 #include "LCN.h"
+#include "freeMemory.h"
 #include "IODevice.h"
 #include "Turnouts.h"
 #include "Sensors.h"
 #include "Outputs.h"
-#include "CommandDistributor.h"
-#include "TrackManager.h"
-#include "DCCTimer.h"    
-#include "EXRAIL.h"
+#include "RMFT.h"
+
     
 #endif

DCCEXParser.cpp

@@ -1,13 +1,6 @@
 /*
- *  © 2022 Paul M Antoine
- *  © 2021 Neil McKechnie
- *  © 2021 Mike S
- *  © 2021 Herb Morton
- *  © 2020-2022 Harald Barth
- *  © 2020-2021 M Steve Todd
- *  © 2020-2021 Fred Decker
- *  © 2020-2021 Chris Harlow
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2020, Harald Barth.
  *  
  *  This file is part of CommandStation-EX
  *
@@ -31,17 +24,13 @@
 #include "Turnouts.h"
 #include "Outputs.h"
 #include "Sensors.h"
+#include "freeMemory.h"
 #include "GITHUB_SHA.h"
 #include "version.h"
-#include "defines.h"
-#include "CommandDistributor.h"
+
 #include "EEStore.h"
 #include "DIAG.h"
-#include "TrackManager.h"
-#include "DCCTimer.h"
-#include "EXRAIL2.h"
-
-
+#include <avr/wdt.h>
 
 // These keywords are used in the <1> command. The number is what you get if you use the keyword as a parameter.
 // To discover new keyword numbers , use the <$ YOURKEYWORD> command
@@ -51,51 +40,77 @@ const int16_t HASH_KEYWORD_JOIN = -30750;
 const int16_t HASH_KEYWORD_CABS = -11981;
 const int16_t HASH_KEYWORD_RAM = 25982;
 const int16_t HASH_KEYWORD_CMD = 9962;
+const int16_t HASH_KEYWORD_WIT = 31594;
+const int16_t HASH_KEYWORD_WIFI = -5583;
 const int16_t HASH_KEYWORD_ACK = 3113;
 const int16_t HASH_KEYWORD_ON = 2657;
 const int16_t HASH_KEYWORD_DCC = 6436;
 const int16_t HASH_KEYWORD_SLOW = -17209;
 const int16_t HASH_KEYWORD_PROGBOOST = -6353;
-#ifndef DISABLE_EEPROM
 const int16_t HASH_KEYWORD_EEPROM = -7168;
-#endif
 const int16_t HASH_KEYWORD_LIMIT = 27413;
+const int16_t HASH_KEYWORD_ETHERNET = -30767;    
 const int16_t HASH_KEYWORD_MAX = 16244;
 const int16_t HASH_KEYWORD_MIN = 15978;
+const int16_t HASH_KEYWORD_LCN = 15137;   
 const int16_t HASH_KEYWORD_RESET = 26133;
-const int16_t HASH_KEYWORD_RETRY = 25704;
 const int16_t HASH_KEYWORD_SPEED28 = -17064;
 const int16_t HASH_KEYWORD_SPEED128 = 25816;
-const int16_t HASH_KEYWORD_SERVO=27709;
-const int16_t HASH_KEYWORD_TT=2688;
-const int16_t HASH_KEYWORD_VPIN=-415;
-const int16_t HASH_KEYWORD_A='A';
-const int16_t HASH_KEYWORD_C='C';
-const int16_t HASH_KEYWORD_R='R';
-const int16_t HASH_KEYWORD_T='T';
-const int16_t HASH_KEYWORD_LCN = 15137;
-const int16_t HASH_KEYWORD_HAL = 10853;
-const int16_t HASH_KEYWORD_SHOW = -21309;
-const int16_t HASH_KEYWORD_ANIN = -10424;
-const int16_t HASH_KEYWORD_ANOUT = -26399;
-const int16_t HASH_KEYWORD_WIFI = -5583;
-const int16_t HASH_KEYWORD_ETHERNET = -30767;
-const int16_t HASH_KEYWORD_WIT = 31594;
+const int16_t HASH_KEYWORD_SERVO = 27709;
 
 int16_t DCCEXParser::stashP[MAX_COMMAND_PARAMS];
 bool DCCEXParser::stashBusy;
+
 Print *DCCEXParser::stashStream = NULL;
 RingStream *DCCEXParser::stashRingStream = NULL;
 byte DCCEXParser::stashTarget=0;
 
-// This is a JMRI command parser.
+// This is a JMRI command parser, one instance per incoming stream
 // It doesnt know how the string got here, nor how it gets back.
 // It knows nothing about hardware or tracks... it just parses strings and
 // calls the corresponding DCC api.
 // Non-DCC things like turnouts, pins and sensors are handled in additional JMRI interface classes.
 
+DCCEXParser::DCCEXParser() {}
+void DCCEXParser::flush()
+{
+    if (Diag::CMD)
+        DIAG(F("Buffer flush"));
+    bufferLength = 0;
+    inCommandPayload = false;
+}
 
-int16_t DCCEXParser::splitValues(int16_t result[MAX_COMMAND_PARAMS], const byte *cmd, bool usehex)
+void DCCEXParser::loop(Stream &stream)
+{
+    while (stream.available())
+    {
+        if (bufferLength == MAX_BUFFER)
+        {
+            flush();
+        }
+        char ch = stream.read();
+        if (ch == '<')
+        {
+            inCommandPayload = true;
+            bufferLength = 0;
+            buffer[0] = '\0';
+        }
+        else if (ch == '>')
+        {
+            buffer[bufferLength] = '\0';
+            parse(&stream, buffer, NULL); // Parse this (No ringStream for serial)
+            inCommandPayload = false;
+            break;
+        }
+        else if (inCommandPayload)
+        {
+            buffer[bufferLength++] = ch;
+        }
+    }
+    Sensor::checkAll(&stream); // Update and print changes
+}
+
+int16_t DCCEXParser::splitValues(int16_t result[MAX_COMMAND_PARAMS], const byte *cmd)
 {
     byte state = 1;
     byte parameterCount = 0;
@@ -133,16 +148,11 @@ int16_t DCCEXParser::splitValues(int16_t result[MAX_COMMAND_PARAMS], const byte
         case 3: // building a parameter
             if (hot >= '0' && hot <= '9')
             {
-                runningValue = (usehex?16:10) * runningValue + (hot - '0');
+                runningValue = 10 * runningValue + (hot - '0');
                 break;
             }
             if (hot >= 'a' && hot <= 'z') hot=hot-'a'+'A'; // uppercase a..z
-            if (usehex && hot>='A' && hot<='F') {
-                // treat A..F as hex not keyword
-                runningValue = 16 * runningValue + (hot - 'A' + 10);
-                break;
-            }
-            if (hot=='_' || (hot >= 'A' && hot <= 'Z'))
+            if (hot >= 'A' && hot <= 'Z')
             {
                 // Since JMRI got modified to send keywords in some rare cases, we need this
                 // Super Kluge to turn keywords into a hash value that can be recognised later
@@ -159,12 +169,69 @@ int16_t DCCEXParser::splitValues(int16_t result[MAX_COMMAND_PARAMS], const byte
     return parameterCount;
 }
 
-extern __attribute__((weak))  void myFilter(Print * stream, byte & opcode, byte & paramCount, int16_t p[]);
-FILTER_CALLBACK DCCEXParser::filterCallback = myFilter;
+int16_t DCCEXParser::splitHexValues(int16_t result[MAX_COMMAND_PARAMS], const byte *cmd)
+{
+    byte state = 1;
+    byte parameterCount = 0;
+    int16_t runningValue = 0;
+    const byte *remainingCmd = cmd + 1; // skips the opcode
+    
+    // clear all parameters in case not enough found
+    for (int16_t i = 0; i < MAX_COMMAND_PARAMS; i++)
+        result[i] = 0;
+
+    while (parameterCount < MAX_COMMAND_PARAMS)
+    {
+        byte hot = *remainingCmd;
+
+        switch (state)
+        {
+
+        case 1: // skipping spaces before a param
+            if (hot == ' ')
+                break;
+            if (hot == '\0' || hot == '>')
+                return parameterCount;
+            state = 2;
+            continue;
+
+        case 2: // checking first hex digit
+            runningValue = 0;
+            state = 3;
+            continue;
+
+        case 3: // building a parameter
+            if (hot >= '0' && hot <= '9')
+            {
+                runningValue = 16 * runningValue + (hot - '0');
+                break;
+            }
+            if (hot >= 'A' && hot <= 'F')
+            {
+                runningValue = 16 * runningValue + 10 + (hot - 'A');
+                break;
+            }
+            if (hot >= 'a' && hot <= 'f')
+            {
+                runningValue = 16 * runningValue + 10 + (hot - 'a');
+                break;
+            }
+            if (hot==' ' || hot=='>' || hot=='\0') { 
+               result[parameterCount] = runningValue;
+               parameterCount++;
+               state = 1;
+               continue;
+            }
+            return -1; // invalid hex digit
+        }
+        remainingCmd++;
+    }
+    return parameterCount;
+}
+
+FILTER_CALLBACK DCCEXParser::filterCallback = 0;
 FILTER_CALLBACK DCCEXParser::filterRMFTCallback = 0;
 AT_COMMAND_CALLBACK DCCEXParser::atCommandCallback = 0;
-
-// deprecated
 void DCCEXParser::setFilter(FILTER_CALLBACK filter)
 {
     filterCallback = filter;
@@ -180,42 +247,24 @@ void DCCEXParser::setAtCommandCallback(AT_COMMAND_CALLBACK callback)
 
 // Parse an F() string 
 void DCCEXParser::parse(const FSH * cmd) {
-      DIAG(F("SETUP(\"%S\")"),cmd);
       int size=strlen_P((char *)cmd)+1; 
       char buffer[size];
       strcpy_P(buffer,(char *)cmd);
-      parse(&USB_SERIAL,(byte *)buffer,NULL);
+      parse(&Serial,(byte *)buffer,NULL);
 }
 
 // See documentation on DCC class for info on this section
-
-void DCCEXParser::parse(Print *stream,  byte *com,  RingStream *ringStream) {
-  // This function can get stings of the form "<C OMM AND>" or "C OMM AND"
-  // found is true first after the leading "<" has been passed
-  bool found = (com[0] != '<');
-  for (byte *c=com; c[0] != '\0'; c++) {
-    if (found) {
-      parseOne(stream, c,  ringStream);
-      found=false;
-    }
-    if (c[0] == '<')
-      found = true;
-  }
-}
-
-void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
+void DCCEXParser::parse(Print *stream, byte *com, RingStream * ringStream)
 {
-#ifndef DISABLE_EEPROM
     (void)EEPROM; // tell compiler not to warn this is unused
-#endif
     if (Diag::CMD)
         DIAG(F("PARSING:%s"), com);
     int16_t p[MAX_COMMAND_PARAMS];
     while (com[0] == '<' || com[0] == ' ')
         com++; // strip off any number of < or spaces
+    byte params = splitValues(p, com);
     byte opcode = com[0];
-    byte params = splitValues(p, com, opcode=='M' || opcode=='P');
-    
+
     if (filterCallback)
         filterCallback(stream, opcode, params, p);
     if (filterRMFTCallback && opcode!='\0')
@@ -228,23 +277,10 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
         return; // filterCallback asked us to ignore
     case 't':   // THROTTLE <t [REGISTER] CAB SPEED DIRECTION>
     {
-        if (params==1) {  // <t cab>  display state
-        
-        int16_t slot=DCC::lookupSpeedTable(p[0],false);
-        if (slot>=0) {
-            DCC::LOCO * sp=&DCC::speedTable[slot];
-            StringFormatter::send(stream,F("<l %d %d %d %l>\n"),
-			sp->loco,slot,sp->speedCode,sp->functions);
-            }
-        else // send dummy state speed 0 fwd no functions. 
-            StringFormatter::send(stream,F("<l %d -1 128 0>\n"),p[0]);
-        return; 
-        }
-        
         int16_t cab;
         int16_t tspeed;
         int16_t direction;
-        
+
         if (params == 4)
         { // <t REGISTER CAB SPEED DIRECTION>
             cab = p[1];
@@ -276,9 +312,10 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
             break; // invalid direction code
 
         DCC::setThrottle(cab, tspeed, direction);
-        if (params == 4) // send obsolete format T response
+        if (params == 4)
             StringFormatter::send(stream, F("<T %d %d %d>\n"), p[0], p[2], p[3]);
-        // speed change will be broadcast anyway in new <l > format
+        else
+            StringFormatter::send(stream, F("<O>\n"));
         return;
     }
     case 'f': // FUNCTION <f CAB BYTE1 [BYTE2]>
@@ -286,45 +323,30 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
             return;
         break;
 
-    case 'a': // ACCESSORY <a ADDRESS SUBADDRESS ACTIVATE [ONOFF]> or <a LINEARADDRESS ACTIVATE>
+    case 'a': // ACCESSORY <a ADDRESS SUBADDRESS ACTIVATE> or <a LINEARADDRESS ACTIVATE>
         { 
           int address;
           byte subaddress;
           byte activep;
-          byte onoff;
           if (params==2) { // <a LINEARADDRESS ACTIVATE>
               address=(p[0] - 1) / 4 + 1;
               subaddress=(p[0] - 1)  % 4;
-              activep=1;
-              onoff=2; // send both
+              activep=1;        
           }
           else if (params==3) { // <a ADDRESS SUBADDRESS ACTIVATE>
               address=p[0];
               subaddress=p[1];
-              activep=2;
-              onoff=2; // send both
-          }
-          else if (params==4) { // <a ADDRESS SUBADDRESS ACTIVATE ONOFF>
-              address=p[0];
-              subaddress=p[1];
-              activep=2;
-	      if ((p[3] < 0) || (p[3] > 1))        // invalid onoff    0|1
-		break;
-              onoff=p[3];
+              activep=2;        
           }
           else break; // invalid no of parameters
           
           if (
-	      ((address & 0x01FF) != address)      // invalid address (limit 9 bits)
-           || ((subaddress & 0x03) != subaddress)  // invalid subaddress (limit 2 bits)
-           || (p[activep] > 1) || (p[activep] < 0) // invalid activate 0|1
-	      ) break;
-          // Honour the configuration option (config.h) which allows the <a> command to be reversed
-#ifdef DCC_ACCESSORY_COMMAND_REVERSE
-          DCC::setAccessory(address, subaddress,p[activep]==0,onoff);
-#else
-          DCC::setAccessory(address, subaddress,p[activep]==1,onoff);
-#endif
+             ((address & 0x01FF) != address)      // invalid address (limit 9 bits ) 
+          || ((subaddress & 0x03) != subaddress)  // invalid subaddress (limit 2 bits ) 
+          || ((p[activep]  & 0x01) != p[activep]) // invalid activate 0|1
+          ) break; 
+          // TODO: Trigger configurable range of addresses on local VPins.
+          DCC::setAccessory(address, subaddress,p[activep]==1);
         }
         return;
      
@@ -353,10 +375,9 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
 
     case 'M': // WRITE TRANSPARENT DCC PACKET MAIN <M REG X1 ... X9>
     case 'P': // WRITE TRANSPARENT DCC PACKET PROG <P REG X1 ... X9>
-        // NOTE: this command was parsed in HEX instead of decimal
-        params--; // drop REG
-        if (params<1) break;
-	if (params > MAX_PACKET_SIZE) break;
+        // Re-parse the command using a hex-only splitter
+        params=splitHexValues(p,com)-1; // drop REG
+        if (params<1) break;  
         {
           byte packet[params];
           for (int i=0;i<params;i++) {
@@ -372,9 +393,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
                 break;
         if (params == 1) // <W id> Write new loco id (clearing consist and managing short/long)
             DCC::setLocoId(p[0],callback_Wloco);
-        else if (params == 4)  // WRITE CV ON PROG <W CV VALUE [CALLBACKNUM] [CALLBACKSUB]>
-            DCC::writeCVByte(p[0], p[1], callback_W4);
-        else  // WRITE CV ON PROG <W CV VALUE>
+        else // WRITE CV ON PROG <W CV VALUE [CALLBACKNUM] [CALLBACKSUB]>
             DCC::writeCVByte(p[0], p[1], callback_W);
         return;
 
@@ -402,13 +421,6 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
         return;
 
     case 'R': // READ CV ON PROG
-        if (params == 1)
-        { // <R CV> -- uses verify callback
-            if (!stashCallback(stream, p, ringStream))
-                break;
-            DCC::verifyCVByte(p[0], 0, callback_Vbyte);
-            return;
-        }
         if (params == 3)
         { // <R CV CALLBACKNUM CALLBACKSUB>
             if (!stashCallback(stream, p, ringStream))
@@ -425,81 +437,69 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
         }
         break;
 
-    case '1': // POWERON <1   [MAIN|PROG|JOIN]>
-        {
-        bool main=false;
-        bool prog=false;
-        bool join=false;
-        if (params > 1) break;
-        if (params==0 || MotorDriver::commonFaultPin) { // <1> or tracks can not be handled individually
-            main=true;
-            prog=true;
-        }
-	if (params==1) {
-	  if (p[0] == HASH_KEYWORD_JOIN) {  // <1 JOIN>
-            main=true;
-            prog=true;
-            join=true;
-	  }
-	  else if (p[0]==HASH_KEYWORD_MAIN) { // <1 MAIN>
-            main=true;
-	  }
-	  else if (p[0]==HASH_KEYWORD_PROG) { // <1 PROG>
-            prog=true;
-	  }
-	  else break; // will reply <X>
-	}
-        if (main) TrackManager::setMainPower(POWERMODE::ON);
-        if (prog) TrackManager::setProgPower(POWERMODE::ON);
-        TrackManager::setJoin(join);
-
-        CommandDistributor::broadcastPower();
-        return;
-        }
-
+    case '1': // POWERON <1   [MAIN|PROG]>
     case '0': // POWEROFF <0 [MAIN | PROG] >
+        if (params > 1)
+            break;
         {
-        bool main=false;
-        bool prog=false;
-        if (params > 1) break;
-        if (params==0 || MotorDriver::commonFaultPin) { // <0> or tracks can not be handled individually
-	  main=true;
-	  prog=true;
-        }
-	if (params==1) {
-	  if (p[0]==HASH_KEYWORD_MAIN) { // <0 MAIN>
-	    main=true;
-	  }
-	  else if (p[0]==HASH_KEYWORD_PROG) { // <0 PROG>
-	    prog=true;
-	  }
-	  else break; // will reply <X>
-	}
+            POWERMODE mode = opcode == '1' ? POWERMODE::ON : POWERMODE::OFF;
+            DCC::setProgTrackSyncMain(false); // Only <1 JOIN> will set this on, all others set it off
+            if (params == 0 ||
+		(MotorDriver::commonFaultPin && p[0] != HASH_KEYWORD_JOIN)) // commonFaultPin prevents individual track handling
+            {
+                DCCWaveform::mainTrack.setPowerMode(mode);
+                DCCWaveform::progTrack.setPowerMode(mode);
+		if (mode == POWERMODE::OFF)
+		  DCC::setProgTrackBoost(false);  // Prog track boost mode will not outlive prog track off
+                StringFormatter::send(stream, F("<p%c>\n"), opcode);
+                return;
+            }
+            switch (p[0])
+            {
+            case HASH_KEYWORD_MAIN:
+                DCCWaveform::mainTrack.setPowerMode(mode);
+                StringFormatter::send(stream, F("<p%c MAIN>\n"), opcode);
+                return;
 
-        if (main) TrackManager::setMainPower(POWERMODE::OFF);
-        if (prog) {
-            TrackManager::progTrackBoosted=false;  // Prog track boost mode will not outlive prog track off
-            TrackManager::setProgPower(POWERMODE::OFF);
+            case HASH_KEYWORD_PROG:
+                DCCWaveform::progTrack.setPowerMode(mode);
+		if (mode == POWERMODE::OFF)
+		  DCC::setProgTrackBoost(false);  // Prog track boost mode will not outlive prog track off
+                StringFormatter::send(stream, F("<p%c PROG>\n"), opcode);
+                return;
+            case HASH_KEYWORD_JOIN:
+                DCCWaveform::mainTrack.setPowerMode(mode);
+                DCCWaveform::progTrack.setPowerMode(mode);
+                if (mode == POWERMODE::ON)
+                {
+                    DCC::setProgTrackSyncMain(true);
+                    StringFormatter::send(stream, F("<p1 JOIN>\n"), opcode);
+                }
+                else
+                    StringFormatter::send(stream, F("<p0>\n"));
+                return;
+            }
+            break;
         }
-        TrackManager::setJoin(false);
-
-        CommandDistributor::broadcastPower();
         return;
-        }
 
     case '!': // ESTOP ALL  <!>
-        DCC::setThrottle(0,1,1); // this broadcasts speed 1(estop) and sets all reminders to speed 1.
+        DCC::setThrottle(0,1,1); // this broadcasts speed 1(estop) and sets all reminders to speed 1. 
         return;
 
     case 'c': // SEND METER RESPONSES <c>
-        // No longer supported because of multiple tracks                               <c MeterName value C/V unit min max res warn>
-        break;
+        //                               <c MeterName value C/V unit min max res warn>
+        StringFormatter::send(stream, F("<c CurrentMAIN %d C Milli 0 %d 1 %d>\n"), DCCWaveform::mainTrack.getCurrentmA(), 
+            DCCWaveform::mainTrack.getMaxmA(), DCCWaveform::mainTrack.getTripmA());
+        StringFormatter::send(stream, F("<a %d>\n"), DCCWaveform::mainTrack.get1024Current()); //'a' message deprecated, remove once JMRI 4.22 is available
+        return;
 
     case 'Q': // SENSORS <Q>
         Sensor::printAll(stream);
         return;
 
     case 's': // <s>
+        StringFormatter::send(stream, F("<p%d>\n"), DCCWaveform::mainTrack.getPowerMode() == POWERMODE::ON);
         StringFormatter::send(stream, F("<iDCC-EX V-%S / %S / %S G-%S>\n"), F(VERSION), F(ARDUINO_TYPE), DCC::getMotorShieldName(), F(GITHUB_SHA));
         Turnout::printAll(stream); //send all Turnout states
         Output::printAll(stream);  //send all Output  states
@@ -507,7 +507,6 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
         // TODO Send stats of  speed reminders table
         return;       
 
-#ifndef DISABLE_EEPROM
     case 'E': // STORE EPROM <E>
         EEStore::store();
         StringFormatter::send(stream, F("<e %d %d %d>\n"), EEStore::eeStore->data.nTurnouts, EEStore::eeStore->data.nSensors, EEStore::eeStore->data.nOutputs);
@@ -517,7 +516,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
         EEStore::clear();
         StringFormatter::send(stream, F("<O>\n"));
         return;
-#endif
+
     case ' ': // < >
         StringFormatter::send(stream, F("\n"));
         return;
@@ -527,11 +526,6 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
             return;
         return;
 
-    case '=': // <= Track manager control  >
-        if (TrackManager::parseJ(stream, params, p))
-            return;
-        break;
-
     case '#': // NUMBER OF LOCOSLOTS <#>
         StringFormatter::send(stream, F("<# %d>\n"), MAX_LOCOS);
         return;
@@ -543,83 +537,19 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
         return;
 
     case 'F': // New command to call the new Loco Function API <F cab func 1|0>
-        if(params!=3) break; 
         if (Diag::CMD)
             DIAG(F("Setting loco %d F%d %S"), p[0], p[1], p[2] ? F("ON") : F("OFF"));
-        if (DCC::setFn(p[0], p[1], p[2] == 1)) return;
-	break;
+        DCC::setFn(p[0], p[1], p[2] == 1);
+        return;
 
-#if WIFI_ON
     case '+': // Complex Wifi interface command (not usual parse)
-        if (atCommandCallback && !ringStream) {
-          TrackManager::setPower(POWERMODE::OFF);
-          atCommandCallback((HardwareSerial *)stream,com);
+        if (atCommandCallback) {
+          DCCWaveform::mainTrack.setPowerMode(POWERMODE::OFF);
+          DCCWaveform::progTrack.setPowerMode(POWERMODE::OFF);
+          atCommandCallback(com);
           return;
         }
         break;
-#endif 
-
-    case 'J' : // throttle info access
-        {
-            if ((params<1) | (params>2)) break; // <J>
-            int16_t id=(params==2)?p[1]:0;
-            switch(p[0]) {
-                case HASH_KEYWORD_A: // <JA> returns automations/routes
-                    StringFormatter::send(stream, F("<jA"));
-                    if (params==1) {// <JA>
-#ifdef EXRAIL_ACTIVE
-                        sendFlashList(stream,RMFT2::routeIdList);
-                        sendFlashList(stream,RMFT2::automationIdList);
-#endif
-                    }
-                    else {  // <JA id>
-                        StringFormatter::send(stream,F(" %d %c \"%S\""), 
-                                        id, 
-#ifdef EXRAIL_ACTIVE
-                                        RMFT2::getRouteType(id), // A/R
-                                        RMFT2::getRouteDescription(id)
-#else  
-                                        'X',F("")
-#endif                                        
-                                        );
-                    }
-                    StringFormatter::send(stream, F(">\n"));      
-                    return; 
-            case HASH_KEYWORD_R: // <JR> returns rosters 
-                StringFormatter::send(stream, F("<jR"));
-#ifdef EXRAIL_ACTIVE
-                if (params==1) sendFlashList(stream,RMFT2::rosterIdList);
-                else StringFormatter::send(stream,F(" %d \"%S\" \"%S\""), 
-                    id, RMFT2::getRosterName(id), RMFT2::getRosterFunctions(id));
-#endif          
-                StringFormatter::send(stream, F(">\n"));      
-                return; 
-            case HASH_KEYWORD_T: // <JT> returns turnout list 
-                StringFormatter::send(stream, F("<jT"));
-                if (params==1) { // <JT>
-                    for ( Turnout * t=Turnout::first(); t; t=t->next()) { 
-                        if (t->isHidden()) continue;          
-                        StringFormatter::send(stream, F(" %d"),t->getId());
-                    }
-                }
-                else { // <JT id>
-                    Turnout * t=Turnout::get(id);
-                    if (!t || t->isHidden()) StringFormatter::send(stream, F(" %d X"),id);
-                    else  StringFormatter::send(stream, F(" %d %c \"%S\""),
-                            id,t->isThrown()?'T':'C', 
-#ifdef EXRAIL_ACTIVE
-                            RMFT2::getTurnoutDescription(id)
-#else
-                            F("") 
-#endif  
-                        );      
-                }
-                StringFormatter::send(stream, F(">\n"));
-                return;
-            default: break;    
-            }  // switch(p[1])
-        break; // case J
-        }
 
     default: //anything else will diagnose and drop out to <X>
         DIAG(F("Opcode=%c params=%d"), opcode, params);
@@ -633,14 +563,6 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
     StringFormatter::send(stream, F("<X>\n"));
 }
 
-void DCCEXParser::sendFlashList(Print * stream,const int16_t flashList[]) {
-    for (int16_t i=0;;i++) {
-        int16_t value=GETFLASHW(flashList+i);
-        if (value==0) return;
-        StringFormatter::send(stream,F(" %d"),value);
-    } 
-}
-
 bool DCCEXParser::parseZ(Print *stream, int16_t params, int16_t p[])
 {
 
@@ -689,39 +611,43 @@ bool DCCEXParser::parseZ(Print *stream, int16_t params, int16_t p[])
 //===================================
 bool DCCEXParser::parsef(Print *stream, int16_t params, int16_t p[])
 {
-  // JMRI sends this info in DCC message format but it's not exactly
-  // convenient for other processing
-  if (params == 2) {
-    byte instructionField = p[1] & 0xE0;   // 1110 0000
-    if (instructionField == 0x80) {        // 1000 0000 Function group 1
-      // Shuffle bits from order F0 F4 F3 F2 F1 to F4 F3 F2 F1 F0
-      byte normalized = (p[1] << 1 & 0x1e) | (p[1] >> 4 & 0x01);
-      return (funcmap(p[0], normalized, 0, 4));
-    } else if (instructionField == 0xA0) { // 1010 0000 Function group 2
-      if (p[1] & 0x10)                     // 0001 0000 Bit selects F5toF8 / F9toF12
-	return (funcmap(p[0], p[1], 5, 8));
-      else
-	return (funcmap(p[0], p[1], 9, 12));
-    } 
-  }
-  if (params == 3) {
-    if (p[1] == 222) {
-      return (funcmap(p[0], p[2], 13, 20));
-    } else if (p[1] == 223) {
-      return (funcmap(p[0], p[2], 21, 28));
-    } 
-  }
-  (void)stream; // NO RESPONSE
-  return false;
+    // JMRI sends this info in DCC message format but it's not exactly
+    //      convenient for other processing
+    if (params == 2)
+    {
+        byte instructionField = p[1] & 0xE0;   // 1110 0000
+        if (instructionField == 0x80)          // 1000 0000 Function group 1
+        {
+	    // Shuffle bits from order F0 F4 F3 F2 F1 to F4 F3 F2 F1 F0 
+            byte normalized = (p[1] << 1 & 0x1e) | (p[1] >> 4 & 0x01);
+            funcmap(p[0], normalized, 0, 4);
+        }
+        else if (instructionField == 0xA0)     // 1010 0000 Function group 2
+        {
+	    if (p[1] & 0x10)                   // 0001 0000 Bit selects F5toF8 / F9toF12
+		funcmap(p[0], p[1], 5, 8);
+	    else
+		funcmap(p[0], p[1], 9, 12);
+        }
+    }
+    if (params == 3)
+    {
+        if (p[1] == 222)
+            funcmap(p[0], p[2], 13, 20);
+        else if (p[1] == 223)
+            funcmap(p[0], p[2], 21, 28);
+    }
+    (void)stream; // NO RESPONSE
+    return true;
 }
 
-bool DCCEXParser::funcmap(int16_t cab, byte value, byte fstart, byte fstop)
+void DCCEXParser::funcmap(int16_t cab, byte value, byte fstart, byte fstop)
 {
-  for (int16_t i = fstart; i <= fstop; i++) {
-    if (! DCC::setFn(cab, i, value & 1)) return false;
-    value >>= 1;
-  }
-  return true;
+    for (int16_t i = fstart; i <= fstop; i++)
+    {
+        DCC::setFn(cab, i, value & 1);
+        value >>= 1;
+    }
 }
 
 //===================================
@@ -732,7 +658,7 @@ bool DCCEXParser::parseT(Print *stream, int16_t params, int16_t p[])
     case 0: // <T>  list turnout definitions
     {
         bool gotOne = false;
-        for (Turnout *tt = Turnout::first(); tt != NULL; tt = tt->next())
+        for (Turnout *tt = Turnout::firstTurnout; tt != NULL; tt = tt->nextTurnout)
         {
             gotOne = true;
             tt->print(stream);
@@ -746,60 +672,17 @@ bool DCCEXParser::parseT(Print *stream, int16_t params, int16_t p[])
         StringFormatter::send(stream, F("<O>\n"));
         return true;
 
-    case 2: // <T id 0|1|T|C> 
-        {
-          bool state = false;
-          switch (p[1]) {
-            // Turnout messages use 1=throw, 0=close.
-            case 0:
-            case HASH_KEYWORD_C:
-              state = true;
-              break;
-            case 1:
-            case HASH_KEYWORD_T:
-              state= false;
-              break;
-            default:
-              return false;  // Invalid parameter
-          }
-          if (!Turnout::setClosed(p[0], state)) return false;
+    case 2: // <T id 0|1>  turnout 0=CLOSE,1=THROW
+        if (p[1]>1 || p[1]<0 ) return false;
+        if (!Turnout::setClosed(p[0],p[1]==0)) return false;
+        StringFormatter::send(stream, F("<H %d %d>\n"), p[0], p[1]);
+        return true;
 
-
-          return true;
-        }
-
-    default: // Anything else is some kind of turnout create function.
-      if (params == 6 && p[1] == HASH_KEYWORD_SERVO) { // <T id SERVO n n n n>
-        if (!ServoTurnout::create(p[0], (VPIN)p[2], (uint16_t)p[3], (uint16_t)p[4], (uint8_t)p[5]))
-          return false;
-      } else 
-      if (params == 3 && p[1] == HASH_KEYWORD_VPIN) { // <T id VPIN n>
-        if (!VpinTurnout::create(p[0], p[2])) return false;
-      } else 
-      if (params >= 3 && p[1] == HASH_KEYWORD_DCC) {
-        // <T id DCC addr subadd>   0<=addr<=511, 0<=subadd<=3 (like <a> command).<T>
-        if (params==4 && p[2]>=0 && p[2]<512 && p[3]>=0 && p[3]<4) { // <T id DCC n m>
-          if (!DCCTurnout::create(p[0], p[2], p[3])) return false;
-        } else if (params==3 && p[2]>0 && p[2]<=512*4) { // <T id DCC nn>, 1<=nn<=2048
-          // Linearaddress 1 maps onto decoder address 1/0 (not 0/0!).
-          if (!DCCTurnout::create(p[0], (p[2]-1)/4+1, (p[2]-1)%4)) return false;
-        } else
-          return false;
-      } else 
-      if (params==3) { // legacy <T id addr subadd> for DCC accessory
-        if (p[1]>=0 && p[1]<512 && p[2]>=0 && p[2]<4) {
-          if (!DCCTurnout::create(p[0], p[1], p[2])) return false;
-        } else
-          return false;
-      } 
-      else 
-      if (params==4) { // legacy <T id n n n> for Servo
-        if (!ServoTurnout::create(p[0], (VPIN)p[1], (uint16_t)p[2], (uint16_t)p[3], 1)) return false;
-      } else
-        return false;
-
-      StringFormatter::send(stream, F("<O>\n"));
-      return true;
+    default: // Anything else is handled by Turnout class.
+        if (!Turnout::create(p[0], params-1, &p[1]))
+            return false;
+        StringFormatter::send(stream, F("<O>\n"));
+        return true;
     }
 }
 
@@ -847,23 +730,20 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
         return true;
 
     case HASH_KEYWORD_RAM: // <D RAM>
-        StringFormatter::send(stream, F("Free memory=%d\n"), DCCTimer::getMinimumFreeMemory());
+        StringFormatter::send(stream, F("Free memory=%d\n"), minimumFreeMemory());
         break;
 
-    case HASH_KEYWORD_ACK: // <D ACK ON/OFF> <D ACK [LIMIT|MIN|MAX|RETRY] Value>
+    case HASH_KEYWORD_ACK: // <D ACK ON/OFF> <D ACK [LIMIT|MIN|MAX] Value>
 	if (params >= 3) {
 	    if (p[1] == HASH_KEYWORD_LIMIT) {
-	      DCCACK::setAckLimit(p[2]);
-	      LCD(1, F("Ack Limit=%dmA"), p[2]);  // <D ACK LIMIT 42>
+	      DCCWaveform::progTrack.setAckLimit(p[2]);
+	      StringFormatter::send(stream, F("Ack limit=%dmA\n"), p[2]);
 	    } else if (p[1] == HASH_KEYWORD_MIN) {
-	      DCCACK::setMinAckPulseDuration(p[2]);
-	      LCD(0, F("Ack Min=%uus"), p[2]);  //   <D ACK MIN 1500>
+	      DCCWaveform::progTrack.setMinAckPulseDuration(p[2]);
+	      StringFormatter::send(stream, F("Ack min=%dus\n"), p[2]);
 	    } else if (p[1] == HASH_KEYWORD_MAX) {
-	      DCCACK::setMaxAckPulseDuration(p[2]);
-	      LCD(0, F("Ack Max=%uus"), p[2]);  //   <D ACK MAX 9000>
-	    } else if (p[1] == HASH_KEYWORD_RETRY) {
-	      if (p[2] >255) p[2]=3;
-	      LCD(0, F("Ack Retry=%d Sum=%d"), p[2], DCCACK::setAckRetry(p[2]));  //   <D ACK RETRY 2>
+	      DCCWaveform::progTrack.setMaxAckPulseDuration(p[2]);
+	      StringFormatter::send(stream, F("Ack max=%dus\n"), p[2]);
 	    }
 	} else {
 	  StringFormatter::send(stream, F("Ack diag %S\n"), onOff ? F("on") : F("off"));
@@ -875,39 +755,37 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
         Diag::CMD = onOff;
         return true;
 
-#ifdef HAS_ENOUGH_MEMORY
     case HASH_KEYWORD_WIFI: // <D WIFI ON/OFF>
         Diag::WIFI = onOff;
         return true;
 
-    case HASH_KEYWORD_ETHERNET: // <D ETHERNET ON/OFF>
+   case HASH_KEYWORD_ETHERNET: // <D ETHERNET ON/OFF>
         Diag::ETHERNET = onOff;
         return true;
 
     case HASH_KEYWORD_WIT: // <D WIT ON/OFF>
         Diag::WITHROTTLE = onOff;
         return true;
-
+  
     case HASH_KEYWORD_LCN: // <D LCN ON/OFF>
         Diag::LCN = onOff;
         return true;
-#endif
 
     case HASH_KEYWORD_PROGBOOST:
-        TrackManager::progTrackBoosted=true;
-	    return true;
+        DCC::setProgTrackBoost(true);
+	      return true;
 
     case HASH_KEYWORD_RESET:
-        DCCTimer::reset();
-        break; // and <X> if we didnt restart 
-    
-
-#ifndef DISABLE_EEPROM
+        {
+          wdt_enable( WDTO_15MS); // set Arduino watchdog timer for 15ms 
+          delay(50);            // wait for the prescaller time to expire          
+          break; // and <X> if we didnt restart 
+        }
+        
     case HASH_KEYWORD_EEPROM: // <D EEPROM NumEntries>
 	if (params >= 2)
 	    EEStore::dump(p[1]);
 	return true;
-#endif
 
     case HASH_KEYWORD_SPEED28:
         DCC::setGlobalSpeedsteps(28);
@@ -919,23 +797,7 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
 	StringFormatter::send(stream, F("128 Speedsteps"));
         return true;
 
-    case HASH_KEYWORD_SERVO:  // <D SERVO vpin position [profile]>
-    case HASH_KEYWORD_ANOUT:  // <D ANOUT vpin position [profile]>
-        IODevice::writeAnalogue(p[1], p[2], params>3 ? p[3] : 0);
-        break;
-
-    case HASH_KEYWORD_ANIN:   // <D ANIN vpin>  Display analogue input value
-        DIAG(F("VPIN=%d value=%d"), p[1], IODevice::readAnalogue(p[1]));
-        break;
-
-#if !defined(IO_MINIMAL_HAL)
-    case HASH_KEYWORD_HAL: 
-        if (p[1] == HASH_KEYWORD_SHOW) 
-          IODevice::DumpAll();
-        break;
-#endif
-
-    case HASH_KEYWORD_TT:     // <D TT vpin steps activity>
+    case HASH_KEYWORD_SERVO:
         IODevice::writeAnalogue(p[1], p[2], params>3 ? p[3] : 0);
         break;
 
@@ -974,14 +836,7 @@ void DCCEXParser::commitAsyncReplyStream() {
 void DCCEXParser::callback_W(int16_t result)
 {
     StringFormatter::send(getAsyncReplyStream(),
-          F("<r %d %d>\n"), stashP[0], result == 1 ? stashP[1] : -1);
-    commitAsyncReplyStream();
-}
-
-void DCCEXParser::callback_W4(int16_t result)
-{
-    StringFormatter::send(getAsyncReplyStream(),
-	  F("<r%d|%d|%d %d>\n"), stashP[2], stashP[3], stashP[0], result == 1 ? stashP[1] : -1);
+          F("<r%d|%d|%d %d>\n"), stashP[2], stashP[3], stashP[0], result == 1 ? stashP[1] : -1);
     commitAsyncReplyStream();
 }
 
@@ -1008,21 +863,10 @@ void DCCEXParser::callback_R(int16_t result)
     commitAsyncReplyStream();
 }
 
-void DCCEXParser::callback_Rloco(int16_t result) {
-  const FSH * detail;
-  if (result<=0) {
-    detail=F("<r %d>\n");
-  } else {
-    bool longAddr=result & LONG_ADDR_MARKER;        //long addr
-    if (longAddr)
-      result = result^LONG_ADDR_MARKER;
-    if (longAddr && result <= HIGHEST_SHORT_ADDR)
-      detail=F("<r LONG %d UNSUPPORTED>\n");
-    else
-      detail=F("<r %d>\n");
-  }
-  StringFormatter::send(getAsyncReplyStream(), detail, result);
-  commitAsyncReplyStream();
+void DCCEXParser::callback_Rloco(int16_t result)
+{
+    StringFormatter::send(getAsyncReplyStream(), F("<r %d>\n"), result);
+    commitAsyncReplyStream();
 }
 
 void DCCEXParser::callback_Wloco(int16_t result)

DCCEXParser.h

@@ -1,8 +1,5 @@
 /*
- *  © 2021 Mike S
- *  © 2021 Fred Decker
- *  © 2020-2021 Chris Harlow
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
  *  
  *  This file is part of Asbelos DCC API
  *
@@ -26,14 +23,15 @@
 #include "RingStream.h"
 
 typedef void (*FILTER_CALLBACK)(Print * stream, byte & opcode, byte & paramCount, int16_t p[]);
-typedef void (*AT_COMMAND_CALLBACK)(HardwareSerial * stream,const byte * command);
+typedef void (*AT_COMMAND_CALLBACK)(const byte * command);
 
 struct DCCEXParser
 {
-   
-   static void parse(Print * stream,  byte * command,  RingStream * ringStream);
-   static void parse(const FSH * cmd);
-   static void parseOne(Print * stream,  byte * command,  RingStream * ringStream);
+   DCCEXParser();
+   void loop(Stream & stream);
+   void parse(Print * stream,  byte * command,  RingStream * ringStream);
+   void parse(const FSH * cmd);
+   void flush();
    static void setFilter(FILTER_CALLBACK filter);
    static void setRMFTFilter(FILTER_CALLBACK filter);
    static void setAtCommandCallback(AT_COMMAND_CALLBACK filter);
@@ -42,13 +40,17 @@ struct DCCEXParser
    private:
   
     static const int16_t MAX_BUFFER=50;  // longest command sent in
-    static int16_t splitValues( int16_t result[MAX_COMMAND_PARAMS], const byte * command, bool usehex);
+     byte  bufferLength=0;
+     bool  inCommandPayload=false;
+     byte  buffer[MAX_BUFFER+2]; 
+    int16_t splitValues( int16_t result[MAX_COMMAND_PARAMS], const byte * command);
+    int16_t splitHexValues( int16_t result[MAX_COMMAND_PARAMS], const byte * command);
      
-    static bool parseT(Print * stream, int16_t params, int16_t p[]);
-     static bool parseZ(Print * stream, int16_t params, int16_t p[]);
-     static bool parseS(Print * stream,  int16_t params, int16_t p[]);
-     static bool parsef(Print * stream,  int16_t params, int16_t p[]);
-     static bool parseD(Print * stream,  int16_t params, int16_t p[]);
+     bool parseT(Print * stream, int16_t params, int16_t p[]);
+     bool parseZ(Print * stream, int16_t params, int16_t p[]);
+     bool parseS(Print * stream,  int16_t params, int16_t p[]);
+     bool parsef(Print * stream,  int16_t params, int16_t p[]);
+     bool parseD(Print * stream,  int16_t params, int16_t p[]);
 
      static Print * getAsyncReplyStream();
      static void commitAsyncReplyStream();
@@ -59,9 +61,8 @@ struct DCCEXParser
     static RingStream * stashRingStream;
     
     static int16_t stashP[MAX_COMMAND_PARAMS];
-    static bool stashCallback(Print * stream, int16_t p[MAX_COMMAND_PARAMS], RingStream * ringStream);
+    bool stashCallback(Print * stream, int16_t p[MAX_COMMAND_PARAMS], RingStream * ringStream);
     static void callback_W(int16_t result);
-    static void callback_W4(int16_t result);
     static void callback_B(int16_t result);        
     static void callback_R(int16_t result);
     static void callback_Rloco(int16_t result);
@@ -71,8 +72,7 @@ struct DCCEXParser
     static FILTER_CALLBACK  filterCallback;
     static FILTER_CALLBACK  filterRMFTCallback;
     static AT_COMMAND_CALLBACK  atCommandCallback;
-    static bool funcmap(int16_t cab, byte value, byte fstart, byte fstop);
-    static void sendFlashList(Print * stream,const int16_t flashList[]);
+    static void funcmap(int16_t cab, byte value, byte fstart, byte fstop);
 
 };
 

DCCRMT.cpp

@@ -1,232 +0,0 @@
-/*
- *  © 2021-2022, Harald Barth.
- *  
- *  This file is part of DCC-EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#if defined(ARDUINO_ARCH_ESP32)
-#include "defines.h"
-#include "DIAG.h"
-#include "DCCRMT.h"
-#include "DCCWaveform.h" // for MAX_PACKET_SIZE
-#include "soc/gpio_sig_map.h"
-
-// Number of bits resulting out of X bytes of DCC payload data
-// Each byte has one bit extra and at the end we have one EOF marker
-#define DATA_LEN(X) ((X)*9+1)
-
-#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4,2,0)
-#error wrong IDF version
-#endif
-
-void setDCCBit1(rmt_item32_t* item) {
-  item->level0    = 1;
-  item->duration0 = DCC_1_HALFPERIOD;
-  item->level1    = 0;
-  item->duration1 = DCC_1_HALFPERIOD;
-}
-
-void setDCCBit0(rmt_item32_t* item) {
-  item->level0    = 1;
-  item->duration0 = DCC_0_HALFPERIOD;
-  item->level1    = 0;
-  item->duration1 = DCC_0_HALFPERIOD;
-}
-
-// special long zero to trigger scope
-void setDCCBit0Long(rmt_item32_t* item) {
-  item->level0    = 1;
-  item->duration0 = DCC_0_HALFPERIOD + DCC_0_HALFPERIOD/10;
-  item->level1    = 0;
-  item->duration1 = DCC_0_HALFPERIOD + DCC_0_HALFPERIOD/10;
-}
-
-void setEOT(rmt_item32_t* item) {
-  item->val = 0;
-}
-
-// This is an array that contains the this pointers
-// to all uses channel objects. This is used to determine
-// which of the channels was triggering the ISR as there
-// is only ONE common ISR routine for all channels.
-RMTChannel *channelHandle[8] = { 0 };
-
-void IRAM_ATTR interrupt(rmt_channel_t channel, void *t) {
-  RMTChannel *tt = channelHandle[channel];
-  if (tt) tt->RMTinterrupt();
-}
-
-RMTChannel::RMTChannel(pinpair pins, bool isMain) {
-  byte ch;
-  byte plen;
-  if (isMain) {
-    ch = 0;
-    plen = PREAMBLE_BITS_MAIN;
-  } else {
-    ch = 2;
-    plen = PREAMBLE_BITS_PROG;
-  }
-    
-  // preamble
-  preambleLen = plen+2; // plen 1 bits, one 0 bit and one EOF marker
-  preamble = (rmt_item32_t*)malloc(preambleLen*sizeof(rmt_item32_t));
-  for (byte n=0; n<plen; n++)
-    setDCCBit1(preamble + n);      // preamble bits
-#ifdef SCOPE
-  setDCCBit0Long(preamble + plen); // start of packet 0 bit long version
-#else
-  setDCCBit0(preamble + plen);     // start of packet 0 bit normal version
-#endif
-  setEOT(preamble + plen + 1);     // EOT marker
-
-  // idle
-  idleLen = 28;
-  idle = (rmt_item32_t*)malloc(idleLen*sizeof(rmt_item32_t));
-  if (isMain) {
-    for (byte n=0; n<8; n++)   // 0 to 7
-      setDCCBit1(idle + n);
-    for (byte n=8; n<18; n++)  // 8, 9 to 16, 17
-      setDCCBit0(idle + n);
-    for (byte n=18; n<26; n++) // 18 to 25
-      setDCCBit1(idle + n);
-  } else {
-    for (byte n=0; n<26; n++)  // all zero
-      setDCCBit0(idle + n);
-  }
-  setDCCBit1(idle + 26);     // end bit
-  setEOT(idle + 27);         // EOT marker
-
-  // data: max packet size today is 5 + checksum
-  maxDataLen = DATA_LEN(MAX_PACKET_SIZE+1);  // plus checksum
-  data = (rmt_item32_t*)malloc(maxDataLen*sizeof(rmt_item32_t));
-  
-  rmt_config_t config;
-  // Configure the RMT channel for TX
-  bzero(&config, sizeof(rmt_config_t));
-  config.rmt_mode = RMT_MODE_TX;
-  config.channel = channel = (rmt_channel_t)ch;
-  config.clk_div = RMT_CLOCK_DIVIDER;
-  config.gpio_num = (gpio_num_t)pins.pin;
-  config.mem_block_num = 2; // With longest DCC packet 11 inc checksum (future expansion)
-                            // number of bits needed is 22preamble + start +
-                            // 11*9 + extrazero + EOT = 124
-                            // 2 mem block of 64 RMT items should be enough
-
-  ESP_ERROR_CHECK(rmt_config(&config));
-  addPin(pins.invpin, true);
-  /*
-  // test: config another gpio pin
-  gpio_num_t gpioNum = (gpio_num_t)(pin-1);
-  PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[gpioNum], PIN_FUNC_GPIO);
-  gpio_set_direction(gpioNum, GPIO_MODE_OUTPUT);
-  gpio_matrix_out(gpioNum, RMT_SIG_OUT0_IDX, 0, 0);
-  */
-  
-  // NOTE: ESP_INTR_FLAG_IRAM is *NOT* included in this bitmask
-  ESP_ERROR_CHECK(rmt_driver_install(config.channel, 0, ESP_INTR_FLAG_LOWMED|ESP_INTR_FLAG_SHARED));
-
-  // DIAG(F("Register interrupt on core %d"), xPortGetCoreID());
-
-  ESP_ERROR_CHECK(rmt_set_tx_loop_mode(channel, true));
-  channelHandle[channel] = this; // used by interrupt
-  rmt_register_tx_end_callback(interrupt, 0);
-  rmt_set_tx_intr_en(channel, true);
-
-  DIAG(F("Channel %d DCC signal for %s start"), config.channel, isMain ? "MAIN" : "PROG");
-
-  // send one bit to kickstart the signal, remaining data will come from the
-  // packet queue. We intentionally do not wait for the RMT TX complete here.
-  //rmt_write_items(channel, preamble, preambleLen, false);
-  RMTprefill();
-  dataReady = false;
-}
-
-void RMTChannel::RMTprefill() {
-  rmt_fill_tx_items(channel, preamble, preambleLen, 0);
-  rmt_fill_tx_items(channel, idle, idleLen, preambleLen-1);
-}
-
-const byte transmitMask[] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
-
-int RMTChannel::RMTfillData(const byte buffer[], byte byteCount, byte repeatCount=0) {
-  //int RMTChannel::RMTfillData(dccPacket packet) {
-  // dataReady: Signals to then interrupt routine. It is set when
-  // we have data in the channel buffer which can be copied out
-  // to the HW. dataRepeat on the other hand signals back to
-  // the caller of this function if the data has been sent enough
-  // times (0 to 3 means 1 to 4 times in total).
-  if (dataRepeat > 0) // we have still old work to do
-    return dataRepeat;
-  if (dataReady == true) // the packet is not copied out yet
-    return 1000;
-  if (DATA_LEN(byteCount) > maxDataLen) {  // this would overun our allocated memory for data
-    DIAG(F("Can not convert DCC bytes # %d to DCC bits %d, buffer too small"), byteCount, maxDataLen);
-    return -1;                          // something very broken, can not convert packet
-  }
-
-  // convert bytes to RMT stream of "bits"
-  byte bitcounter = 0;
-  for(byte n=0; n<byteCount; n++) {
-    for(byte bit=0; bit<8; bit++) {
-      if (buffer[n] & transmitMask[bit])
-	setDCCBit1(data + bitcounter++);
-      else
-	setDCCBit0(data + bitcounter++);
-    }
-    setDCCBit0(data + bitcounter++); // zero at end of each byte
-  }
-  setDCCBit1(data + bitcounter-1);     // overwrite previous zero bit with one bit
-  setEOT(data + bitcounter++);         // EOT marker
-  dataLen = bitcounter;
-  dataReady = true;
-  dataRepeat = repeatCount+1;         // repeatCount of 0 means send once
-  return 0;
-}
-
-void IRAM_ATTR RMTChannel::RMTinterrupt() {
-  //no rmt_tx_start(channel,true) as we run in loop mode
-  //preamble is always loaded at beginning of buffer
-  packetCounter++;
-  if (!dataReady && dataRepeat == 0) { // we did run empty
-    rmt_fill_tx_items(channel, idle, idleLen, preambleLen-1);
-    return; // nothing to do about that
-  }
-
-  // take care of incoming data
-  if (dataReady) {            // if we have new data, fill while preamble is running
-    rmt_fill_tx_items(channel, data, dataLen, preambleLen-1);
-    dataReady = false;
-  }
-  if (dataRepeat > 0)         // if a repeat count was specified, work on that
-    dataRepeat--;
-}
-
-bool RMTChannel::addPin(byte pin, bool inverted) {
-  if (pin == UNUSED_PIN)
-    return true;
-  gpio_num_t gpioNum = (gpio_num_t)(pin);
-  esp_err_t err;
-  PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[gpioNum], PIN_FUNC_GPIO);
-  err = gpio_set_direction(gpioNum, GPIO_MODE_OUTPUT);
-  if (err != ESP_OK) return false;
-  gpio_matrix_out(gpioNum, RMT_SIG_OUT0_IDX+channel, inverted, 0);
-  if (err != ESP_OK) return false;
-  return true;
-}
-bool RMTChannel::addPin(pinpair pins) {
-  return addPin(pins.pin) && addPin(pins.invpin, true);
-}
-#endif //ESP32

DCCRMT.h

@@ -1,66 +0,0 @@
-/*
- *  © 2021-2022, Harald Barth.
- *  
- *  This file is part of DCC-EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#if defined(ARDUINO_ARCH_ESP32)
-#pragma once
-#include <Arduino.h>
-#include "driver/rmt.h"
-#include "soc/rmt_reg.h"
-#include "soc/rmt_struct.h"
-#include "MotorDriver.h" // for class pinpair
-
-// make calculations easy and set up for microseconds
-#define RMT_CLOCK_DIVIDER 80
-#define DCC_1_HALFPERIOD 58  //4640 // 1 / 80000000 * 4640 = 58us
-#define DCC_0_HALFPERIOD 100 //8000
-
-class RMTChannel {
- public:
-  RMTChannel(pinpair pins, bool isMain);
-  bool addPin(byte pin, bool inverted=0);
-  bool addPin(pinpair pins);
-  void IRAM_ATTR RMTinterrupt();
-  void RMTprefill();
-  //int RMTfillData(dccPacket packet);
-  int RMTfillData(const byte buffer[], byte byteCount, byte repeatCount);
-  inline bool busy() {
-    if (dataRepeat > 0) // we have still old work to do
-      return true;
-    return dataReady;
-  };
-  inline uint32_t packetCount() { return packetCounter; };
-  
- private:
-    
-  rmt_channel_t channel;
-  // 3 types of data to send, preamble and then idle or data
-  // if this is prog track, idle will contain reset instead
-  rmt_item32_t *idle;
-  byte idleLen;
-  rmt_item32_t *preamble;
-  byte preambleLen;
-  rmt_item32_t *data;
-  byte dataLen;
-  byte maxDataLen;
-  uint32_t packetCounter = 0;
-  // flags 
-  volatile bool dataReady = false;    // do we have real data available or send idle
-  volatile byte dataRepeat = 0;
-};
-#endif //ESP32

DCCTimer.cpp

@@ -0,0 +1,213 @@
+/*
+ *  © 2021, Chris Harlow & David Cutting. All rights reserved.
+ *  
+ *  This file is part of Asbelos DCC API
+ *
+ *  This is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  It is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+/* This timer class is used to manage the single timer required to handle the DCC waveform.
+ *  All timer access comes through this class so that it can be compiled for 
+ *  various hardware CPU types. 
+ *  
+ *  DCCEX works on a single timer interrupt at a regular 58uS interval.
+ *  The DCCWaveform class generates the signals to the motor shield  
+ *  based on this timer. 
+ *  
+ *  If the motor drivers are BOTH configured to use the correct 2 pins for the architecture,
+ *  (see isPWMPin() function. )
+ *  then this allows us to use a hardware driven pin switching arrangement which is
+ *  achieved by setting the duty cycle of the NEXT clock interrupt to 0% or 100% depending on 
+ *  the required pin state. (see setPWM())  
+ *  This is more accurate than the software interrupt but at the expense of 
+ *  limiting the choice of available pins. 
+ *  Fortunately, a standard motor shield on a Mega uses pins that qualify for PWM... 
+ *  Other shields may be jumpered to PWM pins or run directly using the software interrupt.
+ *  
+ *  Because the PWM-based waveform is effectively set half a cycle after the software version,
+ *  it is not acceptable to drive the two tracks on different methiods or it would cause
+ *  problems for <1 JOIN> etc.
+ *  
+ */
+
+#include "DCCTimer.h"
+const int DCC_SIGNAL_TIME=58;  // this is the 58uS DCC 1-bit waveform half-cycle 
+const long CLOCK_CYCLES=(F_CPU / 1000000 * DCC_SIGNAL_TIME) >>1;
+
+INTERRUPT_CALLBACK interruptHandler=0;
+
+#ifdef ARDUINO_ARCH_MEGAAVR
+  // Arduino unoWifi Rev2 and nanoEvery architectire 
+  
+  void DCCTimer::begin(INTERRUPT_CALLBACK callback) {
+    interruptHandler=callback;
+    noInterrupts(); 
+    ADC0.CTRLC = (ADC0.CTRLC & 0b00110000) | 0b01000011;  // speed up analogRead sample time   
+    TCB0.CTRLB = TCB_CNTMODE_INT_gc & ~TCB_CCMPEN_bm; // timer compare mode with output disabled
+    TCB0.CTRLA = TCB_CLKSEL_CLKDIV2_gc; //   8 MHz ~ 0.125 us      
+    TCB0.CCMP =  CLOCK_CYCLES -1;  // 1 tick less for timer reset
+    TCB0.INTFLAGS = TCB_CAPT_bm; // clear interrupt request flag
+    TCB0.INTCTRL = TCB_CAPT_bm;  // Enable the interrupt
+    TCB0.CNT = 0;
+    TCB0.CTRLA |= TCB_ENABLE_bm;  // start
+    interrupts();
+  }
+
+  // ISR called by timer interrupt every 58uS
+  ISR(TCB0_INT_vect){
+    TCB0.INTFLAGS = TCB_CAPT_bm;
+    interruptHandler();
+  }
+
+  bool DCCTimer::isPWMPin(byte pin) {
+       (void) pin; 
+       return false;  // TODO what are the relevant pins? 
+  }
+
+ void DCCTimer::setPWM(byte pin, bool high) {
+    (void) pin;
+    (void) high;
+    // TODO what are the relevant pins?
+ }
+
+  void   DCCTimer::getSimulatedMacAddress(byte mac[6]) {
+    memcpy(mac,(void *) &SIGROW.SERNUM0,6);  // serial number
+    mac[0] &= 0xFE;
+    mac[0] |= 0x02;
+  }
+
+#elif defined(TEENSYDUINO)
+  IntervalTimer myDCCTimer;
+
+  void DCCTimer::begin(INTERRUPT_CALLBACK callback) {
+    interruptHandler=callback;
+
+  myDCCTimer.begin(interruptHandler, DCC_SIGNAL_TIME);
+
+  }
+
+  bool DCCTimer::isPWMPin(byte pin) {
+       //Teensy: digitalPinHasPWM, todo
+      (void) pin;
+       return false;  // TODO what are the relevant pins? 
+  }
+
+ void DCCTimer::setPWM(byte pin, bool high) {
+    // TODO what are the relevant pins?
+    (void) pin;
+    (void) high;
+}
+
+  void   DCCTimer::getSimulatedMacAddress(byte mac[6]) {
+#if defined(__IMXRT1062__)  //Teensy 4.0 and Teensy 4.1
+    uint32_t m1 = HW_OCOTP_MAC1;
+    uint32_t m2 = HW_OCOTP_MAC0;
+    mac[0] = m1 >> 8;
+    mac[1] = m1 >> 0;
+    mac[2] = m2 >> 24;
+    mac[3] = m2 >> 16;
+    mac[4] = m2 >> 8;
+    mac[5] = m2 >> 0;
+#else
+    read_mac(mac);
+#endif
+  }
+
+#if !defined(__IMXRT1062__)
+  void DCCTimer::read_mac(byte mac[6]) {
+    read(0xe,mac,0);
+    read(0xf,mac,3);
+  }
+
+// http://forum.pjrc.com/threads/91-teensy-3-MAC-address
+void DCCTimer::read(uint8_t word, uint8_t *mac, uint8_t offset) {
+  FTFL_FCCOB0 = 0x41;             // Selects the READONCE command
+  FTFL_FCCOB1 = word;             // read the given word of read once area
+
+  // launch command and wait until complete
+  FTFL_FSTAT = FTFL_FSTAT_CCIF;
+  while(!(FTFL_FSTAT & FTFL_FSTAT_CCIF));
+
+  *(mac+offset) =   FTFL_FCCOB5;       // collect only the top three bytes,
+  *(mac+offset+1) = FTFL_FCCOB6;       // in the right orientation (big endian).
+  *(mac+offset+2) = FTFL_FCCOB7;       // Skip FTFL_FCCOB4 as it's always 0.
+}
+#endif
+
+#else 
+  // Arduino nano, uno, mega etc
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+    #define TIMER1_A_PIN   11
+    #define TIMER1_B_PIN   12
+    #define TIMER1_C_PIN   13
+#else
+   #define TIMER1_A_PIN   9
+   #define TIMER1_B_PIN   10
+#endif
+
+  void DCCTimer::begin(INTERRUPT_CALLBACK callback) {
+    interruptHandler=callback;
+    noInterrupts();          
+    ADCSRA = (ADCSRA & 0b11111000) | 0b00000100;   // speed up analogRead sample time 
+    TCCR1A = 0;
+    ICR1 = CLOCK_CYCLES;
+    TCNT1 = 0;   
+    TCCR1B = _BV(WGM13) | _BV(CS10);     // Mode 8, clock select 1
+    TIMSK1 = _BV(TOIE1); // Enable Software interrupt
+    interrupts();
+  }
+
+// ISR called by timer interrupt every 58uS
+  ISR(TIMER1_OVF_vect){ interruptHandler(); }
+
+// Alternative pin manipulation via PWM control.
+  bool DCCTimer::isPWMPin(byte pin) {
+       return pin==TIMER1_A_PIN 
+           || pin==TIMER1_B_PIN
+       #ifdef TIMER1_C_PIN 
+           || pin==TIMER1_C_PIN
+       #endif       
+       ;
+  }
+
+ void DCCTimer::setPWM(byte pin, bool high) {
+    if (pin==TIMER1_A_PIN) {
+      TCCR1A |= _BV(COM1A1);
+      OCR1A= high?1024:0;
+    }
+    else if (pin==TIMER1_B_PIN) { 
+      TCCR1A |= _BV(COM1B1);
+      OCR1B= high?1024:0;
+    }
+ #ifdef TIMER1_C_PIN 
+    else if (pin==TIMER1_C_PIN) { 
+      TCCR1A |= _BV(COM1C1);
+      OCR1C= high?1024:0;
+    }
+ #endif       
+ }
+
+
+  #include <avr/boot.h> 
+  void DCCTimer::getSimulatedMacAddress(byte mac[6]) {
+    for (byte i=0; i<6; i++) {
+      mac[i]=boot_signature_byte_get(0x0E + i);
+    }
+    mac[0] &= 0xFE;
+    mac[0] |= 0x02;
+
+  }
+
+#endif

DCCTimer.h

@@ -1,9 +1,6 @@
 /*
- *  © 2022 Paul M Antoine
- *  © 2021 Mike S
- *  © 2021 Harald Barth
- *  © 2021 Fred Decker
- *  All rights reserved.
+ *  (c) 2021 Mike S. All rights reserved.
+ *  (c) 2021 Fred Decker.  All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
@@ -21,34 +18,6 @@
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/* There are several different implementations of this class which the compiler will select 
-   according to the hardware.
-   */
-
-/* This timer class is used to manage the single timer required to handle the DCC waveform.
- *  All timer access comes through this class so that it can be compiled for 
- *  various hardware CPU types. 
- *  
- *  DCCEX works on a single timer interrupt at a regular 58uS interval.
- *  The DCCWaveform class generates the signals to the motor shield  
- *  based on this timer. 
- *  
- *  If the motor drivers are BOTH configured to use the correct 2 pins for the architecture,
- *  (see isPWMPin() function. )
- *  then this allows us to use a hardware driven pin switching arrangement which is
- *  achieved by setting the duty cycle of the NEXT clock interrupt to 0% or 100% depending on 
- *  the required pin state. (see setPWM())  
- *  This is more accurate than the software interrupt but at the expense of 
- *  limiting the choice of available pins. 
- *  Fortunately, a standard motor shield on a Mega uses pins that qualify for PWM... 
- *  Other shields may be jumpered to PWM pins or run directly using the software interrupt.
- *  
- *  Because the PWM-based waveform is effectively set half a cycle after the software version,
- *  it is not acceptable to drive the two tracks on different methiods or it would cause
- *  problems for <1 JOIN> etc.
- *  
- */
-
 #ifndef DCCTimer_h
 #define DCCTimer_h
 #include "Arduino.h"
@@ -61,36 +30,11 @@ class DCCTimer {
   static void getSimulatedMacAddress(byte mac[6]);
   static bool isPWMPin(byte pin);
   static void setPWM(byte pin, bool high);
-  static void clearPWM();
-// Update low ram level.  Allow for extra bytes to be specified
-// by estimation or inspection, that may be used by other 
-// called subroutines.  Must be called with interrupts disabled.
-// 
-// Although __brkval may go up and down as heap memory is allocated
-// and freed, this function records only the worst case encountered.
-// So even if all of the heap is freed, the reported minimum free 
-// memory will not increase.
-//
-  static void inline updateMinimumFreeMemoryISR(unsigned char extraBytes=0)
-    __attribute__((always_inline)) {
-    int spare = freeMemory()-extraBytes;
-    if (spare < 0) spare = 0;
-    if (spare < minimum_free_memory) minimum_free_memory = spare;
-  };
-
-  static int  getMinimumFreeMemory();
-  static void reset();
-  
-private:
-  static int freeMemory();
-  static volatile int minimum_free_memory;
-  static const int DCC_SIGNAL_TIME=58;  // this is the 58uS DCC 1-bit waveform half-cycle 
-#if defined(ARDUINO_ARCH_STM32)  // TODO: PMA temporary hack - assumes 100Mhz F_CPU as STM32 can change frequency
-  static const long CLOCK_CYCLES=(100000000L / 1000000 * DCC_SIGNAL_TIME) >>1;
-#else
-  static const long CLOCK_CYCLES=(F_CPU / 1000000 * DCC_SIGNAL_TIME) >>1;
+#if (defined(TEENSYDUINO) && !defined(__IMXRT1062__))
+  static void read_mac(byte mac[6]);
+  static void read(uint8_t word, uint8_t *mac, uint8_t offset);
 #endif
-
+  private:
 };
 
 #endif

DCCTimerAVR.cpp

@@ -1,123 +0,0 @@
-/*
- *  © 2021 Mike S
- *  © 2021 Harald Barth
- *  © 2021 Fred Decker
- *  © 2021 Chris Harlow
- *  © 2021 David Cutting
- *  All rights reserved.
- *  
- *  This file is part of Asbelos DCC API
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-// ATTENTION: this file only compiles on a UNO or MEGA
-// Please refer to DCCTimer.h for general comments about how this class works
-// This is to avoid repetition and duplication.
-#ifdef ARDUINO_ARCH_AVR
-
-#include <avr/boot.h> 
-#include <avr/wdt.h>
-#include "DCCTimer.h"
-INTERRUPT_CALLBACK interruptHandler=0;
-
-  // Arduino nano, uno, mega etc
-#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-    #define TIMER1_A_PIN   11
-    #define TIMER1_B_PIN   12
-    #define TIMER1_C_PIN   13
-#else
-   #define TIMER1_A_PIN   9
-   #define TIMER1_B_PIN   10
-#endif
-
-void DCCTimer::begin(INTERRUPT_CALLBACK callback) {
-    interruptHandler=callback;
-    noInterrupts();          
-    ADCSRA = (ADCSRA & 0b11111000) | 0b00000100;   // speed up analogRead sample time 
-    TCCR1A = 0;
-    ICR1 = CLOCK_CYCLES;
-    TCNT1 = 0;   
-    TCCR1B = _BV(WGM13) | _BV(CS10);     // Mode 8, clock select 1
-    TIMSK1 = _BV(TOIE1); // Enable Software interrupt
-    interrupts();
-  }
-
-// ISR called by timer interrupt every 58uS
-  ISR(TIMER1_OVF_vect){ interruptHandler(); }
-
-// Alternative pin manipulation via PWM control.
-  bool DCCTimer::isPWMPin(byte pin) {
-       return pin==TIMER1_A_PIN 
-           || pin==TIMER1_B_PIN
-       #ifdef TIMER1_C_PIN 
-           || pin==TIMER1_C_PIN
-       #endif       
-       ;
-  }
-
- void DCCTimer::setPWM(byte pin, bool high) {
-    if (pin==TIMER1_A_PIN) {
-      TCCR1A |= _BV(COM1A1);
-      OCR1A= high?1024:0;
-    }
-    else if (pin==TIMER1_B_PIN) { 
-      TCCR1A |= _BV(COM1B1);
-      OCR1B= high?1024:0;
-    }
- #ifdef TIMER1_C_PIN 
-    else if (pin==TIMER1_C_PIN) { 
-      TCCR1A |= _BV(COM1C1);
-      OCR1C= high?1024:0;
-    }
- #endif       
- }
-
-void DCCTimer::clearPWM() {
-  TCCR1A= 0;
-}
-
-  void DCCTimer::getSimulatedMacAddress(byte mac[6]) {
-    for (byte i=0; i<6; i++) {
-      mac[i]=boot_signature_byte_get(0x0E + i);
-    }
-    mac[0] &= 0xFE;
-    mac[0] |= 0x02;
-  }
-
-
-volatile int DCCTimer::minimum_free_memory=__INT_MAX__;
-
-// Return low memory value... 
-int DCCTimer::getMinimumFreeMemory() {
-  noInterrupts(); // Disable interrupts to get volatile value 
-  int retval = minimum_free_memory;
-  interrupts();
-  return retval;
-}
-
-extern char *__brkval;
-extern char *__malloc_heap_start;
-
-int DCCTimer::freeMemory() {
-  char top;
-  return __brkval ? &top - __brkval : &top - __malloc_heap_start;
-}
-
-void DCCTimer::reset() {
-  wdt_enable( WDTO_15MS); // set Arduino watchdog timer for 15ms 
-  delay(50);            // wait for the prescaller time to expire
-
-}
-#endif

DCCTimerESP.cpp

@@ -1,137 +0,0 @@
-/*
- *  © 2020-2022 Harald Barth
- *
- *  This file is part of CommandStation-EX
- *  
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-// ATTENTION: this file only compiles on an ESP8266 and ESP32
-// On ESP32 we do not even use the functions but they are here for completeness sake
-// Please refer to DCCTimer.h for general comments about how this class works
-// This is to avoid repetition and duplication.
-
-#ifdef ARDUINO_ARCH_ESP8266
-
-#include "DCCTimer.h"
-INTERRUPT_CALLBACK interruptHandler=0;
-
-void DCCTimer::begin(INTERRUPT_CALLBACK callback) {
-  interruptHandler=callback;
-  timer1_disable();
-
-  // There seem to be differnt ways to attach interrupt handler
-  //    ETS_FRC_TIMER1_INTR_ATTACH(NULL, NULL);
-  //    ETS_FRC_TIMER1_NMI_INTR_ATTACH(interruptHandler);
-  // Let us choose the one from the API
-  timer1_attachInterrupt(interruptHandler);
-
-  // not exactly sure of order:
-  timer1_enable(TIM_DIV1, TIM_EDGE, TIM_LOOP);
-  timer1_write(CLOCK_CYCLES);
-}
-// We do not support to use PWM to make the Waveform on ESP
-bool IRAM_ATTR DCCTimer::isPWMPin(byte pin) {
-  return false;
-}
-void IRAM_ATTR DCCTimer::setPWM(byte pin, bool high) {
-}
-void IRAM_ATTR DCCTimer::clearPWM() {
-}
-
-// Fake this as it should not be used
-void   DCCTimer::getSimulatedMacAddress(byte mac[6]) {
-  mac[0] = 0xFE;
-  mac[1] = 0xBE;
-  mac[2] = 0xEF;
-  mac[3] = 0xC0;
-  mac[4] = 0xFF;
-  mac[5] = 0xEE;
-}
-
-volatile int DCCTimer::minimum_free_memory=__INT_MAX__;
-
-// Return low memory value... 
-int DCCTimer::getMinimumFreeMemory() {
-  noInterrupts(); // Disable interrupts to get volatile value 
-  int retval = minimum_free_memory;
-  interrupts();
-  return retval;
-}
-
-int DCCTimer::freeMemory() {
-  return ESP.getFreeHeap();
-}
-#endif
-
-////////////////////////////////////////////////////////////////////////
-
-#ifdef ARDUINO_ARCH_ESP32
-
-#include "DCCTimer.h"
-INTERRUPT_CALLBACK interruptHandler=0;
-
-// https://www.visualmicro.com/page/Timer-Interrupts-Explained.aspx
-
-portMUX_TYPE timerMux = portMUX_INITIALIZER_UNLOCKED;
-
-void DCCTimer::begin(INTERRUPT_CALLBACK callback) {
-  // This should not be called on ESP32 so disable it
-  return;
-  interruptHandler = callback;
-  hw_timer_t *timer = NULL;
-  timer = timerBegin(0, 2, true); // prescaler can be 2 to 65536 so choose 2
-  timerAttachInterrupt(timer, interruptHandler, true);
-  timerAlarmWrite(timer, CLOCK_CYCLES / 6, true); // divide by prescaler*3 (Clockbase is 80Mhz and not F_CPU 240Mhz)
-  timerAlarmEnable(timer);
-}
-
-// We do not support to use PWM to make the Waveform on ESP
-bool IRAM_ATTR DCCTimer::isPWMPin(byte pin) {
-  return false;
-}
-void IRAM_ATTR DCCTimer::setPWM(byte pin, bool high) {
-}
-void IRAM_ATTR DCCTimer::clearPWM() {
-}
-
-// Fake this as it should not be used
-void   DCCTimer::getSimulatedMacAddress(byte mac[6]) {
-  mac[0] = 0xFE;
-  mac[1] = 0xBE;
-  mac[2] = 0xEF;
-  mac[3] = 0xC0;
-  mac[4] = 0xFF;
-  mac[5] = 0xEE;
-}
-
-volatile int DCCTimer::minimum_free_memory=__INT_MAX__;
-
-// Return low memory value... 
-int DCCTimer::getMinimumFreeMemory() {
-  noInterrupts(); // Disable interrupts to get volatile value 
-  int retval = minimum_free_memory;
-  interrupts();
-  return retval;
-}
-
-int DCCTimer::freeMemory() {
-  return ESP.getFreeHeap();
-}
-
-void DCCTimer::reset() {
-   ESP.restart();
-}
-#endif
-

DCCTimerMEGAAVR.cpp

@@ -1,128 +0,0 @@
-/*
- *  © 2021 Mike S
- *  © 2021 Harald Barth
- *  © 2021 Fred Decker
- *  © 2021 Chris Harlow
- *  © 2021 David Cutting
- *  All rights reserved.
- *  
- *  This file is part of Asbelos DCC API
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-
-/* This timer class is used to manage the single timer required to handle the DCC waveform.
- *  All timer access comes through this class so that it can be compiled for 
- *  various hardware CPU types. 
- *  
- *  DCCEX works on a single timer interrupt at a regular 58uS interval.
- *  The DCCWaveform class generates the signals to the motor shield  
- *  based on this timer. 
- *  
- *  If the motor drivers are BOTH configured to use the correct 2 pins for the architecture,
- *  (see isPWMPin() function. )
- *  then this allows us to use a hardware driven pin switching arrangement which is
- *  achieved by setting the duty cycle of the NEXT clock interrupt to 0% or 100% depending on 
- *  the required pin state. (see setPWM())  
- *  This is more accurate than the software interrupt but at the expense of 
- *  limiting the choice of available pins. 
- *  Fortunately, a standard motor shield on a Mega uses pins that qualify for PWM... 
- *  Other shields may be jumpered to PWM pins or run directly using the software interrupt.
- *  
- *  Because the PWM-based waveform is effectively set half a cycle after the software version,
- *  it is not acceptable to drive the two tracks on different methiods or it would cause
- *  problems for <1 JOIN> etc.
- *  
- */
-
-// ATTENTION: this file only compiles on a UnoWifiRev3 or NanoEvery
-// Please refer to DCCTimer.h for general comments about how this class works
-// This is to avoid repetition and duplication.
-#ifdef ARDUINO_ARCH_MEGAAVR
-
-#include "DCCTimer.h"
-
-INTERRUPT_CALLBACK interruptHandler=0;
-extern char *__brkval;
-extern char *__malloc_heap_start;
-
-  
-  void DCCTimer::begin(INTERRUPT_CALLBACK callback) {
-    interruptHandler=callback;
-    noInterrupts(); 
-    ADC0.CTRLC = (ADC0.CTRLC & 0b00110000) | 0b01000011;  // speed up analogRead sample time   
-    TCB0.CTRLB = TCB_CNTMODE_INT_gc & ~TCB_CCMPEN_bm; // timer compare mode with output disabled
-    TCB0.CTRLA = TCB_CLKSEL_CLKDIV2_gc; //   8 MHz ~ 0.125 us      
-    TCB0.CCMP =  CLOCK_CYCLES -1;  // 1 tick less for timer reset
-    TCB0.INTFLAGS = TCB_CAPT_bm; // clear interrupt request flag
-    TCB0.INTCTRL = TCB_CAPT_bm;  // Enable the interrupt
-    TCB0.CNT = 0;
-    TCB0.CTRLA |= TCB_ENABLE_bm;  // start
-    interrupts();
-  }
-
-  // ISR called by timer interrupt every 58uS
-  ISR(TCB0_INT_vect){
-    TCB0.INTFLAGS = TCB_CAPT_bm; // Clear interrupt request flag
-    interruptHandler();
-  }
-
-  bool DCCTimer::isPWMPin(byte pin) {
-       (void) pin; 
-       return false;  // TODO what are the relevant pins? 
-  }
-
- void DCCTimer::setPWM(byte pin, bool high) {
-    (void) pin;
-    (void) high;
-    // TODO what are the relevant pins?
- }
-
-void DCCTimer::clearPWM() {
-    // Do nothing unless we implent HA
-}
-
-  void   DCCTimer::getSimulatedMacAddress(byte mac[6]) {
-    memcpy(mac,(void *) &SIGROW.SERNUM0,6);  // serial number
-    mac[0] &= 0xFE;
-    mac[0] |= 0x02;
-  }
-
-volatile int DCCTimer::minimum_free_memory=__INT_MAX__;
-
-// Return low memory value... 
-int DCCTimer::getMinimumFreeMemory() {
-  noInterrupts(); // Disable interrupts to get volatile value 
-  int retval = minimum_free_memory;
-  interrupts();
-  return retval;
-}
-
-extern char *__brkval;
-extern char *__malloc_heap_start;
-
-int DCCTimer::freeMemory() {
-  char top;
-  return __brkval ? &top - __brkval : &top - __malloc_heap_start;
-}
-
-void DCCTimer::reset() {
-  CPU_CCP=0xD8;
-  WDT.CTRLA=0x4;
-  while(true){}
-}
-
-
-#endif

DCCTimerSAMD.cpp

@@ -1,176 +0,0 @@
-/*
- *  © 2022 Paul M Antoine
- *  © 2021 Mike S
- *  © 2021 Harald Barth
- *  © 2021 Fred Decker
- *  © 2021 Chris Harlow
- *  © 2021 David Cutting
- *  All rights reserved.
- *  
- *  This file is part of Asbelos DCC API
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-// ATTENTION: this file only compiles on a SAMD21 based board
-// Please refer to DCCTimer.h for general comments about how this class works
-// This is to avoid repetition and duplication.
-#ifdef ARDUINO_ARCH_SAMD
-
-#include "FSH.h" //PMA temp debug
-#include "DIAG.h" //PMA temp debug
-#include "DCCTimer.h"
-
-INTERRUPT_CALLBACK interruptHandler=0;
-
-void DCCTimer::begin(INTERRUPT_CALLBACK callback) {
-  interruptHandler=callback;
-  noInterrupts();
-
-  // Set up ADC to do faster reads... default for Arduino Zero platform configs is 436uS,
-  // and we need sub-100uS. This code sets it to a read speed of around 21uS, and for now
-  // enables 10-bit mode, although 12-bit is possible
-  ADC->CTRLA.bit.ENABLE = 0;              // disable ADC
-  while( ADC->STATUS.bit.SYNCBUSY == 1 ); // wait for synchronization
-
-  ADC->CTRLB.reg &= 0b1111100011111111;          // mask PRESCALER bits
-  ADC->CTRLB.reg |= ADC_CTRLB_PRESCALER_DIV64 |  // divide Clock by 64
-                    ADC_CTRLB_RESSEL_10BIT;      // Result on 10 bits default, 12 bits possible
-
-  ADC->AVGCTRL.reg = ADC_AVGCTRL_SAMPLENUM_1 |   // take 1 sample at a time
-                     ADC_AVGCTRL_ADJRES(0x00ul); // adjusting result by 0
-  ADC->SAMPCTRL.reg = 0x00;                      // sampling Time Length = 0
-
-  ADC->CTRLA.bit.ENABLE = 1;                     // enable ADC
-  while(ADC->STATUS.bit.SYNCBUSY == 1);          // wait for synchronization
-
-  // Timer setup - setup clock sources first
-  REG_GCLK_GENDIV =   GCLK_GENDIV_DIV(1) |            // Divide 48MHz by 1
-                      GCLK_GENDIV_ID(4);              // Apply to GCLK4
-  while (GCLK->STATUS.bit.SYNCBUSY);                  // Wait for synchronization
-                
-  REG_GCLK_GENCTRL =  GCLK_GENCTRL_GENEN |            // Enable GCLK
-                      GCLK_GENCTRL_SRC_DFLL48M |      // Set the 48MHz clock source
-                      GCLK_GENCTRL_ID(4);             // Select GCLK4
-  while (GCLK->STATUS.bit.SYNCBUSY);                  // Wait for synchronization
-            
-  REG_GCLK_CLKCTRL =  GCLK_CLKCTRL_CLKEN |            // Enable generic clock
-                      4 << GCLK_CLKCTRL_GEN_Pos |     // Apply to GCLK4
-                      GCLK_CLKCTRL_ID_TCC0_TCC1;      // Feed GCLK to TCC0/1
-  while (GCLK->STATUS.bit.SYNCBUSY);
-
-  // Assume we're using TCC0... as we're bit-bashing the DCC waveform output pins anyway
-  // for "normal accuracy" DCC waveform generation. For high accuracy we're going to need
-  // to a good deal more. The TCC waveform output pins are mux'd on the SAMD, and output
-  // pins for each TCC are only available on certain pins
-  TCC0->WAVE.reg = TCC_WAVE_WAVEGEN_NPWM;     // Select NPWM as waveform
-  while (TCC0->SYNCBUSY.bit.WAVE);            // Wait for sync
-
-  // Set the frequency
-  TCC0->CTRLA.reg |= TCC_CTRLA_PRESCALER(TCC_CTRLA_PRESCALER_DIV1_Val);
-  TCC0->PER.reg = CLOCK_CYCLES * 2;
-  while (TCC0->SYNCBUSY.bit.PER);
-
-  // Start the timer
-  TCC0->CTRLA.bit.ENABLE = 1;
-  while (TCC0->SYNCBUSY.bit.ENABLE);
-
-  // Set the interrupt condition, priority and enable it in the NVIC
-  TCC0->INTENSET.reg = TCC_INTENSET_OVF;      // Only interrupt on overflow
-  NVIC_SetPriority((IRQn_Type)TCC0_IRQn, 0);  // Make this highest priority
-  NVIC_EnableIRQ((IRQn_Type)TCC0_IRQn);       // Enable the interrupt
-  interrupts();
-}
-
-// Timer IRQ handlers replace the dummy handlers (in cortex_handlers)
-// copied from rf24 branch
-void TCC0_Handler() {
-    if(TCC0->INTFLAG.bit.OVF) {
-        TCC0->INTFLAG.bit.OVF = 1; // writing a 1 clears the flag
-        interruptHandler();
-    }
-}
-
-void TCC1_Handler() {
-    if(TCC1->INTFLAG.bit.OVF) {
-        TCC1->INTFLAG.bit.OVF = 1; // writing a 1 clears the flag
-        interruptHandler();
-    }
-}
-
-void TCC2_Handler() {
-    if(TCC2->INTFLAG.bit.OVF) {
-        TCC2->INTFLAG.bit.OVF = 1; // writing a 1 clears the flag
-        interruptHandler();
-    }
-}
-
-
-bool DCCTimer::isPWMPin(byte pin) {
-  //TODO: SAMD whilst this call to digitalPinHasPWM will reveal which pins can do PWM,
-  //      there's no support yet for High Accuracy, so for now return false
-  //  return digitalPinHasPWM(pin);
-  return false;
-}
-
-void DCCTimer::setPWM(byte pin, bool high) {
-    // TODO: High Accuracy mode is not supported as yet, and may never need to be
-    (void) pin;
-    (void) high;
-}
-
-void DCCTimer::clearPWM() {
-  return;
-}
-
-void   DCCTimer::getSimulatedMacAddress(byte mac[6]) {
-  volatile uint32_t *serno1 = (volatile uint32_t *)0x0080A00C;
-  volatile uint32_t *serno2 = (volatile uint32_t *)0x0080A040;
-//  volatile uint32_t *serno3 = (volatile uint32_t *)0x0080A044;
-//  volatile uint32_t *serno4 = (volatile uint32_t *)0x0080A048;
-
-  volatile uint32_t m1 = *serno1;
-  volatile uint32_t m2 = *serno2;
-  mac[0] = m1 >> 8;
-  mac[1] = m1 >> 0;
-  mac[2] = m2 >> 24;
-  mac[3] = m2 >> 16;
-  mac[4] = m2 >> 8;
-  mac[5] = m2 >> 0;
-}
-
-volatile int DCCTimer::minimum_free_memory=__INT_MAX__;
-
-// Return low memory value... 
-int DCCTimer::getMinimumFreeMemory() {
-  noInterrupts(); // Disable interrupts to get volatile value 
-  int retval = freeMemory();
-  interrupts();
-  return retval;
-}
-
-extern "C" char* sbrk(int incr);
-
-int DCCTimer::freeMemory() {
-  char top;
-  return (int)(&top - reinterpret_cast<char *>(sbrk(0)));
-}
-
-void DCCTimer::reset() {
-   __disable_irq();
-    NVIC_SystemReset();
-    while(true) {};
-}
-
-#endif

DCCTimerSTM32.cpp

@@ -1,130 +0,0 @@
-/*
- *  © 2022 Paul M Antoine
- *  © 2021 Mike S
- *  © 2021 Harald Barth
- *  © 2021 Fred Decker
- *  © 2021 Chris Harlow
- *  © 2021 David Cutting
- *  All rights reserved.
- *  
- *  This file is part of Asbelos DCC API
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-// ATTENTION: this file only compiles on a STM32 based boards
-// Please refer to DCCTimer.h for general comments about how this class works
-// This is to avoid repetition and duplication.
-#ifdef ARDUINO_ARCH_STM32
-
-#include "FSH.h" //PMA temp debug
-#include "DIAG.h" //PMA temp debug
-#include "DCCTimer.h"
-
-#define STM32F411RE   // PMA - ideally this ought to be derived from within the STM32 support somehow
-
-#if defined(STM32F411RE)
-// STM32F411RE doesn't have Serial1 defined by default
-HardwareSerial Serial1(PB7, PA15);  // Rx=PB7, Tx=PA15 -- CN7 pins 17 and 21 - F411RE
-#elif defined(STM32F446ZE)
-// STM32F446ZE doesn't have Serial1 defined by default
-HardwareSerial Serial1(PG9, PG14);  // Rx=PG9, Tx=PG14 -- D0, D1 - F446ZE
-#else
-#warning Serial1 not defined
-#endif
-
-INTERRUPT_CALLBACK interruptHandler=0;
-// Let's use STM32's timer #11 until disabused of this notion
-// Timer #11 is used for "servo" library, but as DCC-EX is not using
-// this libary, we should be free and clear.
-HardwareTimer timer(TIM11);
-
-// Timer IRQ handler
-void Timer11_Handler() {
-  interruptHandler();
-}
-
-void DCCTimer::begin(INTERRUPT_CALLBACK callback) {
-  interruptHandler=callback;
-  noInterrupts();
-
-  // adc_set_sample_rate(ADC_SAMPLETIME_480CYCLES);
-  timer.pause();
-  timer.setPrescaleFactor(1);
-//  timer.setOverflow(CLOCK_CYCLES * 2);
-  timer.setOverflow(DCC_SIGNAL_TIME, MICROSEC_FORMAT);
-  timer.attachInterrupt(Timer11_Handler);
-  timer.refresh();
-  timer.resume();
-
-  interrupts();
-}
-
-bool DCCTimer::isPWMPin(byte pin) {
-  //TODO: SAMD whilst this call to digitalPinHasPWM will reveal which pins can do PWM,
-  //      there's no support yet for High Accuracy, so for now return false
-  //  return digitalPinHasPWM(pin);
-  return false;
-}
-
-void DCCTimer::setPWM(byte pin, bool high) {
-    // TODO: High Accuracy mode is not supported as yet, and may never need to be
-    (void) pin;
-    (void) high;
-}
-
-void DCCTimer::clearPWM() {
-  return;
-}
-
-void   DCCTimer::getSimulatedMacAddress(byte mac[6]) {
-  volatile uint32_t *serno1 = (volatile uint32_t *)0x0080A00C;
-  volatile uint32_t *serno2 = (volatile uint32_t *)0x0080A040;
-//  volatile uint32_t *serno3 = (volatile uint32_t *)0x0080A044;
-//  volatile uint32_t *serno4 = (volatile uint32_t *)0x0080A048;
-
-  volatile uint32_t m1 = *serno1;
-  volatile uint32_t m2 = *serno2;
-  mac[0] = m1 >> 8;
-  mac[1] = m1 >> 0;
-  mac[2] = m2 >> 24;
-  mac[3] = m2 >> 16;
-  mac[4] = m2 >> 8;
-  mac[5] = m2 >> 0;
-}
-
-volatile int DCCTimer::minimum_free_memory=__INT_MAX__;
-
-// Return low memory value... 
-int DCCTimer::getMinimumFreeMemory() {
-  noInterrupts(); // Disable interrupts to get volatile value 
-  int retval = freeMemory();
-  interrupts();
-  return retval;
-}
-
-extern "C" char* sbrk(int incr);
-
-int DCCTimer::freeMemory() {
-  char top;
-  return (int)(&top - reinterpret_cast<char *>(sbrk(0)));
-}
-
-void DCCTimer::reset() {
-   __disable_irq();
-    NVIC_SystemReset();
-    while(true) {};
-}
-
-#endif

DCCTimerTEENSY.cpp

@@ -1,144 +0,0 @@
-/*
- *  © 2022 Paul M Antoine
- *  © 2021 Mike S
- *  © 2021 Harald Barth
- *  © 2021 Fred Decker
- *  © 2021 Chris Harlow
- *  © 2021 David Cutting
- *  All rights reserved.
- *  
- *  This file is part of Asbelos DCC API
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-// ATTENTION: this file only compiles on a TEENSY
-// Please refer to DCCTimer.h for general comments about how this class works
-// This is to avoid repetition and duplication.
-#ifdef TEENSYDUINO
-
-#include "DCCTimer.h"
-
-INTERRUPT_CALLBACK interruptHandler=0;
-
-IntervalTimer myDCCTimer;
-
-void DCCTimer::begin(INTERRUPT_CALLBACK callback) {
-  interruptHandler=callback;
-  myDCCTimer.begin(interruptHandler, DCC_SIGNAL_TIME);
-  }
-
-bool DCCTimer::isPWMPin(byte pin) {
-       //Teensy: digitalPinHasPWM, todo
-      (void) pin;
-       return false;  // TODO what are the relevant pins? 
-  }
-
-void DCCTimer::setPWM(byte pin, bool high) {
-    // TODO what are the relevant pins?
-    (void) pin;
-    (void) high;
-}
-
-void DCCTimer::clearPWM() {
-    // Do nothing unless we implent HA
-}
-
-#if defined(__IMXRT1062__)  //Teensy 4.0 and Teensy 4.1
-void   DCCTimer::getSimulatedMacAddress(byte mac[6]) {
-    uint32_t m1 = HW_OCOTP_MAC1;
-    uint32_t m2 = HW_OCOTP_MAC0;
-    mac[0] = m1 >> 8;
-    mac[1] = m1 >> 0;
-    mac[2] = m2 >> 24;
-    mac[3] = m2 >> 16;
-    mac[4] = m2 >> 8;
-    mac[5] = m2 >> 0;
-  }
-
-#else
-
-// http://forum.pjrc.com/threads/91-teensy-3-MAC-address
-void teensyRead(uint8_t word, uint8_t *mac, uint8_t offset) {
-  FTFL_FCCOB0 = 0x41;             // Selects the READONCE command
-  FTFL_FCCOB1 = word;             // read the given word of read once area
-
-  // launch command and wait until complete
-  FTFL_FSTAT = FTFL_FSTAT_CCIF;
-  while(!(FTFL_FSTAT & FTFL_FSTAT_CCIF));
-
-  *(mac+offset) =   FTFL_FCCOB5;       // collect only the top three bytes,
-  *(mac+offset+1) = FTFL_FCCOB6;       // in the right orientation (big endian).
-  *(mac+offset+2) = FTFL_FCCOB7;       // Skip FTFL_FCCOB4 as it's always 0.
-}
-
-void   DCCTimer::getSimulatedMacAddress(byte mac[6]) {
-    teensyRead(0xe,mac,0);
-    teensyRead(0xf,mac,3);
-  }
-#endif 
-
-volatile int DCCTimer::minimum_free_memory=__INT_MAX__;
-
-// Return low memory value... 
-int DCCTimer::getMinimumFreeMemory() {
-  noInterrupts(); // Disable interrupts to get volatile value 
-  int retval = freeMemory();
-  interrupts();
-  return retval;
-}
-
-extern "C" char* sbrk(int incr);
-
-#if !defined(__IMXRT1062__)
-int DCCTimer::freeMemory() {
-  char top;
-  return &top - reinterpret_cast<char*>(sbrk(0));
-}
-
-#else
-#if defined(ARDUINO_TEENSY40)
-  static const unsigned DTCM_START = 0x20000000UL;
-  static const unsigned OCRAM_START = 0x20200000UL;
-  static const unsigned OCRAM_SIZE = 512;
-  static const unsigned FLASH_SIZE = 1984;
-#elif defined(ARDUINO_TEENSY41)
-  static const unsigned DTCM_START = 0x20000000UL;
-  static const unsigned OCRAM_START = 0x20200000UL;
-  static const unsigned OCRAM_SIZE = 512;
-  static const unsigned FLASH_SIZE = 7936;
-#if TEENSYDUINO>151
-  extern "C" uint8_t external_psram_size;
-#endif
-#endif
-
-int DCCTimer::freeMemory() {
-  extern unsigned long _ebss;
-  extern unsigned long _sdata;
-  extern unsigned long _estack;
-  const unsigned DTCM_START = 0x20000000UL;
-  unsigned dtcm = (unsigned)&_estack - DTCM_START;
-  unsigned stackinuse = (unsigned) &_estack -  (unsigned) __builtin_frame_address(0);
-  unsigned varsinuse = (unsigned)&_ebss - (unsigned)&_sdata;
-  unsigned freemem = dtcm - (stackinuse + varsinuse);
-  return freemem;
-}
-
-#endif
-void DCCTimer::reset() {
-  // found at https://forum.pjrc.com/threads/59935-Reboot-Teensy-programmatically
-  SCB_AIRCR = 0x05FA0004;
-}
-
-#endif

DCCWaveform.cpp

@@ -1,12 +1,8 @@
 /*
- *  © 2021 Neil McKechnie
- *  © 2021 Mike S
- *  © 2021 Fred Decker
- *  © 2020-2022 Harald Barth
- *  © 2020-2021 Chris Harlow
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2020, Harald Barth.
  *  
- *  This file is part of CommandStation-EX
+ *  This file is part of Asbelos DCC API
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,65 +17,56 @@
  *  You should have received a copy of the GNU General Public License
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef ARDUINO_ARCH_ESP32
-  // This code is replaced entirely on an ESP32
+ #pragma GCC optimize ("-O3")
 #include <Arduino.h>
 
 #include "DCCWaveform.h"
-#include "TrackManager.h"
 #include "DCCTimer.h"
-#include "DCCACK.h"
 #include "DIAG.h"
-
+#include "freeMemory.h"
 
 DCCWaveform  DCCWaveform::mainTrack(PREAMBLE_BITS_MAIN, true);
 DCCWaveform  DCCWaveform::progTrack(PREAMBLE_BITS_PROG, false);
 
+bool DCCWaveform::progTrackSyncMain=false; 
+bool DCCWaveform::progTrackBoosted=false; 
+int  DCCWaveform::progTripValue=0;
+volatile uint8_t DCCWaveform::numAckGaps=0;
+volatile uint8_t DCCWaveform::numAckSamples=0;
+uint8_t DCCWaveform::trailingEdgeCounter=0;
 
-// This bitmask has 9 entries as each byte is trasmitted as a zero + 8 bits.
-const byte bitMask[] = {0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
-
-const byte idlePacket[] = {0xFF, 0x00, 0xFF};
-const byte resetPacket[] = {0x00, 0x00, 0x00};
-
-
-// For each state of the wave  nextState=stateTransform[currentState] 
-const WAVE_STATE stateTransform[]={
-   /* WAVE_START   -> */ WAVE_PENDING,
-   /* WAVE_MID_1   -> */ WAVE_START,
-   /* WAVE_HIGH_0  -> */ WAVE_MID_0,
-   /* WAVE_MID_0   -> */ WAVE_LOW_0,
-   /* WAVE_LOW_0   -> */ WAVE_START,
-   /* WAVE_PENDING (should not happen) -> */ WAVE_PENDING};
-
-// For each state of the wave, signal pin is HIGH or LOW   
-const bool signalTransform[]={
-   /* WAVE_START   -> */ HIGH,
-   /* WAVE_MID_1   -> */ LOW,
-   /* WAVE_HIGH_0  -> */ HIGH,
-   /* WAVE_MID_0   -> */ LOW,
-   /* WAVE_LOW_0   -> */ LOW,
-   /* WAVE_PENDING (should not happen) -> */ LOW};
-
-void DCCWaveform::begin() {
+void DCCWaveform::begin(MotorDriver * mainDriver, MotorDriver * progDriver) {
+  mainTrack.motorDriver=mainDriver;
+  progTrack.motorDriver=progDriver;
+  progTripValue = progDriver->mA2raw(TRIP_CURRENT_PROG); // need only calculate once hence static
+  mainTrack.setPowerMode(POWERMODE::OFF);      
+  progTrack.setPowerMode(POWERMODE::OFF);
+  // Fault pin config for odd motor boards (example pololu)
+  MotorDriver::commonFaultPin = ((mainDriver->getFaultPin() == progDriver->getFaultPin())
+				 && (mainDriver->getFaultPin() != UNUSED_PIN));
+  // Only use PWM if both pins are PWM capable. Otherwise JOIN does not work
+  MotorDriver::usePWM= mainDriver->isPWMCapable() && progDriver->isPWMCapable();
+  if (MotorDriver::usePWM)
+    DIAG(F("Signal pin config: high accuracy waveform"));
+  else
+    DIAG(F("Signal pin config: normal accuracy waveform"));
   DCCTimer::begin(DCCWaveform::interruptHandler);     
 }
 
-void DCCWaveform::loop() {
- // empty placemarker in case ESP32 needs something here 
+void DCCWaveform::loop(bool ackManagerActive) {
+  mainTrack.checkPowerOverload(false);
+  progTrack.checkPowerOverload(ackManagerActive);
 }
 
-#pragma GCC push_options
-#pragma GCC optimize ("-O3")
 void DCCWaveform::interruptHandler() {
   // call the timer edge sensitive actions for progtrack and maintrack
   // member functions would be cleaner but have more overhead
   byte sigMain=signalTransform[mainTrack.state];
-  byte sigProg=TrackManager::progTrackSyncMain? sigMain : signalTransform[progTrack.state];
+  byte sigProg=progTrackSyncMain? sigMain : signalTransform[progTrack.state];
   
   // Set the signal state for both tracks
-  TrackManager::setDCCSignal(sigMain);
-  TrackManager::setPROGSignal(sigProg);
+  mainTrack.motorDriver->setSignal(sigMain);
+  progTrack.motorDriver->setSignal(sigProg);
   
   // Move on in the state engine
   mainTrack.state=stateTransform[mainTrack.state];    
@@ -89,10 +76,10 @@ void DCCWaveform::interruptHandler() {
   // WAVE_PENDING means we dont yet know what the next bit is
   if (mainTrack.state==WAVE_PENDING) mainTrack.interrupt2();  
   if (progTrack.state==WAVE_PENDING) progTrack.interrupt2();
-  else DCCACK::checkAck(progTrack.getResets());
+  else if (progTrack.ackPending) progTrack.checkAck();
 
 }
-#pragma GCC pop_options
+
 
 // An instance of this class handles the DCC transmissions for one track. (main or prog)
 // Interrupts are marshalled via the statics.
@@ -100,6 +87,9 @@ void DCCWaveform::interruptHandler() {
 // When the current buffer is exhausted, either the pending buffer (if there is one waiting) or an idle buffer.
 
 
+// This bitmask has 9 entries as each byte is trasmitted as a zero + 8 bits.
+const byte bitMask[] = {0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
+
 
 DCCWaveform::DCCWaveform( byte preambleBits, bool isMain) {
   isMainTrack = isMain;
@@ -111,12 +101,102 @@ DCCWaveform::DCCWaveform( byte preambleBits, bool isMain) {
   requiredPreambles = preambleBits+1;  
   bytes_sent = 0;
   bits_sent = 0;
+  sampleDelay = 0;
+  lastSampleTaken = millis();
+  ackPending=false;
+}
+
+POWERMODE DCCWaveform::getPowerMode() {
+  return powerMode;
+}
+
+void DCCWaveform::setPowerMode(POWERMODE mode) {
+  powerMode = mode;
+  bool ison = (mode == POWERMODE::ON);
+  motorDriver->setPower( ison);
 }
 
 
+void DCCWaveform::checkPowerOverload(bool ackManagerActive) {
+  if (millis() - lastSampleTaken  < sampleDelay) return;
+  lastSampleTaken = millis();
+  int tripValue= motorDriver->getRawCurrentTripValue();
+  if (!isMainTrack && !ackManagerActive && !progTrackSyncMain && !progTrackBoosted)
+    tripValue=progTripValue;
+  
+  switch (powerMode) {
+    case POWERMODE::OFF:
+      sampleDelay = POWER_SAMPLE_OFF_WAIT;
+      break;
+    case POWERMODE::ON:
+      // Check current
+      lastCurrent=motorDriver->getCurrentRaw();
+      if (lastCurrent < 0) {
+	  // We have a fault pin condition to take care of
+	  lastCurrent = -lastCurrent;
+	  setPowerMode(POWERMODE::OVERLOAD); // Turn off, decide later how fast to turn on again
+	  if (MotorDriver::commonFaultPin) {
+	      if (lastCurrent <= tripValue) {
+		setPowerMode(POWERMODE::ON); // maybe other track
+	      }
+	      // Write this after the fact as we want to turn on as fast as possible
+	      // because we don't know which output actually triggered the fault pin
+	      DIAG(F("*** COMMON FAULT PIN ACTIVE - TOGGLED POWER on %S ***"), isMainTrack ? F("MAIN") : F("PROG"));
+	  } else {
+	      DIAG(F("*** %S FAULT PIN ACTIVE - OVERLOAD ***"), isMainTrack ? F("MAIN") : F("PROG"));
+	      if (lastCurrent < tripValue) {
+		  lastCurrent = tripValue; // exaggerate
+	      }
+	  }
+      }
+      if (lastCurrent < tripValue) {
+        sampleDelay = POWER_SAMPLE_ON_WAIT;
+	if(power_good_counter<100)
+	  power_good_counter++;
+	else
+	  if (power_sample_overload_wait>POWER_SAMPLE_OVERLOAD_WAIT) power_sample_overload_wait=POWER_SAMPLE_OVERLOAD_WAIT;
+      } else {
+        setPowerMode(POWERMODE::OVERLOAD);
+        unsigned int mA=motorDriver->raw2mA(lastCurrent);
+        unsigned int maxmA=motorDriver->raw2mA(tripValue);
+	power_good_counter=0;
+        sampleDelay = power_sample_overload_wait;
+        DIAG(F("*** %S TRACK POWER OVERLOAD current=%d max=%d  offtime=%d ***"), isMainTrack ? F("MAIN") : F("PROG"), mA, maxmA, sampleDelay);
+	if (power_sample_overload_wait >= 10000)
+	    power_sample_overload_wait = 10000;
+	else
+	    power_sample_overload_wait *= 2;
+      }
+      break;
+    case POWERMODE::OVERLOAD:
+      // Try setting it back on after the OVERLOAD_WAIT
+      setPowerMode(POWERMODE::ON);
+      sampleDelay = POWER_SAMPLE_ON_WAIT;
+      // Debug code....
+      DIAG(F("*** %S TRACK POWER RESET delay=%d ***"), isMainTrack ? F("MAIN") : F("PROG"), sampleDelay);
+      break;
+    default:
+      sampleDelay = 999; // cant get here..meaningless statement to avoid compiler warning.
+  }
+}
+// For each state of the wave  nextState=stateTransform[currentState] 
+const WAVE_STATE DCCWaveform::stateTransform[]={
+   /* WAVE_START   -> */ WAVE_PENDING,
+   /* WAVE_MID_1   -> */ WAVE_START,
+   /* WAVE_HIGH_0  -> */ WAVE_MID_0,
+   /* WAVE_MID_0   -> */ WAVE_LOW_0,
+   /* WAVE_LOW_0   -> */ WAVE_START,
+   /* WAVE_PENDING (should not happen) -> */ WAVE_PENDING};
 
-#pragma GCC push_options
-#pragma GCC optimize ("-O3")
+// For each state of the wave, signal pin is HIGH or LOW   
+const bool DCCWaveform::signalTransform[]={
+   /* WAVE_START   -> */ HIGH,
+   /* WAVE_MID_1   -> */ LOW,
+   /* WAVE_HIGH_0  -> */ HIGH,
+   /* WAVE_MID_0   -> */ LOW,
+   /* WAVE_LOW_0   -> */ LOW,
+   /* WAVE_PENDING (should not happen) -> */ LOW};
+        
 void DCCWaveform::interrupt2() {
   // calculate the next bit to be sent:
   // set state WAVE_MID_1  for a 1=bit
@@ -127,7 +207,7 @@ void DCCWaveform::interrupt2() {
     remainingPreambles--;
     // Update free memory diagnostic as we don't have anything else to do this time.
     // Allow for checkAck and its called functions using 22 bytes more.
-    DCCTimer::updateMinimumFreeMemoryISR(22); 
+    updateMinimumFreeMemory(22); 
     return;
   }
 
@@ -160,19 +240,20 @@ void DCCWaveform::interrupt2() {
         transmitLength = pendingLength;
         transmitRepeats = pendingRepeats;
         packetPending = false;
-        clearResets();
+        sentResetsSincePacket=0;
       }
       else {
         // Fortunately reset and idle packets are the same length
         memcpy( transmitPacket, isMainTrack ? idlePacket : resetPacket, sizeof(idlePacket));
         transmitLength = sizeof(idlePacket);
         transmitRepeats = 0;
-        if (getResets() < 250) sentResetsSincePacket++; // only place to increment (private!)
+        if (sentResetsSincePacket<250) sentResetsSincePacket++;
       }
     }
   }  
 }
-#pragma GCC pop_options
+
+
 
 // Wait until there is no packet pending, then make this pending
 void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repeats) {
@@ -189,90 +270,88 @@ void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repea
   pendingLength = byteCount + 1;
   pendingRepeats = repeats;
   packetPending = true;
-  clearResets();
+  sentResetsSincePacket=0;
 }
-bool DCCWaveform::getPacketPending() {
-  return packetPending;
+
+// Operations applicable to PROG track ONLY.
+// (yes I know I could have subclassed the main track but...) 
+
+void DCCWaveform::setAckBaseline() {
+      if (isMainTrack) return;
+      int baseline=motorDriver->getCurrentRaw();
+      ackThreshold= baseline + motorDriver->mA2raw(ackLimitmA);
+      if (Diag::ACK) DIAG(F("ACK baseline=%d/%dmA Threshold=%d/%dmA Duration between %dus and %dus"),
+			  baseline,motorDriver->raw2mA(baseline),
+			  ackThreshold,motorDriver->raw2mA(ackThreshold),
+                          minAckPulseDuration, maxAckPulseDuration);
 }
-#endif
 
-#ifdef ARDUINO_ARCH_ESP32
-#include "DCCWaveform.h"
-#include "DCCACK.h"
-
-DCCWaveform  DCCWaveform::mainTrack(PREAMBLE_BITS_MAIN, true);
-DCCWaveform  DCCWaveform::progTrack(PREAMBLE_BITS_PROG, false);
-RMTChannel *DCCWaveform::rmtMainChannel = NULL;
-RMTChannel *DCCWaveform::rmtProgChannel = NULL;
-
-DCCWaveform::DCCWaveform(byte preambleBits, bool isMain) {
-  isMainTrack = isMain;
-  requiredPreambles = preambleBits;
+void DCCWaveform::setAckPending() {
+      if (isMainTrack) return; 
+      ackMaxCurrent=0;
+      ackPulseStart=0;
+      ackPulseDuration=0;
+      ackDetected=false;
+      ackCheckStart=millis();
+      numAckSamples=0;
+      numAckGaps=0;
+      ackPending=true;  // interrupt routines will now take note
 }
-void DCCWaveform::begin() {
-  for(const auto& md: TrackManager::getMainDrivers()) {
-    pinpair p = md->getSignalPin();
-    if(rmtMainChannel) {
-      //DIAG(F("added pins %d %d to MAIN channel"), p.pin, p.invpin);
-      rmtMainChannel->addPin(p); // add pin to existing main channel
-    } else {
-      //DIAG(F("new MAIN channel with pins %d %d"), p.pin, p.invpin);
-      rmtMainChannel = new RMTChannel(p, true); /* create new main channel */
+
+byte DCCWaveform::getAck() {
+      if (ackPending) return (2);  // still waiting
+      if (Diag::ACK) DIAG(F("%S after %dmS max=%d/%dmA pulse=%duS samples=%d gaps=%d"),ackDetected?F("ACK"):F("NO-ACK"), ackCheckDuration,
+			  ackMaxCurrent,motorDriver->raw2mA(ackMaxCurrent), ackPulseDuration, numAckSamples, numAckGaps);
+      if (ackDetected) return (1); // Yes we had an ack
+      return(0);  // pending set off but not detected means no ACK.   
+}
+
+void DCCWaveform::checkAck() {
+    // This function operates in interrupt() time so must be fast and can't DIAG 
+    if (sentResetsSincePacket > 6) {  //ACK timeout
+        ackCheckDuration=millis()-ackCheckStart;
+        ackPending = false;
+        return; 
     }
-  }
-  MotorDriver *md = TrackManager::getProgDriver();
-  if (md) {
-    pinpair p = md->getSignalPin();
-    if (rmtProgChannel) {
-      //DIAG(F("added pins %d %d to PROG channel"), p.pin, p.invpin);
-      rmtProgChannel->addPin(p); // add pin to existing prog channel
-    } else {
-      //DIAG(F("new PROGchannel with pins %d %d"), p.pin, p.invpin);
-      rmtProgChannel = new RMTChannel(p, false);
+      
+    int current=motorDriver->getCurrentRaw();
+    numAckSamples++;
+    if (current > ackMaxCurrent) ackMaxCurrent=current;
+    // An ACK is a pulse lasting between minAckPulseDuration and maxAckPulseDuration uSecs (refer @haba)
+        
+    if (current>ackThreshold) {
+       if (trailingEdgeCounter > 0) {
+	 numAckGaps++;
+	 trailingEdgeCounter = 0;
+       }
+       if (ackPulseStart==0) ackPulseStart=micros();    // leading edge of pulse detected
+       return;
+    }
+    
+    // not in pulse
+    if (ackPulseStart==0) return; // keep waiting for leading edge 
+    
+    // if we reach to this point, we have
+    // detected trailing edge of pulse
+    if (trailingEdgeCounter == 0) {
+      ackPulseDuration=micros()-ackPulseStart;
     }
-  }
-}
 
-void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repeats) {
-  if (byteCount > MAX_PACKET_SIZE) return; // allow for chksum
-  
-  byte checksum = 0;
-  for (byte b = 0; b < byteCount; b++) {
-    checksum ^= buffer[b];
-    pendingPacket[b] = buffer[b];
-  }
-  // buffer is MAX_PACKET_SIZE but pendingPacket is one bigger
-  pendingPacket[byteCount] = checksum;
-  pendingLength = byteCount + 1;
-  pendingRepeats = repeats;
-  // The resets will be zero not only now but as well repeats packets into the future
-  clearResets(repeats+1);
-  {
-    int ret;
-    do {
-      if(isMainTrack) {
-	if (rmtMainChannel != NULL)
-	  ret = rmtMainChannel->RMTfillData(pendingPacket, pendingLength, pendingRepeats);
-      } else {
-	if (rmtProgChannel != NULL)
-	  ret = rmtProgChannel->RMTfillData(pendingPacket, pendingLength, pendingRepeats);
-      }
-    } while(ret > 0);
-  }
-}
+    // but we do not trust it yet and return (which will force another
+    // measurement) and first the third time around with low current
+    // the ack detection will be finalized. 
+    if (trailingEdgeCounter < 2) {
+      trailingEdgeCounter++;
+      return;
+    }
+    trailingEdgeCounter = 0;
 
-bool DCCWaveform::getPacketPending() {
-  if(isMainTrack) {
-    if (rmtMainChannel == NULL)
-      return true;
-    return rmtMainChannel->busy();
-  } else {
-    if (rmtProgChannel == NULL)
-      return true;
-    return rmtProgChannel->busy();
-  }
+    if (ackPulseDuration>=minAckPulseDuration && ackPulseDuration<=maxAckPulseDuration) {
+        ackCheckDuration=millis()-ackCheckStart;
+        ackDetected=true;
+        ackPending=false;
+        transmitRepeats=0;  // shortcut remaining repeat packets 
+        return;  // we have a genuine ACK result
+    }      
+    ackPulseStart=0;  // We have detected a too-short or too-long pulse so ignore and wait for next leading edge 
 }
-void IRAM_ATTR DCCWaveform::loop() {
-  DCCACK::checkAck(progTrack.getResets());
-}
-#endif

DCCWaveform.h

@@ -1,12 +1,8 @@
 /*
- *  © 2021 M Steve Todd
- *  © 2021 Mike S
- *  © 2021 Fred Decker
- *  © 2020-2021 Harald Barth
- *  © 2020-2021 Chris Harlow
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2020, Harald Barth.
  *  
- *  This file is part of CommandStation-EX
+ *  This file is part of Asbelos DCC API
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -25,70 +21,107 @@
 #define DCCWaveform_h
 
 #include "MotorDriver.h"
-#ifdef ARDUINO_ARCH_ESP32
-#include "DCCRMT.h"
-#include "TrackManager.h"
-#endif
-
 
+// Wait times for power management. Unit: milliseconds
+const int  POWER_SAMPLE_ON_WAIT = 100;
+const int  POWER_SAMPLE_OFF_WAIT = 1000;
+const int  POWER_SAMPLE_OVERLOAD_WAIT = 20;
 
 // Number of preamble bits.
 const int   PREAMBLE_BITS_MAIN = 16;
 const int   PREAMBLE_BITS_PROG = 22;
 const byte   MAX_PACKET_SIZE = 5;  // NMRA standard extended packets, payload size WITHOUT checksum.
 
-
 // The WAVE_STATE enum is deliberately numbered because a change of order would be catastrophic
 // to the transform array.
 enum  WAVE_STATE : byte {WAVE_START=0,WAVE_MID_1=1,WAVE_HIGH_0=2,WAVE_MID_0=3,WAVE_LOW_0=4,WAVE_PENDING=5};
 
+
 // NOTE: static functions are used for the overall controller, then
 // one instance is created for each track.
 
+
+enum class POWERMODE : byte { OFF, ON, OVERLOAD };
+
+const byte idlePacket[] = {0xFF, 0x00, 0xFF};
+const byte resetPacket[] = {0x00, 0x00, 0x00};
+
 class DCCWaveform {
   public:
     DCCWaveform( byte preambleBits, bool isMain);
-    static void begin();
-    static void loop();
+    static void begin(MotorDriver * mainDriver, MotorDriver * progDriver);
+    static void loop(bool ackManagerActive);
     static DCCWaveform  mainTrack;
     static DCCWaveform  progTrack;
-    inline void clearRepeats() { transmitRepeats=0; }
-#ifndef ARDUINO_ARCH_ESP32
-    inline void clearResets() { sentResetsSincePacket=0; }
-    inline byte getResets() { return sentResetsSincePacket; }
-#else
-  // extrafudge is added when we know that the resets will first come extrafudge  packets in the future
-    inline void clearResets(byte extrafudge=0) {
-      if ((isMainTrack ? rmtMainChannel : rmtProgChannel) == NULL) return;
-      resetPacketBase = isMainTrack ? rmtMainChannel->packetCount() : rmtProgChannel->packetCount();
-      resetPacketBase += extrafudge;
-    };
-    inline byte getResets() {
-      if ((isMainTrack ? rmtMainChannel : rmtProgChannel) == NULL) return 0;
-      uint32_t packetcount = isMainTrack ?
-	rmtMainChannel->packetCount() : rmtProgChannel->packetCount();
-      uint32_t count = packetcount - resetPacketBase; // Beware of unsigned interger arithmetic.
-      if (count > UINT32_MAX/2)                       // we are in the extrafudge area
-	return 0;
-      if (count > 255)                                // cap to 255
-	return 255;
-      return count;                                   // all special cases handled above
-    };
-#endif
+
+    void beginTrack();
+    void setPowerMode(POWERMODE);
+    POWERMODE getPowerMode();
+    void checkPowerOverload(bool ackManagerActive);
+    inline int get1024Current() {
+	  if (powerMode == POWERMODE::ON)
+	      return (int)(lastCurrent*(long int)1024/motorDriver->getRawCurrentTripValue());
+	  return 0;
+    }
+    inline int getCurrentmA() {
+      if (powerMode == POWERMODE::ON)
+        return motorDriver->raw2mA(lastCurrent);
+      return 0;
+    }
+    inline int getMaxmA() {
+      if (maxmA == 0) { //only calculate this for first request, it doesn't change
+        maxmA = motorDriver->raw2mA(motorDriver->getRawCurrentTripValue()); //TODO: replace with actual max value or calc
+      }
+      return maxmA;        
+    }
+    inline int getTripmA() { 
+      if (tripmA == 0) { //only calculate this for first request, it doesn't change
+        tripmA = motorDriver->raw2mA(motorDriver->getRawCurrentTripValue());
+      }
+      return tripmA;        
+    }
     void schedulePacket(const byte buffer[], byte byteCount, byte repeats);
-    bool getPacketPending();
-    
-  private:
-#ifndef ARDUINO_ARCH_ESP32
     volatile bool packetPending;
     volatile byte sentResetsSincePacket;
-#else
-    volatile uint32_t resetPacketBase;
-#endif
+    volatile bool autoPowerOff=false;
+    void setAckBaseline();  //prog track only
+    void setAckPending();  //prog track only
+    byte getAck();               //prog track only 0=NACK, 1=ACK 2=keep waiting
+    static bool progTrackSyncMain;  // true when prog track is a siding switched to main
+    static bool progTrackBoosted;   // true when prog track is not current limited
+    inline void doAutoPowerOff() {
+	if (autoPowerOff) {
+	    setPowerMode(POWERMODE::OFF);
+	    autoPowerOff=false;
+	}
+    };
+    inline bool canMeasureCurrent() {
+      return motorDriver->canMeasureCurrent();
+    };
+    inline void setAckLimit(int mA) {
+	ackLimitmA = mA;
+    }
+    inline void setMinAckPulseDuration(unsigned int i) {
+	minAckPulseDuration = i;
+    }
+    inline void setMaxAckPulseDuration(unsigned int i) {
+	maxAckPulseDuration = i;
+    }
+
+  private:
+    
+// For each state of the wave  nextState=stateTransform[currentState] 
+   static const WAVE_STATE stateTransform[6];
+
+// For each state of the wave, signal pin is HIGH or LOW   
+   static const bool signalTransform[6];
+  
     static void interruptHandler();
     void interrupt2();
+    void checkAck();
     
     bool isMainTrack;
+    MotorDriver*  motorDriver;
     // Transmission controller
     byte transmitPacket[MAX_PACKET_SIZE+1]; // +1 for checksum
     byte transmitLength;
@@ -101,9 +134,38 @@ class DCCWaveform {
     byte pendingPacket[MAX_PACKET_SIZE+1]; // +1 for checksum
     byte pendingLength;
     byte pendingRepeats;
-#ifdef ARDUINO_ARCH_ESP32
-  static RMTChannel *rmtMainChannel;
-  static RMTChannel *rmtProgChannel;
-#endif
+    int  lastCurrent;
+    static int progTripValue;
+    int maxmA;
+    int tripmA;
+    
+    // current sampling
+    POWERMODE powerMode;
+    unsigned long lastSampleTaken;
+    unsigned int sampleDelay;
+    // Trip current for programming track, 250mA. Change only if you really
+    // need to be non-NMRA-compliant because of decoders that are not either.
+    static const int TRIP_CURRENT_PROG=250;
+    unsigned long power_sample_overload_wait = POWER_SAMPLE_OVERLOAD_WAIT;
+    unsigned int power_good_counter = 0;
+
+    // ACK management (Prog track only)  
+    volatile bool ackPending;
+    volatile bool ackDetected;
+    int  ackThreshold; 
+    int  ackLimitmA = 60;
+    int ackMaxCurrent;
+    unsigned long ackCheckStart; // millis
+    unsigned int ackCheckDuration; // millis       
+    
+    unsigned int ackPulseDuration;  // micros
+    unsigned long ackPulseStart; // micros
+
+    unsigned int minAckPulseDuration = 4000; // micros
+    unsigned int maxAckPulseDuration = 8500; // micros
+
+    volatile static uint8_t numAckGaps;
+    volatile static uint8_t numAckSamples;
+    static uint8_t trailingEdgeCounter;
 };
 #endif

DIAG.h

@@ -1,9 +1,7 @@
 /*
- *  © 2021 Fred Decker
- *  © 2020 Chris Harlow
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
  *  
- *  This file is part of CommandStation-EX
+ *  This file is part of Asbelos DCC API
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

DisplayInterface.cpp

@@ -1,7 +1,5 @@
 /*
- *  © 2021 Neil McKechnie
- *  © 2021 Chris Harlow
- *  All rights reserved.
+ *  © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
  *
  *  This file is part of CommandStation-EX
  *
@@ -21,4 +19,4 @@
 
 #include "DisplayInterface.h"
 
-DisplayInterface *DisplayInterface::lcdDisplay = 0;
+DisplayInterface *DisplayInterface::lcdDisplay = 0;

DisplayInterface.h

@@ -1,7 +1,5 @@
 /*
- *  © 2021 Neil McKechnie
- *  © 2021 Chris Harlow
- *  All rights reserved.
+ *  © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
  *
  *  This file is part of CommandStation-EX
  *
@@ -34,4 +32,4 @@ public:
   static DisplayInterface *lcdDisplay;
 };
 
-#endif
+#endif

EEStore.cpp

@@ -1,12 +1,9 @@
 /*
- *  © 2021 Neil McKechnie
- *  © 2021 Fred Decker
- *  © 2020-2022 Harald Barth
- *  © 2020-2021 Chris Harlow
  *  © 2013-2016 Gregg E. Berman
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2020, Harald Barth.
  *
- *  This file is part of CommandStation-EX
+ *  This file is part of Asbelos DCC API
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,92 +18,90 @@
  *  You should have received a copy of the GNU General Public License
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
-
-#include "defines.h"
-#ifndef DISABLE_EEPROM
 #include "EEStore.h"
-
-#include "DIAG.h"
-#include "Outputs.h"
-#include "Sensors.h"
 #include "Turnouts.h"
+#include "Sensors.h"
+#include "Outputs.h"
+#include "DIAG.h"
 
-#if defined(ARDUINO_ARCH_SAMC)
+#if defined(ARDUINO_ARCH_SAMD)
 ExternalEEPROM EEPROM;
 #endif
 
-void EEStore::init() {
-#if defined(ARDUINO_ARCH_SAMC)
-  EEPROM.begin(0x50);  // Address for Microchip 24-series EEPROM with all three
-                       // A pins grounded (0b1010000 = 0x50)
+void EEStore::init(){
+#if defined(ARDUINO_ARCH_SAMD)
+    EEPROM.begin(0x50);     // Address for Microchip 24-series EEPROM with all three A pins grounded (0b1010000 = 0x50)
 #endif
 
-  eeStore = (EEStore *)calloc(1, sizeof(EEStore));
+    eeStore=(EEStore *)calloc(1,sizeof(EEStore));
+    
+    EEPROM.get(0,eeStore->data);                                       // get eeStore data
 
-  EEPROM.get(0, eeStore->data);  // get eeStore data
+    if(strncmp(eeStore->data.id,EESTORE_ID,sizeof(EESTORE_ID))!=0){    // check to see that eeStore contains valid DCC++ ID
+        sprintf(eeStore->data.id,EESTORE_ID);                           // if not, create blank eeStore structure (no turnouts, no sensors) and save it back to EEPROM
+        eeStore->data.nTurnouts=0;
+        eeStore->data.nSensors=0;
+        eeStore->data.nOutputs=0;
+        EEPROM.put(0,eeStore->data);
+    }
 
-  // check to see that eeStore contains valid DCC++ ID
-  if (strncmp(eeStore->data.id, EESTORE_ID, sizeof(EESTORE_ID)) != 0) {  
-    // if not, create blank eeStore structure (no
-    // turnouts, no sensors) and save it back to EEPROM  
-    strncpy(eeStore->data.id, EESTORE_ID, sizeof(EESTORE_ID)+0);  
-    eeStore->data.nTurnouts = 0;
-    eeStore->data.nSensors = 0;
-    eeStore->data.nOutputs = 0;
-    EEPROM.put(0, eeStore->data);
-  }
+    reset();            // set memory pointer to first free EEPROM space
+    Turnout::load();    // load turnout definitions
+    Sensor::load();     // load sensor definitions
+    Output::load();     // load output definitions
 
-  reset();          // set memory pointer to first free EEPROM space
-  Turnout::load();  // load turnout definitions
-  Sensor::load();   // load sensor definitions
-  Output::load();   // load output definitions
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void EEStore::clear() {
-  sprintf(eeStore->data.id,
-          EESTORE_ID);  // create blank eeStore structure (no turnouts, no
-                        // sensors) and save it back to EEPROM
-  eeStore->data.nTurnouts = 0;
-  eeStore->data.nSensors = 0;
-  eeStore->data.nOutputs = 0;
-  EEPROM.put(0, eeStore->data);
+void EEStore::clear(){
+
+    sprintf(eeStore->data.id,EESTORE_ID);                           // create blank eeStore structure (no turnouts, no sensors) and save it back to EEPROM
+    eeStore->data.nTurnouts=0;
+    eeStore->data.nSensors=0;
+    eeStore->data.nOutputs=0;
+    EEPROM.put(0,eeStore->data);
+
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void EEStore::store() {
-  reset();
-  Turnout::store();
-  Sensor::store();
-  Output::store();
-  EEPROM.put(0, eeStore->data);
-  DIAG(F("EEPROM used: %d/%d bytes"), EEStore::pointer(), EEPROM.length());
+void EEStore::store(){
+    reset();
+    Turnout::store();
+    Sensor::store();
+    Output::store();
+    EEPROM.put(0,eeStore->data);
+    DIAG(F("EEPROM used: %d bytes"), EEStore::pointer());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void EEStore::advance(int n) { eeAddress += n; }
+void EEStore::advance(int n){
+    eeAddress+=n;
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void EEStore::reset() { eeAddress = sizeof(EEStore); }
+void EEStore::reset(){
+    eeAddress=sizeof(EEStore);
+}
 ///////////////////////////////////////////////////////////////////////////////
 
-int EEStore::pointer() { return (eeAddress); }
+int EEStore::pointer(){
+    return(eeAddress);
+}
 ///////////////////////////////////////////////////////////////////////////////
 
 void EEStore::dump(int num) {
-  byte b = 0;
-  DIAG(F("Addr  0x  char"));
-  for (int n = 0; n < num; n++) {
-    EEPROM.get(n, b);
-    DIAG(F("%d     %x    %c"), n, b, isprint(b) ? b : ' ');
-  }
+    byte b;
+    DIAG(F("Addr  0x  char"));
+    for (int n=0 ; n<num; n++) {
+	EEPROM.get(n, b);
+	DIAG(F("%d     %x    %c"),n,b,isprint(b) ? b : ' ');
+    }
 }
 ///////////////////////////////////////////////////////////////////////////////
 
-EEStore *EEStore::eeStore = NULL;
-int EEStore::eeAddress = 0;
-#endif
+EEStore *EEStore::eeStore=NULL;
+int EEStore::eeAddress=0;

EEStore.h

@@ -1,9 +1,6 @@
 /*
- *  © 2021 Neil McKechnie
- *  © 2021 Fred Decker
- *  © 2020-2021 Harald Barth
- *  © 2020 Chris Harlow
- *  All rights reserved.
+ *  (c) 2020 Chris Harlow. All rights reserved.
+ *  (c) 2020 Harald Barth. All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
@@ -20,20 +17,19 @@
  *  You should have received a copy of the GNU General Public License
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef DISABLE_EEPROM
 #ifndef EEStore_h
 #define EEStore_h
 
 #include <Arduino.h>
 
-#if defined(ARDUINO_ARCH_SAMC)
+#if defined(ARDUINO_ARCH_SAMD)
 #include <SparkFun_External_EEPROM.h>
 extern ExternalEEPROM EEPROM;
 #else
 #include <EEPROM.h>
 #endif
 
-#define EESTORE_ID "DCC++1"
+#define EESTORE_ID "DCC++0"
 
 struct EEStoreData{
   char id[sizeof(EESTORE_ID)];
@@ -56,4 +52,3 @@ struct EEStore{
 };
 
 #endif
-#endif // DISABLE_EEPROM

ESP32-fixes.cpp

@@ -1,61 +0,0 @@
-/*
- *  © 2022 Harald Barth
- *  All rights reserved.
- *  
- *  This file is part of CommandStation-EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-#ifdef ARDUINO_ARCH_ESP32
-#include <Arduino.h>
-#include "ESP32-fixes.h"
-
-#include "esp32-hal.h"
-#include "soc/soc_caps.h"
-
-
-#ifdef SOC_LEDC_SUPPORT_HS_MODE
-#define LEDC_CHANNELS           (SOC_LEDC_CHANNEL_NUM<<1)
-#else
-#define LEDC_CHANNELS           (SOC_LEDC_CHANNEL_NUM)
-#endif
-
-static int8_t pin_to_channel[SOC_GPIO_PIN_COUNT] = { 0 };
-static int cnt_channel = LEDC_CHANNELS;
-
-void DCCEXanalogWriteFrequency(uint8_t pin, uint32_t frequency) {
-  if (pin < SOC_GPIO_PIN_COUNT) {
-    if (pin_to_channel[pin] != 0) {
-      ledcSetup(pin_to_channel[pin], frequency, 8);
-    }
-  }
-}
-
-void DCCEXanalogWrite(uint8_t pin, int value) {
-  if (pin < SOC_GPIO_PIN_COUNT) {
-    if (pin_to_channel[pin] == 0) {
-      if (!cnt_channel) {
-          log_e("No more PWM channels available! All %u already used", LEDC_CHANNELS);
-          return;
-      }
-      pin_to_channel[pin] = --cnt_channel;
-      ledcAttachPin(pin, cnt_channel);
-      ledcSetup(cnt_channel, 1000, 8);
-    } else {
-      ledcAttachPin(pin, pin_to_channel[pin]);
-    }
-    ledcWrite(pin_to_channel[pin], value);
-  }
-}
-#endif

EXRAIL2.h

@@ -1,186 +0,0 @@
-/*
- *  © 2021 Neil McKechnie
- *  © 2020-2022 Chris Harlow
- *  All rights reserved.
- *  
- *  This file is part of CommandStation-EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-#ifndef EXRAIL2_H
-#define EXRAIL2_H
-#include "FSH.h"
-#include "IODevice.h"
-#include "Turnouts.h"
-   
-// The following are the operation codes (or instructions) for a kind of virtual machine.
-// Each instruction is normally 3 bytes long with an operation code followed by a parameter.
-// In cases where more than one parameter is required, the first parameter is followed by one  
-// or more OPCODE_PAD instructions with the subsequent parameters. This wastes a byte but makes 
-// searching easier as a parameter can never be confused with an opcode. 
-// 
-enum OPCODE : byte {OPCODE_THROW,OPCODE_CLOSE,
-             OPCODE_FWD,OPCODE_REV,OPCODE_SPEED,OPCODE_INVERT_DIRECTION,
-             OPCODE_RESERVE,OPCODE_FREE,
-             OPCODE_AT,OPCODE_AFTER,OPCODE_AUTOSTART,
-             OPCODE_ATGTE,OPCODE_ATLT,
-             OPCODE_ATTIMEOUT1,OPCODE_ATTIMEOUT2,
-             OPCODE_LATCH,OPCODE_UNLATCH,OPCODE_SET,OPCODE_RESET,
-             OPCODE_ENDIF,OPCODE_ELSE,
-             OPCODE_DELAY,OPCODE_DELAYMINS,OPCODE_DELAYMS,OPCODE_RANDWAIT,
-             OPCODE_FON,OPCODE_FOFF,OPCODE_XFON,OPCODE_XFOFF,
-             OPCODE_RED,OPCODE_GREEN,OPCODE_AMBER,OPCODE_DRIVE,
-             OPCODE_SERVO,OPCODE_SIGNAL,OPCODE_TURNOUT,OPCODE_WAITFOR,
-             OPCODE_PAD,OPCODE_FOLLOW,OPCODE_CALL,OPCODE_RETURN,
-             OPCODE_JOIN,OPCODE_UNJOIN,OPCODE_READ_LOCO1,OPCODE_READ_LOCO2,OPCODE_POM,
-             OPCODE_START,OPCODE_SETLOCO,OPCODE_SENDLOCO,OPCODE_FORGET,
-             OPCODE_PAUSE, OPCODE_RESUME,OPCODE_POWEROFF,OPCODE_POWERON,
-             OPCODE_ONCLOSE, OPCODE_ONTHROW, OPCODE_SERVOTURNOUT, OPCODE_PINTURNOUT,
-             OPCODE_PRINT,OPCODE_DCCACTIVATE,
-             OPCODE_ONACTIVATE,OPCODE_ONDEACTIVATE,
-             OPCODE_ROSTER,OPCODE_KILLALL,
-             OPCODE_ROUTE,OPCODE_AUTOMATION,OPCODE_SEQUENCE,
-             OPCODE_ENDTASK,OPCODE_ENDEXRAIL,
-             OPCODE_SET_TRACK,
-             OPCODE_ONRED,OPCODE_ONAMBER,OPCODE_ONGREEN,
-
-             // OPcodes below this point are skip-nesting IF operations
-             // placed here so that they may be skipped as a group
-             // see skipIfBlock()
-            IF_TYPE_OPCODES, // do not move this... 
-             OPCODE_IFRED,OPCODE_IFAMBER,OPCODE_IFGREEN,
-             OPCODE_IFGTE,OPCODE_IFLT,
-             OPCODE_IFTIMEOUT,
-             OPCODE_IF,OPCODE_IFNOT,
-             OPCODE_IFRANDOM,OPCODE_IFRESERVE,
-             OPCODE_IFCLOSED,OPCODE_IFTHROWN
-             };
-
-
- 
-  // Flag bits for status of hardware and TPL
-  static const byte SECTION_FLAG = 0x80;
-  static const byte LATCH_FLAG   = 0x40;
-  static const byte TASK_FLAG    = 0x20;
-  static const byte SPARE_FLAG   = 0x10;
-  static const byte SIGNAL_MASK  = 0x0C;
-  static const byte SIGNAL_RED   = 0x08;
-  static const byte SIGNAL_AMBER = 0x0C;
-  static const byte SIGNAL_GREEN = 0x04;
-
-  static const byte  MAX_STACK_DEPTH=4;
- 
-   static const short MAX_FLAGS=256;
-  #define FLAGOVERFLOW(x) x>=MAX_FLAGS
-
-class LookList {
-  public: 
-    LookList(int16_t size);
-    void add(int16_t lookup, int16_t result);
-    int16_t find(int16_t value);
-  private:
-     int16_t m_size;
-     int16_t m_loaded;
-     int16_t * m_lookupArray;
-     int16_t * m_resultArray;     
-};
-
- class RMFT2 {
-   public:
-    static void begin();
-    static void loop();
-    RMFT2(int progCounter);
-    RMFT2(int route, uint16_t cab);
-    ~RMFT2();
-    static void readLocoCallback(int16_t cv);
-    static void createNewTask(int route, uint16_t cab);
-    static void turnoutEvent(int16_t id, bool closed);  
-    static void activateEvent(int16_t addr, bool active);
-    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 SIGNAL_ID_MASK=0x0FFF;
- 
- // Throttle Info Access functions built by exrail macros 
-  static const byte rosterNameCount;
-  static const int16_t FLASH routeIdList[];
-  static const int16_t FLASH automationIdList[];
-  static const int16_t FLASH rosterIdList[];
-  static const FSH *  getRouteDescription(int16_t id);
-  static char   getRouteType(int16_t id);
-  static const FSH *  getTurnoutDescription(int16_t id);
-  static const FSH *  getRosterName(int16_t id);
-  static const FSH *  getRosterFunctions(int16_t id);
-    
-private: 
-    static void ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16_t p[]);
-    static bool parseSlash(Print * stream, byte & paramCount, int16_t p[]) ;
-    static void streamFlags(Print* stream);
-    static bool setFlag(VPIN id,byte onMask, byte OffMask=0);
-    static bool getFlag(VPIN id,byte mask); 
-    static int16_t progtrackLocoId;
-    static void doSignal(int16_t id,char rag); 
-    static bool isSignal(int16_t id,char rag); 
-    static int16_t getSignalSlot(int16_t id);
-    static void setTurnoutHiddenState(Turnout * t);
-    static LookList* LookListLoader(OPCODE op1,
-                      OPCODE op2=OPCODE_ENDEXRAIL,OPCODE op3=OPCODE_ENDEXRAIL);
-    static void handleEvent(const FSH* reason,LookList* handlers, int16_t id);
-    static RMFT2 * loopTask;
-    static RMFT2 * pausingTask;
-    void delayMe(long millisecs);
-    void driveLoco(byte speedo);
-    bool readSensor(uint16_t sensorId);
-    bool skipIfBlock();
-    bool readLoco();
-    void loop2();
-    void kill(const FSH * reason=NULL,int operand=0);          
-    void printMessage(uint16_t id);  // Built by RMFTMacros.h
-    void printMessage2(const FSH * msg);
-    
-   static bool diag;
-   static const  FLASH  byte RouteCode[];
-   static const  FLASH  int16_t SignalDefinitions[];
-   static byte flags[MAX_FLAGS];
-   static LookList * sequenceLookup;
-   static LookList * onThrowLookup;
-   static LookList * onCloseLookup;
-   static LookList * onActivateLookup;
-   static LookList * onDeactivateLookup;
-   static LookList * onRedLookup;
-   static LookList * onAmberLookup;
-   static LookList * onGreenLookup;
-  
-    
-  // Local variables - exist for each instance/task 
-    RMFT2 *next;   // loop chain 
-    int progCounter;    // Byte offset of next route opcode in ROUTES table
-    unsigned long delayStart; // Used by opcodes that must be recalled before completing
-    unsigned long  delayTime;
-    union {
-      unsigned long waitAfter; // Used by OPCODE_AFTER
-      unsigned long timeoutStart; // Used by OPCODE_ATTIMEOUT
-    };
-    bool timeoutFlag;
-    byte  taskId;
-    
-    uint16_t loco;
-    bool forward;
-    bool invert;
-    byte speedo;
-    int onEventStartPosition;
-    byte stackDepth;
-    int callStack[MAX_STACK_DEPTH];
-};
-#endif

EXRAIL2MacroReset.h

@@ -1,244 +0,0 @@
-/*
- *  © 2021-2022 Chris Harlow
- *  © 2020,2021 Chris Harlow. All rights reserved.
- *  
- *  This file is part of CommandStation-EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-// This file cleans and resets the RMFT2 Macros.
-// It is used between passes to reduce complexity in RMFT2Macros.h
-// DO NOT add an include guard to this file.
-
-// Undefine all RMFT macros
-#undef ACTIVATE
-#undef ACTIVATEL
-#undef AFTER
-#undef ALIAS
-#undef AMBER
-#undef AT
-#undef ATGTE
-#undef ATLT
-#undef ATTIMEOUT
-#undef AUTOMATION 
-#undef AUTOSTART
-#undef BROADCAST
-#undef CALL 
-#undef CLOSE 
-#undef DCC_SIGNAL
-#undef DEACTIVATE
-#undef DEACTIVATEL
-#undef DELAY
-#undef DELAYMINS
-#undef DELAYRANDOM 
-#undef DONE
-#undef DRIVE
-#undef ELSE
-#undef ENDEXRAIL 
-#undef ENDIF  
-#undef ENDTASK
-#undef ESTOP 
-#undef EXRAIL  
-#undef FADE
-#undef FOFF
-#undef FOLLOW 
-#undef FON 
-#undef FORGET
-#undef FREE 
-#undef FWD 
-#undef GREEN
-#undef HAL
-#undef IF 
-#undef IFAMBER
-#undef IFCLOSED
-#undef IFGREEN
-#undef IFGTE
-#undef IFLT
-#undef IFNOT
-#undef IFRANDOM 
-#undef IFRED
-#undef IFRESERVE
-#undef IFTHROWN
-#undef IFTIMEOUT
-#undef INVERT_DIRECTION 
-#undef JOIN 
-#undef KILLALL
-#undef LATCH 
-#undef LCD 
-#undef LCN 
-#undef MOVETT
-#undef ONACTIVATE
-#undef ONACTIVATEL
-#undef ONAMBER
-#undef ONDEACTIVATE
-#undef ONDEACTIVATEL 
-#undef ONCLOSE
-#undef ONGREEN
-#undef ONRED
-#undef ONTHROW 
-#undef PARSE
-#undef PAUSE
-#undef PIN_TURNOUT 
-#undef PRINT
-#undef POM
-#undef POWEROFF
-#undef POWERON
-#undef READ_LOCO 
-#undef RED 
-#undef RESERVE 
-#undef RESET 
-#undef RESUME 
-#undef RETURN 
-#undef REV
-#undef ROSTER 
-#undef ROUTE
-#undef SENDLOCO 
-#undef SEQUENCE 
-#undef SERIAL 
-#undef SERIAL1 
-#undef SERIAL2 
-#undef SERIAL3 
-#undef SERVO 
-#undef SERVO2 
-#undef SERVO_TURNOUT 
-#undef SERVO_SIGNAL
-#undef SET
-#undef SET_TRACK
-#undef SETLOCO 
-#undef SIGNAL 
-#undef SIGNALH 
-#undef SPEED 
-#undef START 
-#undef STOP 
-#undef THROW  
-#undef TURNOUT 
-#undef UNJOIN
-#undef UNLATCH 
-#undef VIRTUAL_SIGNAL
-#undef VIRTUAL_TURNOUT
-#undef WAITFOR
-#undef XFOFF
-#undef XFON
-
-#ifndef RMFT2_UNDEF_ONLY
-#define ACTIVATE(addr,subaddr)
-#define ACTIVATEL(addr)
-#define AFTER(sensor_id)
-#define ALIAS(name,value...)
-#define AMBER(signal_id)
-#define AT(sensor_id)
-#define ATGTE(sensor_id,value) 
-#define ATLT(sensor_id,value) 
-#define ATTIMEOUT(sensor_id,timeout_ms)
-#define AUTOMATION(id,description) 
-#define AUTOSTART
-#define BROADCAST(msg)
-#define CALL(route) 
-#define CLOSE(id) 
-#define DCC_SIGNAL(id,add,subaddr)
-#define DEACTIVATE(addr,subaddr)
-#define DEACTIVATEL(addr)
-#define DELAY(mindelay)
-#define DELAYMINS(mindelay)
-#define DELAYRANDOM(mindelay,maxdelay) 
-#define DONE
-#define DRIVE(analogpin)
-#define ELSE
-#define ENDEXRAIL 
-#define ENDIF  
-#define ENDTASK
-#define ESTOP 
-#define EXRAIL  
-#define FADE(pin,value,ms)
-#define FOFF(func)
-#define FOLLOW(route) 
-#define FON(func)
-#define FORGET
-#define FREE(blockid) 
-#define FWD(speed) 
-#define GREEN(signal_id)
-#define HAL(haltype,params...)
-#define IF(sensor_id) 
-#define IFAMBER(signal_id)
-#define IFCLOSED(turnout_id) 
-#define IFGREEN(signal_id)
-#define IFGTE(sensor_id,value) 
-#define IFLT(sensor_id,value) 
-#define IFNOT(sensor_id)
-#define IFRANDOM(percent)
-#define IFRED(signal_id)
-#define IFTHROWN(turnout_id) 
-#define IFRESERVE(block)
-#define IFTIMEOUT
-#define INVERT_DIRECTION 
-#define JOIN 
-#define KILLALL
-#define LATCH(sensor_id) 
-#define LCD(row,msg) 
-#define LCN(msg) 
-#define MOVETT(id,steps,activity)
-#define ONACTIVATE(addr,subaddr)
-#define ONACTIVATEL(linear)
-#define ONAMBER(signal_id) 
-#define ONDEACTIVATE(addr,subaddr)
-#define ONDEACTIVATEL(linear) 
-#define ONCLOSE(turnout_id)
-#define ONGREEN(signal_id) 
-#define ONRED(signal_id) 
-#define ONTHROW(turnout_id) 
-#define PAUSE
-#define PIN_TURNOUT(id,pin,description...) 
-#define PRINT(msg) 
-#define PARSE(msg)
-#define POM(cv,value)
-#define POWEROFF
-#define POWERON
-#define READ_LOCO 
-#define RED(signal_id) 
-#define RESERVE(blockid) 
-#define RESET(pin) 
-#define RESUME 
-#define RETURN 
-#define REV(speed) 
-#define ROUTE(id,description)
-#define ROSTER(cab,name,funcmap...)
-#define SENDLOCO(cab,route) 
-#define SEQUENCE(id) 
-#define SERIAL(msg) 
-#define SERIAL1(msg) 
-#define SERIAL2(msg) 
-#define SERIAL3(msg) 
-#define SERVO(id,position,profile) 
-#define SERVO2(id,position,duration) 
-#define SERVO_SIGNAL(vpin,redpos,amberpos,greenpos)
-#define SERVO_TURNOUT(id,pin,activeAngle,inactiveAngle,profile,description...) 
-#define SET(pin) 
-#define SET_TRACK(track,mode)
-#define SETLOCO(loco) 
-#define SIGNAL(redpin,amberpin,greenpin) 
-#define SIGNALH(redpin,amberpin,greenpin) 
-#define SPEED(speed) 
-#define START(route) 
-#define STOP 
-#define THROW(id)  
-#define TURNOUT(id,addr,subaddr,description...) 
-#define UNJOIN 
-#define UNLATCH(sensor_id) 
-#define VIRTUAL_SIGNAL(id) 
-#define VIRTUAL_TURNOUT(id,description...) 
-#define WAITFOR(pin)
-#define XFOFF(cab,func)
-#define XFON(cab,func)
-#endif

EXRAILMacros.h

@@ -1,335 +0,0 @@
-/*
- *  © 2021 Neil McKechnie
- *  © 2020-2022 Chris Harlow
- *  All rights reserved.
- *  
- *  This file is part of CommandStation-EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef EXRAILMacros_H
-#define EXRAILMacros_H
-
-// remove normal code LCD & SERIAL macros (will be restored later)
-#undef LCD
-#undef SERIAL
-
-
-// This file will include and build the EXRAIL script and associated helper tricks.
-// It does this by including myAutomation.h several times, each with a set of macros to 
-// extract the relevant parts.
-
-// The entire automation script is contained within a byte array RMFT2::RouteCode[]
-// made up of opcode and parameter pairs.
-// ech opcode is a 1 byte operation plus 2 byte operand. 
-// The array is normally built using the macros below as this makes it easier 
-// to manage the cases where:
-// - padding must be applied to ensure the correct alignment of the next instruction
-// - large parameters must be split up
-// - multiple parameters aligned correctly
-// - a single macro requires multiple operations
-
-// Descriptive texts for routes and animations are created in a sepaerate function which
-// can be called to emit a list of routes/automatuions in a form suitable for Withrottle. 
- 
-// PRINT(msg) and LCD(row,msg) is implemented in a separate pass to create 
-// a getMessageText(id) function.  
-
-// CAUTION: The macros below are multiple passed over myAutomation.h
-
-
-// helper macro for turnout descriptions, creates NULL for missing description
-#define O_DESC(id, desc) case id: return ("" desc)[0]?F("" desc):NULL;
-// helper macro for turnout description as HIDDEN 
-#define HIDDEN "\x01"
-
-// Pass 1 Implements aliases 
-#include "EXRAIL2MacroReset.h"
-#undef ALIAS
-#define ALIAS(name,value...) const int name= 1##value##0 ==10 ? -__COUNTER__  : value##0/10; 
-#include "myAutomation.h"
-
-// Pass 1h Implements HAL macro by creating exrailHalSetup function 
-#include "EXRAIL2MacroReset.h"
-#undef HAL
-#define HAL(haltype,params...)  haltype::create(params);
-void exrailHalSetup() {
-   #include "myAutomation.h"
-}
-
-// Pass 2 create throttle route list 
-#include "EXRAIL2MacroReset.h"
-#undef ROUTE
-#define ROUTE(id, description) id,
-const int16_t FLASH RMFT2::routeIdList[]= {
-    #include "myAutomation.h"
-    0}; 
-// Pass 2a create throttle automation list 
-#include "EXRAIL2MacroReset.h"
-#undef AUTOMATION
-#define AUTOMATION(id, description) id,
-const int16_t FLASH RMFT2::automationIdList[]= {
-    #include "myAutomation.h"
-    0}; 
-
-// Pass 3 Create route descriptions:
-#undef ROUTE
-#define ROUTE(id, description) case id: return F(description);
-#undef AUTOMATION
-#define AUTOMATION(id, description) case id: return F(description);
-const FSH * RMFT2::getRouteDescription(int16_t id) {
-   switch(id) {
-    #include "myAutomation.h"
-    default: break;
-   }
-   return F("");
-}
-
-// Pass 4... Create Text sending functions
-#include "EXRAIL2MacroReset.h"
-const int StringMacroTracker1=__COUNTER__;
-#undef BROADCAST
-#define BROADCAST(msg) case (__COUNTER__ - StringMacroTracker1) : CommandDistributor::broadcastText(F(msg));break;
-#undef PARSE
-#define PARSE(msg) case (__COUNTER__ - StringMacroTracker1) : DCCEXParser::parse(F(msg));break;
-#undef PRINT
-#define PRINT(msg)    case (__COUNTER__ - StringMacroTracker1) : printMessage2(F(msg));break;
-#undef LCN
-#define LCN(msg)      case (__COUNTER__ - StringMacroTracker1) : StringFormatter::send(&LCN_SERIAL,F(msg));break;
-#undef SERIAL
-#define SERIAL(msg)   case (__COUNTER__ - StringMacroTracker1) : StringFormatter::send(&Serial,F(msg));break;
-#undef SERIAL1
-#define SERIAL1(msg)  case (__COUNTER__ - StringMacroTracker1) : StringFormatter::send(&Serial1,F(msg));break;
-#undef SERIAL2
-#define SERIAL2(msg)  case (__COUNTER__ - StringMacroTracker1) : StringFormatter::send(&Serial2,F(msg));break;
-#undef SERIAL3
-#define SERIAL3(msg)  case (__COUNTER__ - StringMacroTracker1) : StringFormatter::send(&Serial3,F(msg));break;
-#undef LCD
-#define LCD(id,msg)   case (__COUNTER__ - StringMacroTracker1) : StringFormatter::lcd(id,F(msg));break;
-
-void  RMFT2::printMessage(uint16_t id) { 
-  switch(id) {
-    #include "myAutomation.h"
-    default: break ; 
-  }
-}
-
-
-// Pass 5: Turnout descriptions (optional)
-#include "EXRAIL2MacroReset.h"
-#undef TURNOUT
-#define TURNOUT(id,addr,subaddr,description...) O_DESC(id,description)
-#undef PIN_TURNOUT
-#define PIN_TURNOUT(id,pin,description...) O_DESC(id,description)
-#undef SERVO_TURNOUT
-#define SERVO_TURNOUT(id,pin,activeAngle,inactiveAngle,profile,description...) O_DESC(id,description)
-#undef VIRTUAL_TURNOUT
-#define VIRTUAL_TURNOUT(id,description...) O_DESC(id,description)
-
-const FSH * RMFT2::getTurnoutDescription(int16_t turnoutid) {
-     switch (turnoutid) {
-        #include "myAutomation.h"
-     default:break;
-     }
-     return NULL;
-}
-
-// Pass 6: Roster IDs (count)
-#include "EXRAIL2MacroReset.h"
-#undef ROSTER
-#define ROSTER(cabid,name,funcmap...) +1
-const byte RMFT2::rosterNameCount=0
-   #include "myAutomation.h"
-   ;
-   
-// Pass 6: Roster IDs 
-#include "EXRAIL2MacroReset.h"
-#undef ROSTER
-#define ROSTER(cabid,name,funcmap...) cabid,
-const int16_t FLASH  RMFT2::rosterIdList[]={
-   #include "myAutomation.h"
-   0};
-
-// Pass 7: Roster names getter
-#include "EXRAIL2MacroReset.h"
-#undef ROSTER
-#define ROSTER(cabid,name,funcmap...) case cabid: return F(name);
-const FSH * RMFT2::getRosterName(int16_t id) {
-   switch(id) {
-      #include "myAutomation.h"
-   default: break;
-   }
-   return F("");   
-} 
-
-// Pass to get roster functions 
-#undef ROSTER
-#define ROSTER(cabid,name,funcmap...) case cabid: return F("" funcmap);
-const FSH * RMFT2::getRosterFunctions(int16_t id) {
-   switch(id) {
-      #include "myAutomation.h"
-   default: break; 
-   }   
-   return F("");
-} 
-
-// Pass 8 Signal definitions
-#include "EXRAIL2MacroReset.h"
-#undef SIGNAL
-#define SIGNAL(redpin,amberpin,greenpin) redpin,redpin,amberpin,greenpin, 
-#undef SIGNALH
-#define SIGNALH(redpin,amberpin,greenpin) redpin | RMFT2::ACTIVE_HIGH_SIGNAL_FLAG,redpin,amberpin,greenpin, 
-#undef SERVO_SIGNAL
-#define SERVO_SIGNAL(vpin,redval,amberval,greenval) vpin | RMFT2::SERVO_SIGNAL_FLAG,redval,amberval,greenval, 
-#undef DCC_SIGNAL
-#define DCC_SIGNAL(id,addr,subaddr) id | RMFT2::DCC_SIGNAL_FLAG,addr,subaddr,0,
-#undef VIRTUAL_SIGNAL
-#define VIRTUAL_SIGNAL(id) id,0,0,0,
-
-const  FLASH  int16_t RMFT2::SignalDefinitions[] = {
-    #include "myAutomation.h"
-    0,0,0,0 };
-
-// Last Pass : create main routes table
-// Only undef the macros, not dummy them.  
-#define  RMFT2_UNDEF_ONLY
-#include "EXRAIL2MacroReset.h"
-// Define internal helper macros.
-// Everything we generate here has to be compile-time evaluated to 
-// a constant.  
-#define V(val) (byte)(((int16_t)(val))&0x00FF),(byte)(((int16_t)(val)>>8)&0x00FF)
-// Define macros for route code creation 
-
-#define ACTIVATE(addr,subaddr) OPCODE_DCCACTIVATE,V(addr<<3 | subaddr<<1 | 1),
-#define ACTIVATEL(addr) OPCODE_DCCACTIVATE,V((addr+3)<<1 | 1),
-#define AFTER(sensor_id) OPCODE_AT,V(sensor_id),OPCODE_AFTER,V(sensor_id),
-#define ALIAS(name,value...) 
-#define AMBER(signal_id) OPCODE_AMBER,V(signal_id),
-#define AT(sensor_id) OPCODE_AT,V(sensor_id),
-#define ATGTE(sensor_id,value) OPCODE_ATGTE,V(sensor_id),OPCODE_PAD,V(value),  
-#define ATLT(sensor_id,value) OPCODE_ATLT,V(sensor_id),OPCODE_PAD,V(value),  
-#define ATTIMEOUT(sensor_id,timeout) OPCODE_ATTIMEOUT1,0,0,OPCODE_ATTIMEOUT2,V(sensor_id),OPCODE_PAD,V(timeout/100L),
-#define AUTOMATION(id, description)  OPCODE_AUTOMATION, V(id), 
-#define AUTOSTART OPCODE_AUTOSTART,0,0,
-#define BROADCAST(msg) PRINT(msg)
-#define CALL(route) OPCODE_CALL,V(route),
-#define CLOSE(id)  OPCODE_CLOSE,V(id),
-#define DEACTIVATE(addr,subaddr) OPCODE_DCCACTIVATE,V(addr<<3 | subaddr<<1),
-#define DEACTIVATEL(addr) OPCODE_DCCACTIVATE,V((addr+3)<<1),
-#define DELAY(ms) ms<30000?OPCODE_DELAYMS:OPCODE_DELAY,V(ms/(ms<30000?1L:100L)),
-#define DELAYMINS(mindelay) OPCODE_DELAYMINS,V(mindelay),
-#define DELAYRANDOM(mindelay,maxdelay) DELAY(mindelay) OPCODE_RANDWAIT,V((maxdelay-mindelay)/100L),
-#define DCC_SIGNAL(id,add,subaddr)
-#define DONE OPCODE_ENDTASK,0,0,
-#define DRIVE(analogpin) OPCODE_DRIVE,V(analogpin),
-#define ELSE OPCODE_ELSE,0,0,
-#define ENDEXRAIL 
-#define ENDIF  OPCODE_ENDIF,0,0,
-#define ENDTASK OPCODE_ENDTASK,0,0,
-#define ESTOP OPCODE_SPEED,V(1), 
-#define EXRAIL 
-#define FADE(pin,value,ms) OPCODE_SERVO,V(pin),OPCODE_PAD,V(value),OPCODE_PAD,V(PCA9685::ProfileType::UseDuration|PCA9685::NoPowerOff),OPCODE_PAD,V(ms/100L),
-#define FOFF(func) OPCODE_FOFF,V(func),
-#define FOLLOW(route) OPCODE_FOLLOW,V(route),
-#define FON(func) OPCODE_FON,V(func),
-#define FORGET OPCODE_FORGET,0,0,
-#define FREE(blockid) OPCODE_FREE,V(blockid),
-#define FWD(speed) OPCODE_FWD,V(speed),
-#define GREEN(signal_id) OPCODE_GREEN,V(signal_id),
-#define HAL(haltype,params...)
-#define IF(sensor_id) OPCODE_IF,V(sensor_id),
-#define IFAMBER(signal_id) OPCODE_IFAMBER,V(signal_id),
-#define IFCLOSED(turnout_id) OPCODE_IFCLOSED,V(turnout_id),
-#define IFGREEN(signal_id) OPCODE_IFGREEN,V(signal_id),
-#define IFGTE(sensor_id,value) OPCODE_IFGTE,V(sensor_id),OPCODE_PAD,V(value),
-#define IFLT(sensor_id,value) OPCODE_IFLT,V(sensor_id),OPCODE_PAD,V(value),
-#define IFNOT(sensor_id) OPCODE_IFNOT,V(sensor_id),
-#define IFRANDOM(percent) OPCODE_IFRANDOM,V(percent),
-#define IFRED(signal_id) OPCODE_IFRED,V(signal_id),
-#define IFRESERVE(block) OPCODE_IFRESERVE,V(block),
-#define IFTHROWN(turnout_id) OPCODE_IFTHROWN,V(turnout_id),
-#define IFTIMEOUT OPCODE_IFTIMEOUT,0,0,
-#define INVERT_DIRECTION OPCODE_INVERT_DIRECTION,0,0,
-#define JOIN OPCODE_JOIN,0,0,
-#define KILLALL OPCODE_KILLALL,0,0,
-#define LATCH(sensor_id) OPCODE_LATCH,V(sensor_id),
-#define LCD(id,msg) PRINT(msg)
-#define LCN(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 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),
-#define ONCLOSE(turnout_id) OPCODE_ONCLOSE,V(turnout_id),
-#define ONDEACTIVATE(addr,subaddr) OPCODE_ONDEACTIVATE,V(addr<<2|subaddr),
-#define ONDEACTIVATEL(linear) OPCODE_ONDEACTIVATE,V(linear+3),
-#define ONGREEN(signal_id) OPCODE_ONGREEN,V(signal_id),
-#define ONRED(signal_id) OPCODE_ONRED,V(signal_id),
-#define ONTHROW(turnout_id) OPCODE_ONTHROW,V(turnout_id),
-#define PAUSE OPCODE_PAUSE,0,0,
-#define PIN_TURNOUT(id,pin,description...) OPCODE_PINTURNOUT,V(id),OPCODE_PAD,V(pin), 
-#define POM(cv,value) OPCODE_POM,V(cv),OPCODE_PAD,V(value),
-#define POWEROFF OPCODE_POWEROFF,0,0,
-#define POWERON OPCODE_POWERON,0,0,
-#define PRINT(msg) OPCODE_PRINT,V(__COUNTER__ - StringMacroTracker2),
-#define PARSE(msg) PRINT(msg)
-#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) OPCODE_RESET,V(pin),
-#define RESUME OPCODE_RESUME,0,0,
-#define RETURN OPCODE_RETURN,0,0,
-#define REV(speed) OPCODE_REV,V(speed),
-#define ROSTER(cabid,name,funcmap...)
-#define ROUTE(id, description)  OPCODE_ROUTE, V(id), 
-#define SENDLOCO(cab,route) OPCODE_SENDLOCO,V(cab),OPCODE_PAD,V(route),
-#define SEQUENCE(id)  OPCODE_SEQUENCE, V(id), 
-#define SERIAL(msg) PRINT(msg)
-#define SERIAL1(msg) PRINT(msg)
-#define SERIAL2(msg) PRINT(msg)
-#define SERIAL3(msg) PRINT(msg)
-#define SERVO(id,position,profile) OPCODE_SERVO,V(id),OPCODE_PAD,V(position),OPCODE_PAD,V(PCA9685::profile),OPCODE_PAD,V(0),
-#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) OPCODE_SET,V(pin),
-#define SET_TRACK(track,mode)  OPCODE_SET_TRACK,V(TRACK_MODE_##mode  <<8 | TRACK_NUMBER_##track),
-#define SETLOCO(loco) OPCODE_SETLOCO,V(loco),
-#define SIGNAL(redpin,amberpin,greenpin) 
-#define SIGNALH(redpin,amberpin,greenpin) 
-#define SPEED(speed) OPCODE_SPEED,V(speed),
-#define START(route) OPCODE_START,V(route),
-#define STOP OPCODE_SPEED,V(0), 
-#define THROW(id)  OPCODE_THROW,V(id),
-#define TURNOUT(id,addr,subaddr,description...) OPCODE_TURNOUT,V(id),OPCODE_PAD,V(addr),OPCODE_PAD,V(subaddr),
-#define UNJOIN OPCODE_UNJOIN,0,0,
-#define UNLATCH(sensor_id) OPCODE_UNLATCH,V(sensor_id),
-#define VIRTUAL_SIGNAL(id) 
-#define VIRTUAL_TURNOUT(id,description...) OPCODE_PINTURNOUT,V(id),OPCODE_PAD,V(0), 
-#define WAITFOR(pin) OPCODE_WAITFOR,V(pin),
-#define XFOFF(cab,func) OPCODE_XFOFF,V(cab),OPCODE_PAD,V(func),
-#define XFON(cab,func) OPCODE_XFON,V(cab),OPCODE_PAD,V(func),
-
-// Build RouteCode
-const int StringMacroTracker2=__COUNTER__;
-const  FLASH  byte RMFT2::RouteCode[] = {
-    #include "myAutomation.h"
-    OPCODE_ENDTASK,0,0,OPCODE_ENDEXRAIL,0,0 };
-
-// Restore normal code LCD & SERIAL  macro
-#undef LCD
-#define LCD   StringFormatter::lcd
-#undef SERIAL
-#define SERIAL  0x0
-#endif

EthernetInterface.cpp

@@ -1,9 +1,5 @@
 /*
- *  © 2021 Fred Decker
- *  © 2020-2021 Harald Barth
- *  © 2020-2021 Chris Harlow
- *  © 2020 Gregor Baues
- *  All rights reserved.
+ *  © 2020,Gregor Baues,  Chris Harlow. All rights reserved.
  *  
  *  This file is part of DCC-EX/CommandStation-EX
  *
@@ -21,12 +17,17 @@
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  * 
  */
+#if __has_include ( "config.h")
+  #include "config.h"
+#else
+  #warning config.h not found. Using defaults from config.example.h 
+  #include "config.example.h"
+#endif
 #include "defines.h" 
 #if ETHERNET_ON == true
 #include "EthernetInterface.h"
 #include "DIAG.h"
 #include "CommandDistributor.h"
-#include "WiThrottle.h"
 #include "DCCTimer.h"
 
 EthernetInterface * EthernetInterface::singleton=NULL;
@@ -163,7 +164,9 @@ void EthernetInterface::loop()
             buffer[count] = '\0'; // terminate the string properly
             if (Diag::ETHERNET) DIAG(F(",count=%d:%e"), socket,buffer);
             // execute with data going directly back
+            outboundRing->mark(socket); 
             CommandDistributor::parse(socket,buffer,outboundRing);
+            outboundRing->commit();
             return; // limit the amount of processing that takes place within 1 loop() cycle. 
           }
         }
@@ -173,12 +176,9 @@ void EthernetInterface::loop()
    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 
     int socketOut=outboundRing->read();

EthernetInterface.h

@@ -1,10 +1,5 @@
 /*
- *  © 2021 Neil McKechnie
- *  © 2021 Mike S
- *  © 2021 Fred Decker
- *  © 2020-2021 Chris Harlow
- *  © 2020 Gregor Baues
- *  All rights reserved.
+ *  © 2020,Gregor Baues,  Chris Harlow. All rights reserved.
  *  
  *  This file is part of DCC-EX/CommandStation-EX
  *
@@ -27,11 +22,15 @@
 
 #ifndef EthernetInterface_h
 #define EthernetInterface_h
-
-#include "defines.h"
+#if __has_include ( "config.h")
+  #include "config.h"
+#else
+  #warning config.h not found. Using defaults from config.example.h 
+  #include "config.example.h"
+#endif
 #include "DCCEXParser.h"
 #include <Arduino.h>
-//#include <avr/pgmspace.h>
+#include <avr/pgmspace.h>
 #if defined (ARDUINO_TEENSY41)
  #include <NativeEthernet.h>         //TEENSY Ethernet Treiber
  #include <NativeEthernetUdp.h>   

FSH.h

@@ -1,9 +1,5 @@
 /*
- *  © 2022 Paul M Antoine
- *  © 2021 Neil McKechnie
- *  © 2021 Harald Barth
- *  © 2021 Fred Decker
- *  All rights reserved.
+ *  (c) 2021 Fred Decker.  All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
@@ -48,14 +44,6 @@ typedef char FSH;
 #define FLASH
 #define strlen_P strlen
 #define strcpy_P strcpy
-#elif defined(ARDUINO_ARCH_STM32)
-typedef __FlashStringHelper FSH;
-#define GETFLASH(addr) pgm_read_byte_near(addr)
-#define GETFLASHW(addr) pgm_read_word_near(addr)
-#ifdef FLASH
-  #undef FLASH
-#endif
-#define FLASH PROGMEM
 #else 
 typedef __FlashStringHelper FSH;
 #define GETFLASH(addr) pgm_read_byte_near(addr)

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "PORTX-HAL-20220918"
+#define GITHUB_SHA "50fcbc0"

I2CManager.cpp

@@ -1,7 +1,5 @@
 /*
- *  © 2022 Paul M Antoine
- *  © 2021, Neil McKechnie
- *  All rights reserved.
+ *  © 2021, Neil McKechnie. All rights reserved.
  *
  *  This file is part of CommandStation-EX
  *
@@ -32,9 +30,6 @@
 #elif defined(ARDUINO_ARCH_MEGAAVR) 
 #include "I2CManager_NonBlocking.h"
 #include "I2CManager_Mega4809.h"  // NanoEvery/UnoWifi
-#elif defined(ARDUINO_ARCH_SAMD)
-#include "I2CManager_NonBlocking.h"
-#include "I2CManager_SAMD.h"      // SAMD21 for now... SAMD51 as well later
 #else
 #define I2C_USE_WIRE
 #include "I2CManager_Wire.h"      // Other platforms
@@ -152,25 +147,6 @@ uint8_t I2CManagerClass::finishRB(I2CRB *rb, uint8_t status) {
   return status;
 }
 
-/***************************************************************************
- * Get a message corresponding to the error status
- ***************************************************************************/
-const FSH *I2CManagerClass::getErrorMessage(uint8_t status) {
-  switch (status) {
-    case I2C_STATUS_OK: return F("OK");
-    case I2C_STATUS_TRUNCATED: return F("Transmission truncated");
-    case I2C_STATUS_NEGATIVE_ACKNOWLEDGE: return F("No response from device (address NAK)");
-    case I2C_STATUS_TRANSMIT_ERROR: return F("Transmit error (data NAK)");
-    case I2C_STATUS_OTHER_TWI_ERROR: return F("Other Wire/TWI error");
-    case I2C_STATUS_TIMEOUT: return F("Timeout");
-    case I2C_STATUS_ARBITRATION_LOST: return F("Arbitration lost");
-    case I2C_STATUS_BUS_ERROR: return F("I2C bus error");
-    case I2C_STATUS_UNEXPECTED_ERROR: return F("Unexpected error");
-    case I2C_STATUS_PENDING: return F("Request pending");
-    default: return F("Error code not recognised");
-  }
-}
-
 /***************************************************************************
  *  Declare singleton class instance.
  ***************************************************************************/
@@ -182,25 +158,12 @@ I2CManagerClass I2CManager = I2CManagerClass();
 /////////////////////////////////////////////////////////////////////////////
 
 /***************************************************************************
- *  Block waiting for request block to complete, and return completion status.
- *  Since such a loop could potentially last for ever if the RB status doesn't
- *  change, we set a high limit (1sec, 1000ms) on the wait time and, if it
- *  hasn't changed by that time we assume it's not going to, and just return
- *  a timeout status.  This means that CS will not lock up.
+ *  Block waiting for request block to complete, and return completion status
  ***************************************************************************/
 uint8_t I2CRB::wait() {
-  unsigned long waitStart = millis();
-  do {
+  do
     I2CManager.loop();
-    // Rather than looping indefinitely, let's set a very high timeout (1s).
-    if ((millis() - waitStart) > 1000UL) { 
-      DIAG(F("I2C TIMEOUT I2C:x%x I2CRB:x%x"), i2cAddress, this);
-      status = I2C_STATUS_TIMEOUT;
-      // Note that, although the timeout is posted, the request may yet complete.
-      // TODO: Ideally we would like to cancel the request.
-      return status;
-    }
-  } while (status==I2C_STATUS_PENDING);
+  while (status==I2C_STATUS_PENDING);
   return status;
 }
 

I2CManager.h

@@ -1,5 +1,4 @@
 /*
- *  © 2022 Paul M Antoine
  *  © 2021, Neil McKechnie. All rights reserved.
  *
  *  This file is part of CommandStation-EX
@@ -108,31 +107,23 @@
  *  the loop() function is called, and may be adequate under some circumstances.  
  *  The advantage of NOT using interrupts is that the impact of I2C upon the DCC waveform (when accurate timing mode isn't in use)
  *  becomes almost zero.
+ *  This mechanism is under evaluation and should not be relied upon as yet.
  * 
  */
 
-// Add following line to config.h to enable Wire library instead of native I2C drivers
 //#define I2C_USE_WIRE
-
-// Add following line to config.h to disable the use of interrupts by the native I2C drivers.
-//#define I2C_NO_INTERRUPTS
-
-// Default to use interrupts within the native I2C drivers.
 #ifndef I2C_NO_INTERRUPTS
 #define I2C_USE_INTERRUPTS
 #endif
 
 // Status codes for I2CRB structures.
 enum : uint8_t {
-  // Codes used by Wire and by native drivers
   I2C_STATUS_OK=0,
   I2C_STATUS_TRUNCATED=1,
-  I2C_STATUS_NEGATIVE_ACKNOWLEDGE=2,
+  I2C_STATUS_DEVICE_NOT_PRESENT=2,
   I2C_STATUS_TRANSMIT_ERROR=3,
+  I2C_STATUS_NEGATIVE_ACKNOWLEDGE=4,
   I2C_STATUS_TIMEOUT=5,
-  // Code used by Wire only
-  I2C_STATUS_OTHER_TWI_ERROR=4, // catch-all error
-  // Codes used by native drivers only
   I2C_STATUS_ARBITRATION_LOST=6,
   I2C_STATUS_BUS_ERROR=7,
   I2C_STATUS_UNEXPECTED_ERROR=8,
@@ -160,16 +151,14 @@ typedef enum : uint8_t
 #define I2C_FREQ    400000L
 #endif
 
-// Class defining a request context for an I2C operation.
-class I2CRB {
-public:
+// Struct defining a request context for an I2C operation.
+struct I2CRB {
   volatile uint8_t status; // Completion status, or pending flag (updated from IRC)
   volatile uint8_t nBytes; // Number of bytes read (updated from IRC)
 
-  inline I2CRB() { status = I2C_STATUS_OK; };
   uint8_t wait();
   bool isBusy();
-
+  inline void init() { status = I2C_STATUS_OK; };
   void setReadParams(uint8_t i2cAddress, uint8_t *readBuffer, uint8_t readLen);
   void setRequestParams(uint8_t i2cAddress, uint8_t *readBuffer, uint8_t readLen, const uint8_t *writeBuffer, uint8_t writeLen);
   void setWriteParams(uint8_t i2cAddress, const uint8_t *writeBuffer, uint8_t writeLen);
@@ -224,18 +213,10 @@ public:
   // Loop method
   void loop();
 
-  // Expand error codes into text.  Note that they are in flash so 
-  // need to be printed using FSH.
-  static const FSH *getErrorMessage(uint8_t status);
-
 private:
   bool _beginCompleted = false;
   bool _clockSpeedFixed = false;
-#if defined(__arm__)
-  uint32_t _clockSpeed = 32000000L;  // 3.2MHz max on SAMD and STM32
-#else
   uint32_t _clockSpeed = 400000L;  // 400kHz max on Arduino.
-#endif
 
   // Finish off request block by waiting for completion and posting status.
   uint8_t finishRB(I2CRB *rb, uint8_t status);
@@ -254,7 +235,7 @@ private:
     // Mark volatile as they are updated by IRC and read/written elsewhere.
     static I2CRB * volatile queueHead;
     static I2CRB * volatile queueTail;
-    static volatile uint8_t state;
+    static volatile uint8_t status;
 
     static I2CRB * volatile currentRequest;
     static volatile uint8_t txCount;
@@ -277,9 +258,7 @@ private:
     static void I2C_close();
     
   public:
-    // setTimeout sets the timout value for I2C transactions.
-    // TODO: Get I2C timeout working before uncommenting the code below.
-    void setTimeout(unsigned long value) { (void)value; /* timeout = value; */ };
+    void setTimeout(unsigned long value) { timeout = value;};
 
     // handleInterrupt needs to be public to be called from the ISR function!
     static void handleInterrupt();

I2CManager_AVR.h

@@ -62,18 +62,7 @@
  *  Set I2C clock speed register.
  ***************************************************************************/
 void I2CManagerClass::I2C_setClock(unsigned long i2cClockSpeed) {
-  unsigned long temp = ((F_CPU / i2cClockSpeed) - 16) / 2;
-  for (uint8_t preScaler = 0; preScaler<=3; preScaler++) {
-    if (temp <= 255) {
-      TWBR = temp;
-      TWSR = (TWSR & 0xfc) | preScaler;
-      return;
-    } else 
-      temp /= 4;
-  }
-  // Set slowest speed ~= 500 bits/sec
-  TWBR = 255;
-  TWSR |= 0x03;
+  TWBR = ((F_CPU / i2cClockSpeed) - 16) / 2;
 }
 
 /***************************************************************************
@@ -147,7 +136,7 @@ void I2CManagerClass::I2C_handleInterrupt() {
       } else {  // Nothing left to send or receive
         TWDR = 0xff;  // Default condition = SDA released
         TWCR = (1<<TWEN)|(1<<TWINT)|(1<<TWEA)|(1<<TWSTO);  // Send Stop
-        state = I2C_STATUS_OK;
+        status = I2C_STATUS_OK;
       }
       break;
     case TWI_MRX_DATA_ACK:      // Data byte has been received and ACK transmitted
@@ -170,7 +159,7 @@ void I2CManagerClass::I2C_handleInterrupt() {
         bytesToReceive--;
       }
       TWCR = (1<<TWEN)|(1<<TWINT)|(1<<TWEA)|(1<<TWSTO);  // Send Stop
-      state = I2C_STATUS_OK;
+      status = I2C_STATUS_OK;
       break;
     case TWI_START:             // START has been transmitted  
     case TWI_REP_START:         // Repeated START has been transmitted
@@ -186,7 +175,7 @@ void I2CManagerClass::I2C_handleInterrupt() {
     case TWI_MTX_DATA_NACK:     // Data byte has been transmitted and NACK received
       TWDR = 0xff;  // Default condition = SDA released
       TWCR = (1<<TWEN)|(1<<TWINT)|(1<<TWEA)|(1<<TWSTO);  // Send Stop
-      state = I2C_STATUS_NEGATIVE_ACKNOWLEDGE;
+      status = I2C_STATUS_NEGATIVE_ACKNOWLEDGE;
       break;
     case TWI_ARB_LOST:          // Arbitration lost
       // Restart transaction from start.
@@ -196,7 +185,7 @@ void I2CManagerClass::I2C_handleInterrupt() {
     default:
       TWDR = 0xff;  // Default condition = SDA released
       TWCR = (1<<TWEN)|(1<<TWINT)|(1<<TWEA)|(1<<TWSTO);  // Send Stop
-      state = I2C_STATUS_TRANSMIT_ERROR;
+      status = I2C_STATUS_TRANSMIT_ERROR;
   }
 }
 

I2CManager_Mega4809.h

@@ -72,7 +72,7 @@ void I2CManagerClass::I2C_sendStart() {
   bytesToReceive = currentRequest->readLen;
 
   // If anything to send, initiate write.  Otherwise initiate read.
-  if (operation == OPERATION_READ || ((operation == OPERATION_REQUEST) && !bytesToSend))
+  if (operation == OPERATION_READ || (operation == OPERATION_REQUEST & !bytesToSend))
     TWI0.MADDR = (currentRequest->i2cAddress << 1) | 1;
   else
     TWI0.MADDR = (currentRequest->i2cAddress << 1) | 0;
@@ -105,14 +105,14 @@ void I2CManagerClass::I2C_handleInterrupt() {
     I2C_sendStart();   // Reinitiate request
   } else if (currentStatus & TWI_BUSERR_bm) {
     // Bus error
-    state = I2C_STATUS_BUS_ERROR;
+    status = I2C_STATUS_BUS_ERROR;
     TWI0.MSTATUS = currentStatus; // clear all flags
   } else if (currentStatus & TWI_WIF_bm) {
     // Master write completed
     if (currentStatus & TWI_RXACK_bm) {
       // Nacked, send stop.
       TWI0.MCTRLB = TWI_MCMD_STOP_gc;
-      state = I2C_STATUS_NEGATIVE_ACKNOWLEDGE;
+      status = I2C_STATUS_NEGATIVE_ACKNOWLEDGE;
     } else if (bytesToSend) {
       // Acked, so send next byte
       if (currentRequest->operation == OPERATION_SEND_P)
@@ -126,7 +126,7 @@ void I2CManagerClass::I2C_handleInterrupt() {
     } else {
       // No more data to send/receive. Initiate a STOP condition.
       TWI0.MCTRLB = TWI_MCMD_STOP_gc;
-      state = I2C_STATUS_OK;  // Done
+      status = I2C_STATUS_OK;  // Done
     }
   } else if (currentStatus & TWI_RIF_bm) {
     // Master read completed without errors
@@ -136,7 +136,7 @@ void I2CManagerClass::I2C_handleInterrupt() {
     } else { 
       // Buffer full, issue nack/stop
       TWI0.MCTRLB = TWI_ACKACT_bm | TWI_MCMD_STOP_gc;
-      state = I2C_STATUS_OK;
+      status = I2C_STATUS_OK;
     }
     if (bytesToReceive) {
       // More bytes to receive, issue ack and start another read
@@ -144,7 +144,7 @@ void I2CManagerClass::I2C_handleInterrupt() {
     } else {
       // Transaction finished, issue NACK and STOP.
       TWI0.MCTRLB = TWI_ACKACT_bm | TWI_MCMD_STOP_gc;
-      state = I2C_STATUS_OK;
+      status = I2C_STATUS_OK;
     }
   }
 }
@@ -157,4 +157,4 @@ ISR(TWI0_TWIM_vect) {
   I2CManagerClass::handleInterrupt();
 }
 
-#endif
+#endif

I2CManager_NonBlocking.h

@@ -1,7 +1,5 @@
 /*
- *  © 2022 Paul M Antoine
- *  © 2021, Neil McKechnie
- *  All rights reserved.
+ *  © 2021, Neil McKechnie. All rights reserved.
  *
  *  This file is part of CommandStation-EX
  *
@@ -25,46 +23,7 @@
 #include <Arduino.h>
 #include "I2CManager.h"
 #if defined(I2C_USE_INTERRUPTS)
-// atomic.h isn't available on SAMD, and likely others too...
-#if defined(__AVR__)
 #include <util/atomic.h>
-#elif defined(__arm__)
-// Helper assembly language functions
-static __inline__ uint8_t my_iSeiRetVal(void)
-{
-    __asm__ __volatile__ ("cpsie i" ::);
-    return 1;
-}
-
-static __inline__ uint8_t my_iCliRetVal(void)
-{
-    __asm__ __volatile__ ("cpsid i" ::);
-    return 1;
-}
-
-static __inline__ void my_iRestore(const  uint32_t *__s)
-{
-    uint32_t res = *__s;
-    __asm__ __volatile__ ("MSR primask, %0" : : "r" (res) );
-}
-
-static __inline__ uint32_t my_iGetIReg( void )
-{
-        uint32_t reg;
-        __asm__ __volatile__ ("MRS %0, primask" : "=r" (reg) );
-        return reg;
-}
-// Macros for atomic isolation
-#define MY_ATOMIC_RESTORESTATE uint32_t _sa_saved                           \
-    __attribute__((__cleanup__(my_iRestore))) = my_iGetIReg()
-
-#define ATOMIC()                                                         \
-for ( MY_ATOMIC_RESTORESTATE, _done =  my_iCliRetVal();                   \
-    _done; _done = 0 )
-
-#define ATOMIC_BLOCK(x) ATOMIC()
-#define ATOMIC_RESTORESTATE
-#endif
 #else
 #define ATOMIC_BLOCK(x) 
 #define ATOMIC_RESTORESTATE
@@ -82,7 +41,7 @@ for ( MY_ATOMIC_RESTORESTATE, _done =  my_iCliRetVal();                   \
 void I2CManagerClass::_initialise()
 {
   queueHead = queueTail = NULL;
-  state = I2C_STATE_FREE;
+  status = I2C_STATE_FREE;
   I2C_init();
 }
 
@@ -100,9 +59,10 @@ void I2CManagerClass::_setClock(unsigned long i2cClockSpeed) {
  ***************************************************************************/
 void I2CManagerClass::startTransaction() { 
   ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
-    if ((state == I2C_STATE_FREE) && (queueHead != NULL)) {
-      state = I2C_STATE_ACTIVE;
-      currentRequest = queueHead;
+    I2CRB *t = queueHead;
+    if ((status == I2C_STATE_FREE) && (t != NULL)) {
+      status = I2C_STATE_ACTIVE;
+      currentRequest = t;
       rxCount = txCount = 0;
       // Copy key fields to static data for speed.
       operation = currentRequest->operation;
@@ -125,9 +85,9 @@ void I2CManagerClass::queueRequest(I2CRB *req) {
       queueHead = queueTail = req;  // Only item on queue
     else
       queueTail = queueTail->nextRequest = req; // Add to end
-    startTransaction();
   }
 
+  startTransaction();
 }
 
 /***************************************************************************
@@ -170,16 +130,12 @@ uint8_t I2CManagerClass::read(uint8_t i2cAddress, uint8_t *readBuffer, uint8_t r
 /***************************************************************************
  * checkForTimeout() function, called from isBusy() and wait() to cancel
  * requests that are taking too long to complete.
- * This function doesn't fully work as intended so is not currently called.
- * Instead we check for an I2C hang-up and report an error from
- * I2CRB::wait(), but we aren't able to recover from the hang-up.  Such faults
- * may be caused by an I2C wire short for example.
  ***************************************************************************/
 void I2CManagerClass::checkForTimeout() {
   unsigned long currentMicros = micros();
   ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
     I2CRB *t = queueHead;
-    if (state==I2C_STATE_ACTIVE && t!=0 && t==currentRequest && timeout > 0) {
+    if (t && timeout > 0) {
       // Check for timeout
       if (currentMicros - startTime > timeout) { 
         // Excessive time. Dequeue request
@@ -192,9 +148,9 @@ void I2CManagerClass::checkForTimeout() {
         // Try close and init, not entirely satisfactory but sort of works...
         I2C_close();  // Shutdown and restart twi interface
         I2C_init();
-        state = I2C_STATE_FREE;
+        status = I2C_STATE_FREE;
         
-        // Initiate next queued request if any.
+        // Initiate next queued request
         startTransaction();
       }
     }
@@ -208,10 +164,9 @@ void I2CManagerClass::loop() {
 #if !defined(I2C_USE_INTERRUPTS)
   handleInterrupt();
 #endif
-  // Timeout is now reported in I2CRB::wait(), not here.
-  // I've left the code, commented out, as a reminder to look at this again
-  // in the future.
-  //checkForTimeout();
+  // If free, initiate next transaction
+  startTransaction();
+  checkForTimeout();
 }
 
 /***************************************************************************
@@ -220,32 +175,27 @@ void I2CManagerClass::loop() {
  ***************************************************************************/
 void I2CManagerClass::handleInterrupt() {
 
-  // Update hardware state machine
   I2C_handleInterrupt();
 
-  // Enable interrupts to minimise effect on other interrupt code
-  interrupts();
+  // Experimental -- perform the post processing with interrupts enabled.
+  //interrupts();
 
-  // Check if current request has completed.  If there's a current request
-  // and state isn't active then state contains the completion status of the request.
-  if (state != I2C_STATE_ACTIVE && currentRequest != NULL) {
+  if (status!=I2C_STATUS_PENDING) {
     // Remove completed request from head of queue
+    I2CRB * t;
     ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
-      I2CRB * t = queueHead;
-      if (t == queueHead) {
+      t = queueHead;
+      if (t != NULL) {
         queueHead = t->nextRequest;
         if (!queueHead) queueTail = queueHead;
         t->nBytes = rxCount;
-        t->status = state;
-        
-        // I2C state machine is now free for next request
-        currentRequest = NULL;
-        state = I2C_STATE_FREE;
-
-        // Start next request (if any)
-        I2CManager.startTransaction();
+        t->status = status;
       }
+      // I2C state machine is now free for next request
+      status = I2C_STATE_FREE;
     }
+    // Start next request (if any)
+    I2CManager.startTransaction();
   }
 }
 
@@ -253,7 +203,7 @@ void I2CManagerClass::handleInterrupt() {
 I2CRB * volatile I2CManagerClass::queueHead = NULL;
 I2CRB * volatile I2CManagerClass::queueTail = NULL;
 I2CRB * volatile I2CManagerClass::currentRequest = NULL;
-volatile uint8_t I2CManagerClass::state = I2C_STATE_FREE;
+volatile uint8_t I2CManagerClass::status = I2C_STATE_FREE;
 volatile uint8_t I2CManagerClass::txCount;
 volatile uint8_t I2CManagerClass::rxCount;
 volatile uint8_t I2CManagerClass::operation;

I2CManager_SAMD.h

@@ -1,243 +0,0 @@
-/*
- *  © 2022 Paul M Antoine
- *  © 2021, Neil McKechnie
- *  All rights reserved.
- *
- *  This file is part of CommandStation-EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef I2CMANAGER_SAMD_H
-#define I2CMANAGER_SAMD_H
-
-#include <Arduino.h>
-#include "I2CManager.h"
-
-//#include <avr/io.h>
-//#include <avr/interrupt.h>
-#include <wiring_private.h>
-
-/***************************************************************************
- *  Interrupt handler.
- *  IRQ handler for SERCOM3 which is the default I2C definition for Arduino Zero
- *  compatible variants such as the Sparkfun SAMD21 Dev Breakout etc.
- *  Later we may wish to allow use of an alternate I2C bus, or more than one I2C
- *  bus on the SAMD architecture 
- ***************************************************************************/
-#if defined(I2C_USE_INTERRUPTS) && defined(ARDUINO_SAMD_ZERO)
-void SERCOM3_Handler() {
-  I2CManagerClass::handleInterrupt();
-}
-#endif
-
-// Assume SERCOM3 for now - default I2C bus on Arduino Zero and variants of same
-Sercom *s = SERCOM3;
-
-/***************************************************************************
- *  Set I2C clock speed register.
- ***************************************************************************/
-void I2CManagerClass::I2C_setClock(uint32_t i2cClockSpeed) {
-
-  // Calculate a rise time appropriate to the requested bus speed
-  int t_rise;
-  if (i2cClockSpeed < 200000L) {
-    i2cClockSpeed = 100000L;
-    t_rise = 1000;
-  } else if (i2cClockSpeed < 800000L) {
-    i2cClockSpeed = 400000L;
-    t_rise = 300;
-  } else if (i2cClockSpeed < 1200000L) {
-    i2cClockSpeed = 1000000L;
-    t_rise = 120;
-  } else {
-    i2cClockSpeed = 100000L;
-    t_rise = 1000;
-  }
-
-  // Disable the I2C master mode and wait for sync
-  s->I2CM.CTRLA.bit.ENABLE = 0 ;
-  while (s->I2CM.SYNCBUSY.bit.ENABLE != 0);
-
-  // Calculate baudrate - using a rise time appropriate for the speed
-  s->I2CM.BAUD.bit.BAUD = SystemCoreClock / (2 * i2cClockSpeed) - 5 - (((SystemCoreClock / 1000000) * t_rise) / (2 * 1000));
-
-  // Enable the I2C master mode and wait for sync
-  s->I2CM.CTRLA.bit.ENABLE = 1 ;
-  while (s->I2CM.SYNCBUSY.bit.ENABLE != 0);
-
-  // Setting bus idle mode and wait for sync
-  s->I2CM.STATUS.bit.BUSSTATE = 1 ;
-  while (s->I2CM.SYNCBUSY.bit.SYSOP != 0);
-
-  return;
-}
-
-/***************************************************************************
- *  Initialise I2C registers.
- ***************************************************************************/
-void I2CManagerClass::I2C_init()
-{
-  //Setting clock
-  GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID(GCM_SERCOM3_CORE) | // Generic Clock 0 (SERCOM3)
-                      GCLK_CLKCTRL_GEN_GCLK0 | // Generic Clock Generator 0 is source
-                      GCLK_CLKCTRL_CLKEN ;
-
-  /* Wait for peripheral clock synchronization */
-  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
-
-  // Software reset the SERCOM
-  s->I2CM.CTRLA.bit.SWRST = 1;
-
-  //Wait both bits Software Reset from CTRLA and SYNCBUSY are equal to 0
-  while(s->I2CM.CTRLA.bit.SWRST || s->I2CM.SYNCBUSY.bit.SWRST);
-
-  // Set master mode and enable SCL Clock Stretch mode (stretch after ACK bit)
-  s->I2CM.CTRLA.reg =  SERCOM_I2CM_CTRLA_MODE( I2C_MASTER_OPERATION )/* |
-                            SERCOM_I2CM_CTRLA_SCLSM*/ ;
-
-  // Enable Smart mode and Quick Command
-  s->I2CM.CTRLB.reg =  SERCOM_I2CM_CTRLB_SMEN | SERCOM_I2CM_CTRLB_QCEN;
-
-#if defined(I2C_USE_INTERRUPTS)
-  // Setting NVIC
-  NVIC_EnableIRQ(SERCOM3_IRQn);
-  NVIC_SetPriority (SERCOM3_IRQn, 0);  /* set Priority */
-
-  // Enable all interrupts
-  s->I2CM.INTENSET.reg = SERCOM_I2CM_INTENSET_MB | SERCOM_I2CM_INTENSET_SB | SERCOM_I2CM_INTENSET_ERROR;
-#endif
-
-  // Calculate baudrate and set default rate for now
-  s->I2CM.BAUD.bit.BAUD = SystemCoreClock / ( 2 * I2C_FREQ) - 7 / (2 * 1000);
-
-  // Enable the I2C master mode and wait for sync
-  s->I2CM.CTRLA.bit.ENABLE = 1 ;
-  while (s->I2CM.SYNCBUSY.bit.ENABLE != 0);
-
-  // Setting bus idle mode and wait for sync
-  s->I2CM.STATUS.bit.BUSSTATE = 1 ;
-  while (s->I2CM.SYNCBUSY.bit.SYSOP != 0);
-
-  // Set SDA/SCL pins as outputs and enable pullups, at present we assume these are
-  // the default ones for SERCOM3 (see assumption above)
-  pinPeripheral(PIN_WIRE_SDA, g_APinDescription[PIN_WIRE_SDA].ulPinType);
-  pinPeripheral(PIN_WIRE_SCL, g_APinDescription[PIN_WIRE_SCL].ulPinType);
-
-  // Enable the SCL and SDA pins on the sercom: includes increased driver strength,
-  // pull-up resistors and pin multiplexer
-	PORT->Group[g_APinDescription[PIN_WIRE_SCL].ulPort].PINCFG[g_APinDescription[PIN_WIRE_SCL].ulPin].reg =  
-		PORT_PINCFG_DRVSTR | PORT_PINCFG_PULLEN | PORT_PINCFG_PMUXEN;  
-  PORT->Group[g_APinDescription[PIN_WIRE_SDA].ulPort].PINCFG[g_APinDescription[PIN_WIRE_SDA].ulPin].reg = 
-		PORT_PINCFG_DRVSTR | PORT_PINCFG_PULLEN | PORT_PINCFG_PMUXEN;
-}
-
-/***************************************************************************
- *  Initiate a start bit for transmission.
- ***************************************************************************/
-void I2CManagerClass::I2C_sendStart() {
-  bytesToSend = currentRequest->writeLen;
-  bytesToReceive = currentRequest->readLen;
-
-  // We may have initiated a stop bit before this without waiting for it.
-  // Wait for stop bit to be sent before sending start.
-  while (s->I2CM.STATUS.bit.BUSSTATE == 0x2);
-
-  // If anything to send, initiate write.  Otherwise initiate read.
-  if (operation == OPERATION_READ || ((operation == OPERATION_REQUEST) && !bytesToSend))
-  {
-    // Send start and address with read/write flag or'd in
-    s->I2CM.ADDR.bit.ADDR = (currentRequest->i2cAddress << 1) | 1;
-  }
-  else {
-    // Wait while the I2C bus is BUSY
-    while (s->I2CM.STATUS.bit.BUSSTATE != 0x1);
-    s->I2CM.ADDR.bit.ADDR = (currentRequest->i2cAddress << 1ul) | 0;
-  }
-}
-
-/***************************************************************************
- *  Initiate a stop bit for transmission (does not interrupt)
- ***************************************************************************/
-void I2CManagerClass::I2C_sendStop() {
-  s->I2CM.CTRLB.bit.CMD = 3; // Stop condition
-}
-
-/***************************************************************************
- *  Close I2C down
- ***************************************************************************/
-void I2CManagerClass::I2C_close() {
-  I2C_sendStop();
-}
-
-/***************************************************************************
- *  Main state machine for I2C, called from interrupt handler or,
- *  if I2C_USE_INTERRUPTS isn't defined, from the I2CManagerClass::loop() function
- *  (and therefore, indirectly, from I2CRB::wait() and I2CRB::isBusy()).
- ***************************************************************************/
-void I2CManagerClass::I2C_handleInterrupt() {
-
-  if (s->I2CM.STATUS.bit.ARBLOST) {
-    // Arbitration lost, restart
-    I2C_sendStart();   // Reinitiate request
-  } else if (s->I2CM.STATUS.bit.BUSERR) {
-    // Bus error
-    state = I2C_STATUS_BUS_ERROR;
-  } else if (s->I2CM.INTFLAG.bit.MB) {
-    // Master write completed
-    if (s->I2CM.STATUS.bit.RXNACK) {
-      // Nacked, send stop.
-      I2C_sendStop();
-      state = I2C_STATUS_NEGATIVE_ACKNOWLEDGE;
-    } else if (bytesToSend) {
-      // Acked, so send next byte
-      if (currentRequest->operation == OPERATION_SEND_P)
-        s->I2CM.DATA.bit.DATA = GETFLASH(currentRequest->writeBuffer + (txCount++));
-      else
-        s->I2CM.DATA.bit.DATA = currentRequest->writeBuffer[txCount++];
-      bytesToSend--;
-    } else if (bytesToReceive) {
-      // Last sent byte acked and no more to send.  Send repeated start, address and read bit.
-        s->I2CM.ADDR.bit.ADDR = (currentRequest->i2cAddress << 1) | 1;
-    } else {
-      // No more data to send/receive. Initiate a STOP condition.
-      I2C_sendStop();
-      state = I2C_STATUS_OK; // Done
-    }
-  } else if (s->I2CM.INTFLAG.bit.SB) {
-    // Master read completed without errors
-    if (bytesToReceive) {
-      currentRequest->readBuffer[rxCount++] = s->I2CM.DATA.bit.DATA;  // Store received byte
-      bytesToReceive--;
-    } else { 
-      // Buffer full, issue nack/stop
-      s->I2CM.CTRLB.bit.ACKACT = 1;
-      I2C_sendStop();
-      state = I2C_STATUS_OK;
-    }
-    if (bytesToReceive) {
-      // PMA - I think Smart Mode means we have nothing to do...
-      // More bytes to receive, issue ack and start another read
-    }
-    else
-    {
-      // Transaction finished, issue NACK and STOP.
-      s->I2CM.CTRLB.bit.ACKACT = 1;
-      I2C_sendStop();
-      state = I2C_STATUS_OK;
-    }
-  }
-}
-
-#endif /* I2CMANAGER_SAMD_H */

I2CManager_Wire.h

@@ -94,26 +94,26 @@ uint8_t I2CManagerClass::read(uint8_t address, uint8_t readBuffer[], uint8_t rea
 /***************************************************************************
  *  Function to queue a request block and initiate operations.
  * 
- * For the Wire version, this executes synchronously.
- * The read/write/write_P functions return I2C_STATUS_OK always, and the 
- * completion status of the operation is in the request block, as for
- * the non-blocking version.
+ * For the Wire version, this executes synchronously, but the status is
+ * returned in the I2CRB as for the asynchronous version.
  ***************************************************************************/
 void I2CManagerClass::queueRequest(I2CRB *req) {
+  uint8_t status;
   switch (req->operation) {
     case OPERATION_READ:
-      read(req->i2cAddress, req->readBuffer, req->readLen, NULL, 0, req);
+      status = read(req->i2cAddress, req->readBuffer, req->readLen, NULL, 0, req);
       break;
     case OPERATION_SEND:
-      write(req->i2cAddress, req->writeBuffer, req->writeLen, req);
+      status = write(req->i2cAddress, req->writeBuffer, req->writeLen, req);
       break;
     case OPERATION_SEND_P:
-      write_P(req->i2cAddress, req->writeBuffer, req->writeLen, req);
+      status = write_P(req->i2cAddress, req->writeBuffer, req->writeLen, req);
       break;
     case OPERATION_REQUEST:
-      read(req->i2cAddress, req->readBuffer, req->readLen, req->writeBuffer, req->writeLen, req);
+      status = read(req->i2cAddress, req->readBuffer, req->readLen, req->writeBuffer, req->writeLen, req);
       break;
   }
+  req->status = status;
 }
 
 /***************************************************************************

IODevice.cpp

@@ -1,7 +1,5 @@
 /*
- *  © 2021 Neil McKechnie
- *  © 2021 Harald Barth
- *  All rights reserved.
+ *  © 2021, Neil McKechnie. All rights reserved.
  *  
  *  This file is part of DCC++EX API
  *
@@ -30,10 +28,6 @@
 #define USE_FAST_IO
 #endif
 
-// Link to halSetup function.  If not defined, the function reference will be NULL.
-extern __attribute__((weak)) void halSetup();
-extern __attribute__((weak)) void exrailHalSetup();
-
 //==================================================================================================================
 // Static methods
 //------------------------------------------------------------------------------------------------------------------
@@ -47,26 +41,12 @@ extern __attribute__((weak)) void exrailHalSetup();
 // Create any standard device instances that may be required, such as the Arduino pins 
 // and PCA9685.
 void IODevice::begin() {
-  // Call user's halSetup() function (if defined in the build in myHal.cpp).
-  //  The contents will depend on the user's system hardware configuration.
-  //  The myHal.cpp file is a standard C++ module so has access to all of the DCC++EX APIs.
-  
-  // This is done first so that the following defaults will detect an overlap and not
-  // create something that conflicts with the users vpin definitions. 
-  if (halSetup)
-    halSetup();
-
-  // include any HAL devices defined in exrail. 
-  if (exrailHalSetup)
-    exrailHalSetup();
-
-  // Initialise the IO subsystem defaults
+  // Initialise the IO subsystem
   ArduinoPins::create(2, NUM_DIGITAL_PINS-2);  // Reserve pins for direct access
   // Predefine two PCA9685 modules 0x40-0x41
   // Allocates 32 pins 100-131
   PCA9685::create(100, 16, 0x40);
   PCA9685::create(116, 16, 0x41);
-  
   // Predefine two MCP23017 module 0x20/0x21
   // Allocates 32 pins 164-195
   MCP23017::create(164, 16, 0x20);
@@ -87,54 +67,32 @@ void IODevice::begin() {
 // doesn't need to invoke it.
 void IODevice::loop() {
   unsigned long currentMicros = micros();
-  
-  IODevice *lastLoopDevice = _nextLoopDevice;  // So we know when to stop...
-  // Loop through devices until we find one ready to be serviced.
-  do {
-    if (!_nextLoopDevice) _nextLoopDevice = _firstDevice;
-    if (_nextLoopDevice) {
-      if (_nextLoopDevice->_deviceState != DEVSTATE_FAILED 
-            && ((long)(currentMicros - _nextLoopDevice->_nextEntryTime)) >= 0) {
-        // Found one ready to run, so invoke its _loop method.
-        _nextLoopDevice->_nextEntryTime = currentMicros;
-        _nextLoopDevice->_loop(currentMicros);
-        _nextLoopDevice = _nextLoopDevice->_nextDevice;
-        break;
-      }
-      // Not this one, move to next one
-      _nextLoopDevice = _nextLoopDevice->_nextDevice;
-    }
-  } while (_nextLoopDevice != lastLoopDevice); // Stop looking when we've done all.
+  // Call every device's loop function in turn, one per entry.
+  if (!_nextLoopDevice) _nextLoopDevice = _firstDevice;
+  _nextLoopDevice->_loop(currentMicros);
+  _nextLoopDevice = _nextLoopDevice->_nextDevice;
   
   // Report loop time if diags enabled
 #if defined(DIAG_LOOPTIMES)
   static unsigned long lastMicros = 0;
-  // Measure time since loop() method started.
-  unsigned long halElapsed = micros() - currentMicros;
-  // Measure time between loop() method entries.
-  unsigned long elapsed = currentMicros - lastMicros;
-  static unsigned long maxElapsed = 0, maxHalElapsed = 0;
+  static unsigned long maxElapsed = 0;
   static unsigned long lastOutputTime = 0;
-  static unsigned long halTotal = 0, total = 0;
   static unsigned long count = 0;
   const unsigned long interval = (unsigned long)5 * 1000 * 1000; // 5 seconds in microsec
-
+  unsigned long elapsed = currentMicros - lastMicros;
   // Ignore long loop counts while message is still outputting
   if (currentMicros - lastOutputTime > 3000UL) {
     if (elapsed > maxElapsed) maxElapsed = elapsed;
-    if (halElapsed > maxHalElapsed) maxHalElapsed = halElapsed;
-    halTotal += halElapsed;
-    total += elapsed;
-    count++;
   }
+  count++;
   if (currentMicros - lastOutputTime > interval) {
     if (lastOutputTime > 0) 
-      DIAG(F("Loop Total:%lus (%lus max) HAL:%lus (%lus max)"), 
-        total/count, maxElapsed, halTotal/count, maxHalElapsed);
-    maxElapsed = maxHalElapsed = total = halTotal = count = 0;
+      LCD(1,F("Loop=%lus,%lus max"), interval/count, maxElapsed);
+    maxElapsed = 0;
+    count = 0;
     lastOutputTime = currentMicros;
   }
-  lastMicros = currentMicros;
+  lastMicros = micros();
 #endif
 }
 
@@ -154,13 +112,12 @@ bool IODevice::exists(VPIN vpin) {
 bool IODevice::hasCallback(VPIN vpin) {
   IODevice *dev = findDevice(vpin);
   if (!dev) return false;
-  return dev->_hasCallback;
+  return dev->_hasCallback(vpin);
 }
 
 // Display (to diagnostics) details of the device.
 void IODevice::_display() {
-  DIAG(F("Unknown device Vpins:%d-%d %S"), 
-    (int)_firstVpin, (int)_firstVpin+_nPins-1, _deviceState==DEVSTATE_FAILED ? F("OFFLINE") : F(""));
+  DIAG(F("Unknown device Vpins:%d-%d"), (int)_firstVpin, (int)_firstVpin+_nPins-1);
 }
 
 // Find device associated with nominated Vpin and pass configuration values on to it.
@@ -168,33 +125,6 @@ void IODevice::_display() {
 bool IODevice::configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, int params[]) {
   IODevice *dev = findDevice(vpin);
   if (dev) return dev->_configure(vpin, configType, paramCount, params);
-#ifdef DIAG_IO
-  DIAG(F("IODevice::configure(): Vpin ID %d not found!"), (int)vpin);
-#endif
-  return false;
-}
-
-// Read value from virtual pin.
-int IODevice::read(VPIN vpin) {
-  for (IODevice *dev = _firstDevice; dev != 0; dev = dev->_nextDevice) {
-    if (dev->owns(vpin)) 
-      return dev->_read(vpin);
-  }
-#ifdef DIAG_IO
-  DIAG(F("IODevice::read(): Vpin %d not found!"), (int)vpin);
-#endif
-  return false;
-}
-
-// Read analogue value from virtual pin.
-int IODevice::readAnalogue(VPIN vpin) {
-  for (IODevice *dev = _firstDevice; dev != 0; dev = dev->_nextDevice) {
-    if (dev->owns(vpin)) 
-      return dev->_readAnalogue(vpin);
-  }
-#ifdef DIAG_IO
-  DIAG(F("IODevice::readAnalogue(): Vpin %d not found!"), (int)vpin);
-#endif
   return false;
 }
 
@@ -207,36 +137,29 @@ void IODevice::write(VPIN vpin, int value) {
     return;
   }
 #ifdef DIAG_IO
-  DIAG(F("IODevice::write(): Vpin ID %d not found!"), (int)vpin);
+  //DIAG(F("IODevice::write(): Vpin ID %d not found!"), (int)vpin);
 #endif
 }
 
-// Write analogue value to virtual pin(s).  If multiple devices are allocated
-// the same pin then only the first one found will be used.
-//
-// The significance of param1 and param2 may vary from device to device.
-// For servo controllers, param1 is the profile of the transition and param2
-// the duration, i.e. the time that the operation is to be animated over
-// in deciseconds (0-3276 sec)
-//
-void IODevice::writeAnalogue(VPIN vpin, int value, uint8_t param1, uint16_t param2) {
+// Write analogue value to virtual pin(s).  If multiple devices are allocated the same pin
+//  then only the first one found will be used.
+void IODevice::writeAnalogue(VPIN vpin, int value, int profile) {
   IODevice *dev = findDevice(vpin);
   if (dev) {
-    dev->_writeAnalogue(vpin, value, param1, param2);
+    dev->_writeAnalogue(vpin, value, profile);
     return;
   }
 #ifdef DIAG_IO
-  DIAG(F("IODevice::writeAnalogue(): Vpin ID %d not found!"), (int)vpin);
+  //DIAG(F("IODevice::writeAnalogue(): Vpin ID %d not found!"), (int)vpin);
 #endif
 }
 
-// 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.
-bool IODevice::isBusy(VPIN vpin) {
+// isActive returns true if the device is currently in an animation of some sort, e.g. is changing
+//  the output over a period of time.
+bool IODevice::isActive(VPIN vpin) {
   IODevice *dev = findDevice(vpin);
   if (dev) 
-    return dev->_read(vpin);
+    return dev->_isActive(vpin);
   else
     return false;
 }
@@ -268,46 +191,15 @@ void IODevice::addDevice(IODevice *newDevice) {
     newDevice->_begin();
 }
 
-// Private helper function to locate a device by VPIN.  Returns NULL if not found.
-//  This is performance-critical, so minimises the calculation and function calls necessary.
+// Private helper function to locate a device by VPIN.  Returns NULL if not found
 IODevice *IODevice::findDevice(VPIN vpin) { 
   for (IODevice *dev = _firstDevice; dev != 0; dev = dev->_nextDevice) {
-    VPIN firstVpin = dev->_firstVpin;
-    if (vpin >= firstVpin && vpin < firstVpin+dev->_nPins)
+    if (dev->owns(vpin)) 
       return dev;
   }
   return NULL;
 }
-
-// Private helper function to check for vpin overlap. Run during setup only.
-// returns true if pins DONT overlap with existing device
-bool IODevice::checkNoOverlap(VPIN firstPin, uint8_t nPins, uint8_t i2cAddress) {
-#ifdef DIAG_IO
-  DIAG(F("Check no overlap %d %d 0x%x"), firstPin,nPins,i2cAddress);
-#endif
-  VPIN lastPin=firstPin+nPins-1;
-  for (IODevice *dev = _firstDevice; dev != 0; dev = dev->_nextDevice) {
-    
-    // check for pin range overlaps (verbose but compiler will fix that)  
-    VPIN firstDevPin=dev->_firstVpin;
-    VPIN lastDevPin=firstDevPin+dev->_nPins-1;
-    bool noOverlap= firstPin>lastDevPin || lastPin<firstDevPin;
-    if (!noOverlap) {
-        DIAG(F("WARNING HAL Overlap definition of pins  %d to %d ignored."),
-            firstPin, lastPin);
-        return false;
-    } 
   
-    // Check for overlapping I2C address
-    if (i2cAddress && dev->_I2CAddress==i2cAddress) {
-      DIAG(F("WARNING HAL Overlap. i2c Addr 0x%x ignored."),i2cAddress);
-      return false;
-    } 
-  }
-  return true;  // no overlaps... OK to go on with constructor
-}
-  
-
 //==================================================================================================================
 // Static data
 //------------------------------------------------------------------------------------------------------------------
@@ -334,45 +226,54 @@ bool IODevice::owns(VPIN id) {
   return (id >= _firstVpin && id < _firstVpin + _nPins);
 }
 
+// Read value from virtual pin.
+int IODevice::read(VPIN vpin) {
+  for (IODevice *dev = _firstDevice; dev != 0; dev = dev->_nextDevice) {
+    if (dev->owns(vpin)) 
+      return dev->_read(vpin);
+  }
+#ifdef DIAG_IO
+  //DIAG(F("IODevice::read(): Vpin %d not found!"), (int)vpin);
+#endif
+  return false;
+}
+
 
 #else // !defined(IO_NO_HAL)
 
 // Minimal implementations of public HAL interface, to support Arduino pin I/O and nothing more.
 
 void IODevice::begin() { DIAG(F("NO HAL CONFIGURED!")); }
-bool IODevice::configure(VPIN pin, ConfigTypeEnum configType, int nParams, int p[]) {
-  if (configType!=CONFIGURE_INPUT || nParams!=1 || pin >= NUM_DIGITAL_PINS) return false;
-  #ifdef DIAG_IO
-  DIAG(F("Arduino _configurePullup Pin:%d Val:%d"), pin, p[0]);
-  #endif
-  pinMode(pin, p[0] ? INPUT_PULLUP : INPUT);
-  return true;
+bool IODevice::configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, int params[]) {
+  (void)vpin; (void)paramCount; (void)params; // Avoid compiler warnings
+  if (configType == CONFIGURE_INPUT || configType == CONFIGURE_OUTPUT) 
+    return true;
+  else
+    return false;
 }
 void IODevice::write(VPIN vpin, int value) {
-  if (vpin >= NUM_DIGITAL_PINS) return;
   digitalWrite(vpin, value);
   pinMode(vpin, OUTPUT);
 }
-void IODevice::writeAnalogue(VPIN, int, uint8_t, uint16_t) {}
-bool IODevice::isBusy(VPIN) { return false; }
-bool IODevice::hasCallback(VPIN) { return false; }
-int IODevice::read(VPIN vpin) { 
-  if (vpin >= NUM_DIGITAL_PINS) return 0;
-  return !digitalRead(vpin);  // Return inverted state (5v=0, 0v=1)
+void IODevice::writeAnalogue(VPIN vpin, int value, int profile) {
+  (void)vpin; (void)value; (void)profile; // Avoid compiler warnings
 }
-int IODevice::readAnalogue(VPIN vpin) {
-  pinMode(vpin, INPUT);
-  noInterrupts();
-  int value = analogRead(vpin);
-  interrupts();
-  return value;
+bool IODevice::hasCallback(VPIN vpin) { 
+  (void)vpin;  // Avoid compiler warnings
+  return false; 
+}
+int IODevice::read(VPIN vpin) { 
+  pinMode(vpin, INPUT_PULLUP);
+  return !digitalRead(vpin);  // Return inverted state (5v=0, 0v=1)
 }
 void IODevice::loop() {}
 void IODevice::DumpAll() {
   DIAG(F("NO HAL CONFIGURED!"));
 }
-bool IODevice::exists(VPIN vpin) { return (vpin > 2 && vpin < NUM_DIGITAL_PINS); }
-void IODevice::setGPIOInterruptPin(int16_t) {}
+bool IODevice::exists(VPIN vpin) { return (vpin > 2 && vpin < 49); }
+void IODevice::setGPIOInterruptPin(int16_t pinNumber) {
+  (void) pinNumber; // Avoid compiler warning
+}
 
 // Chain of callback blocks (identifying registered callback functions for state changes)
 // Not used in IO_NO_HAL but must be declared.
@@ -387,14 +288,12 @@ IONotifyCallback *IONotifyCallback::first = 0;
 ArduinoPins::ArduinoPins(VPIN firstVpin, int nPins) {
   _firstVpin = firstVpin;
   _nPins = nPins;
-  int arrayLen = (_nPins+7)/8;
-  _pinPullups = (uint8_t *)calloc(3, arrayLen);
+  uint8_t arrayLen = (_nPins+7)/8;
+  _pinPullups = (uint8_t *)calloc(2, arrayLen);
   _pinModes = (&_pinPullups[0]) + arrayLen;
-  _pinInUse = (&_pinPullups[0]) + 2*arrayLen;
   for (int i=0; i<arrayLen; i++) {
-    _pinPullups[i] = 0xff;  // default to pullup on, for inputs
+    _pinPullups[i] = 0;
     _pinModes[i] = 0;
-    _pinInUse[i] = 0;
   }
 }
 
@@ -419,7 +318,6 @@ bool ArduinoPins::_configure(VPIN vpin, ConfigTypeEnum configType, int paramCoun
     _pinPullups[index] &= ~mask;
     pinMode(pin, INPUT);
   }
-  _pinInUse[index] |= mask;
   return true;
 }
 
@@ -438,35 +336,11 @@ void ArduinoPins::_write(VPIN vpin, int value) {
     _pinModes[index] |= mask;
     // Since mode changes should be infrequent, use standard pinMode function
     pinMode(pin, OUTPUT);
-    _pinInUse[index] |= mask;
   }
 }
 
-// Device-specific read function (digital input).
+// Device-specific read function.
 int ArduinoPins::_read(VPIN vpin) {
-  int pin = vpin;
-  uint8_t mask = 1 << ((pin-_firstVpin) % 8);
-  uint8_t index = (pin-_firstVpin) / 8;
-  if ((_pinModes[index] | ~_pinInUse[index]) & mask) {
-    // Currently in write mode or not initialised, change to read mode
-    _pinModes[index] &= ~mask;
-    // Since mode changes should be infrequent, use standard pinMode function
-    if (_pinPullups[index] & mask) 
-      pinMode(pin, INPUT_PULLUP);
-    else
-      pinMode(pin, INPUT);
-    _pinInUse[index] |= mask;
-  }
-  int value = !fastReadDigital(pin); // Invert (5v=0, 0v=1)
-
-  #ifdef DIAG_IO
-  //DIAG(F("Arduino Read Pin:%d Value:%d"), pin, value);
-  #endif
-  return value;
-}
-
-// Device-specific readAnalogue function (analogue input)
-int ArduinoPins::_readAnalogue(VPIN vpin) {
   int pin = vpin;
   uint8_t mask = 1 << ((pin-_firstVpin) % 8);
   uint8_t index = (pin-_firstVpin) / 8;
@@ -479,22 +353,10 @@ int ArduinoPins::_readAnalogue(VPIN vpin) {
     else
       pinMode(pin, INPUT);
   }
-
-  // Since AnalogRead is also called from interrupt code, disable interrupts 
-  // while we're using it.  There's only one ADC shared by all analogue inputs 
-  // on the Arduino, so we don't want interruptions.
-  //******************************************************************************
-  // NOTE: If the HAL is running on a computer without the DCC signal generator,
-  // then interrupts needn't be disabled.  Also, the DCC signal generator puts
-  // the ADC into fast mode, so if it isn't present, analogueRead calls will be much
-  // slower!!
-  //******************************************************************************
-  noInterrupts();
-  int value = analogRead(pin);
-  interrupts();
+  int value = !fastReadDigital(pin); // Invert (5v=0, 0v=1)
 
   #ifdef DIAG_IO
-  DIAG(F("Arduino Read Pin:%d Value:%d"), pin, value);
+  //DIAG(F("Arduino Read Pin:%d Value:%d"), pin, value);
   #endif
   return value;
 }

IODevice.h

@@ -42,7 +42,6 @@
 #include "DIAG.h"
 #include "FSH.h"
 #include "I2CManager.h"
-#include "inttypes.h"
 
 typedef uint16_t VPIN;
 // Limit VPIN number to max 32767.  Above this number, printing often gives negative values.
@@ -113,27 +112,15 @@ public:
   // configure is used invoke an IODevice instance's _configure method
   static bool configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, int params[]);
 
-  // User-friendly function for configuring an input pin.
-  inline static bool configureInput(VPIN vpin, bool pullupEnable) {
-    int params[] = {pullupEnable};
-    return IODevice::configure(vpin, CONFIGURE_INPUT, 1, params);
-  }
-
-  // User-friendly function for configuring a servo pin.
-  inline static bool configureServo(VPIN vpin, uint16_t activePosition, uint16_t inactivePosition, uint8_t profile=0, uint16_t duration=0, uint8_t initialState=0) {
-    int params[] = {(int)activePosition, (int)inactivePosition, profile, (int)duration, initialState};
-    return IODevice::configure(vpin, CONFIGURE_SERVO, 5, params);
-  }
-
   // write invokes the IODevice instance's _write method.
   static void write(VPIN vpin, int value);
 
   // 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 writeAnalogue(VPIN vpin, int value, int profile);
 
-  // isBusy returns true if the device is currently in an animation of some sort, e.g. is changing
+  // isActive returns true if the device is currently in an animation of some sort, e.g. is changing
   //  the output over a period of time.
-  static bool isBusy(VPIN vpin);
+  static bool isActive(VPIN vpin);
 
   // check whether the pin supports notification.  If so, then regular _read calls are not required.
   static bool hasCallback(VPIN vpin);
@@ -141,9 +128,6 @@ public:
   // read invokes the IODevice instance's _read method.
   static int read(VPIN vpin);
 
-  // read invokes the IODevice instance's _readAnalogue method.
-  static int readAnalogue(VPIN vpin);
-
   // loop invokes the IODevice instance's _loop method.
   static void loop();
 
@@ -163,15 +147,7 @@ public:
   
 protected:
   
-  // Constructor
-  IODevice(VPIN firstVpin=0, int nPins=0) {
-    _firstVpin = firstVpin;
-    _nPins = nPins;
-    _nextEntryTime = 0;
-    _I2CAddress=0;
-  }
-
- // Method to perform initialisation of the device (optionally implemented within device class)
+  // Method to perform initialisation of the device (optionally implemented within device class)
   virtual void _begin() {}
 
   // Method to configure device (optionally implemented within device class)
@@ -185,26 +161,41 @@ protected:
     (void)vpin; (void)value;
   };
 
-  // Method to write an 'analogue' value (optionally implemented within device class)
-  virtual void _writeAnalogue(VPIN vpin, int value, uint8_t param1, uint16_t param2) {
-    (void)vpin; (void)value; (void) param1; (void)param2;
+  // Method to write an analogue value (optionally implemented within device class)
+  virtual  void _writeAnalogue(VPIN vpin, int value, int profile) {
+    (void)vpin; (void)value; (void) profile;
   };
 
-  // Method to read digital pin state (optionally implemented within device class)
+  // Method called from within a filter device to trigger its output (which may
+  // have the same VPIN id as the input to the filter).  It works through the 
+  // later devices in the chain only.
+  void writeDownstream(VPIN vpin, int value);
+
+  // Function called to check whether callback notification is supported by this pin.
+  //  Defaults to no, if not overridden by the device.
+  //  The same value should be returned by all pins on the device, so only one need
+  //  be checked.
+  virtual bool _hasCallback(VPIN vpin) { 
+    (void) vpin;
+    return false; 
+  }
+
+  // Method to read pin state (optionally implemented within device class)
   virtual int _read(VPIN vpin) { 
     (void)vpin; 
     return 0;
   };
 
-  // Method to read analogue pin state (optionally implemented within device class)
-  virtual int _readAnalogue(VPIN vpin) { 
-    (void)vpin; 
-    return 0;
-  };
+  // _isActive returns true if the device is currently in an animation of some sort, e.g. is changing
+  //  the output over a period of time.  Returns false unless overridden in sub class.
+  virtual bool _isActive(VPIN vpin) {
+      (void)vpin;
+      return false;
+  }
 
   // Method to perform updates on an ongoing basis (optionally implemented within device class)
   virtual void _loop(unsigned long currentMicros) {
-    delayUntil(currentMicros + 0x7fffffff); // Largest time in the future!  Effectively disable _loop calls.
+    (void)currentMicros; // Suppress compiler warning.
   };
 
   // Method for displaying info on DIAG output (optionally implemented within device class)
@@ -212,25 +203,14 @@ protected:
 
   // Destructor
   virtual ~IODevice() {};
-
-  // Non-virtual function
-  void delayUntil(unsigned long futureMicrosCount) {
-    _nextEntryTime = futureMicrosCount;
-  }
   
   // Common object fields.
   VPIN _firstVpin;
   int _nPins;
-  uint8_t _I2CAddress;
-  // Flag whether the device supports callbacks.
-  bool _hasCallback = false;
 
   // Pin number of interrupt pin for GPIO extender devices.  The extender module will pull this
   //  pin low if an input changes state.
   int16_t _gpioInterruptPin = -1;
-    
-  // Method to check if pins will overlap before creating new device. 
-  static bool checkNoOverlap(VPIN firstPin, uint8_t nPins=1, uint8_t i2cAddress=0);
 
   // Static support function for subclass creation
   static void addDevice(IODevice *newDevice);
@@ -243,8 +223,8 @@ private:
   bool owns(VPIN vpin);
   // Method to find device handling Vpin
   static IODevice *findDevice(VPIN vpin);
+
   IODevice *_nextDevice = 0;
-  unsigned long _nextEntryTime;
   static IODevice *_firstDevice;
 
   static IODevice *_nextLoopDevice;
@@ -260,31 +240,30 @@ private:
 class PCA9685 : public IODevice {
 public:
   static void create(VPIN vpin, int nPins, uint8_t I2CAddress);
-  enum ProfileType : uint8_t {
-    Instant = 0,  // Moves immediately between positions (if duration not specified)
-    UseDuration = 0, // Use specified duration
+  // Constructor
+  PCA9685(VPIN vpin, int nPins, uint8_t I2CAddress);
+  enum ProfileType {
+    Instant = 0,  // Moves immediately between positions
     Fast = 1,     // Takes around 500ms end-to-end
     Medium = 2,   // 1 second end-to-end
     Slow = 3,     // 2 seconds end-to-end
-    Bounce = 4,   // For semaphores/turnouts with a bit of bounce!!
-    NoPowerOff = 0x80, // Flag to be ORed in to suppress power off after move.
+    Bounce = 4    // For semaphores/turnouts with a bit of bounce!!
   };
 
 private:
-  // Constructor
-  PCA9685(VPIN vpin, int nPins, uint8_t I2CAddress);
   // Device-specific initialisation
   void _begin() override;
   bool _configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, int params[]) override;
   // Device-specific write functions.
   void _write(VPIN vpin, int value) override;
-  void _writeAnalogue(VPIN vpin, int value, uint8_t profile, uint16_t duration) override;
-  int _read(VPIN vpin) override; // returns the digital state or busy status of the device
+  void _writeAnalogue(VPIN vpin, int value, int profile) override;
+  bool _isActive(VPIN vpin) override;
   void _loop(unsigned long currentMicros) override;
   void updatePosition(uint8_t pin);
   void writeDevice(uint8_t pin, int value);
   void _display() override;
-  
+
+  uint8_t _I2CAddress; // 0x40-0x43 possible
 
   struct ServoData {
     uint16_t activePosition : 12; // Config parameter
@@ -293,18 +272,21 @@ private:
     uint16_t fromPosition : 12;
     uint16_t toPosition : 12; 
     uint8_t profile;  // Config parameter
-    uint16_t stepNumber; // Index of current step (starting from 0)
-    uint16_t numSteps;  // Number of steps in animation, or 0 if none in progress.
-    uint8_t currentProfile; // profile being used for current animation.
-    uint16_t duration; // time (tenths of a second) for animation to complete.
-  }; // 14 bytes per element, i.e. per pin in use
+    uint8_t stepNumber; // Index of current step (starting from 0)
+    uint8_t numSteps;  // Number of steps in animation, or 0 if none in progress.
+    int8_t state;
+  }; // 12 bytes per element, i.e. per pin in use
   
   struct ServoData *_servoData [16];
 
+  static const uint16_t _defaultActivePosition = 410;
+  static const uint16_t _defaultInactivePosition = 205;
+
   static const uint8_t _catchupSteps = 5; // number of steps to wait before switching servo off
   static const byte FLASH _bounceProfile[30];
 
   const unsigned int refreshInterval = 50; // refresh every 50ms
+  unsigned long _lastRefreshTime; // last seen value of micros() count
 
   // structures for setting up non-blocking writes to servo controller
   I2CRB requestBlock;
@@ -319,10 +301,10 @@ private:
 class DCCAccessoryDecoder: public IODevice {
 public:
   static void create(VPIN firstVpin, int nPins, int DCCAddress, int DCCSubaddress);
-
-private:
   // Constructor
   DCCAccessoryDecoder(VPIN firstVpin, int nPins, int DCCAddress, int DCCSubaddress);
+
+private:
   // Device-specific write function.
   void _begin() override;
   void _write(VPIN vpin, int value) override;
@@ -342,59 +324,24 @@ public:
     addDevice(new ArduinoPins(firstVpin, nPins));
   }
   
+  // Constructor
+  ArduinoPins(VPIN firstVpin, int nPins);
+
   static void fastWriteDigital(uint8_t pin, uint8_t value);
   static bool fastReadDigital(uint8_t pin);
 
 private:
-  // Constructor
-  ArduinoPins(VPIN firstVpin, int nPins);
-
   // Device-specific pin configuration
   bool _configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, int params[]) override;
   // Device-specific write function.
   void _write(VPIN vpin, int value) override;
-  // Device-specific read functions.
+  // Device-specific read function.
   int _read(VPIN vpin) override;
-  int _readAnalogue(VPIN vpin) override;
   void _display() override;
 
 
   uint8_t *_pinPullups;
   uint8_t *_pinModes; // each bit is 1 for output, 0 for input
-  uint8_t *_pinInUse; 
-};
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/*
- * IODevice subclass for EX-Turntable.
- */
- 
-class EXTurntable : public IODevice {
-public:
-  static void create(VPIN firstVpin, int nPins, uint8_t I2CAddress);
-  // Constructor
-  EXTurntable(VPIN firstVpin, int nPins, uint8_t I2CAddress);
-  enum ActivityNumber : uint8_t {
-    Turn = 0,             // Rotate turntable, maintain phase
-    Turn_PInvert = 1,     // Rotate turntable, invert phase
-    Home = 2,             // Initiate homing
-    Calibrate = 3,        // Initiate calibration sequence
-    LED_On = 4,           // Turn LED on
-    LED_Slow = 5,         // Set LED to a slow blink
-    LED_Fast = 6,         // Set LED to a fast blink
-    LED_Off = 7,          // Turn LED off
-    Acc_On = 8,           // Turn accessory pin on
-    Acc_Off = 9,          // Turn accessory pin off
-  };
-
-private:
-  // Device-specific write function.
-  void _begin() override;
-  void _loop(unsigned long currentMicros) override;
-  int _read(VPIN vpin) override;
-  void _writeAnalogue(VPIN vpin, int value, uint8_t activity, uint16_t duration) override;
-  void _display() override;
-  uint8_t _stepperStatus;
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////

IO_AnalogueInputs.h

@@ -1,165 +0,0 @@
-/*
- *  © 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_analogueinputs_h
-#define io_analogueinputs_h
-
-// Uncomment following line to slow the scan cycle down to 1second ADC samples, with
-// diagnostic output of scanned values.
-//#define IO_ANALOGUE_SLOW
-
-#include "IODevice.h"
-#include "I2CManager.h"
-#include "DIAG.h"
-#include "FSH.h"
-
-/**********************************************************************************************
- * ADS111x class for I2C-connected analogue input modules ADS1113, ADS1114 and ADS1115.
- * 
- * ADS1113 and ADS1114 are restricted to 1 input.  ADS1115 has a multiplexer which allows 
- * any of four input pins to be read by its ADC.
- * 
- * The driver polls the device in accordance with the constant 'scanInterval' below.  On first loop
- * entry, the multiplexer is set to pin A0 and the ADC is triggered.  On second and subsequent
- * entries, the analogue value is read from the conversion register and then the multiplexer and
- * ADC are set up to read the next pin.
- * 
- * The ADS111x is set up as follows:
- *    Single-shot scan
- *    Data rate 128 samples/sec (7.8ms/sample, but scanned every 10ms)
- *    Comparator off
- *    Gain FSR=6.144V
- * The gain means that the maximum input voltage of 5V (when Vss=5V) gives a reading 
- * of 32767*(5.0/6.144) = 26666.
- * 
- * A device is configured by the following:
- *   ADS111x::create(firstVpin, nPins, i2cAddress);
- * for example
- *   ADS111x::create(300, 1, 0x48);  // single-input ADS1113
- *   ADS111x::create(300, 4, 0x48);  // four-input ADS1115
- * 
- * Note: The device is simple and does not need initial configuration, so it should recover from
- * temporary loss of communications or power.
- **********************************************************************************************/
-class ADS111x: public IODevice { 
-public:
-  static void create(VPIN firstVpin, int nPins, uint8_t i2cAddress) {
-    if (checkNoOverlap(firstVpin,nPins,i2cAddress)) new ADS111x(firstVpin, nPins, i2cAddress);
-  }
-private:
-  ADS111x(VPIN firstVpin, int nPins, uint8_t i2cAddress) {
-    _firstVpin = firstVpin;
-    _nPins = min(nPins,4);
-    _i2cAddress = i2cAddress;
-    _currentPin = 0;
-    for (int8_t i=0; i<_nPins; i++)
-      _value[i] = -1;
-    addDevice(this);
-  }
-  void _begin() {
-    // Initialise ADS device
-    if (I2CManager.exists(_i2cAddress)) {
-      _nextState = STATE_STARTSCAN;
-#ifdef DIAG_IO
-      _display();
-#endif
-    } else {
-      DIAG(F("ADS111x device not found, I2C:%x"), _i2cAddress);
-      _deviceState = DEVSTATE_FAILED;
-    }
-  }
-  void _loop(unsigned long currentMicros) override {
-
-    // Check that previous non-blocking write has completed, if not then wait
-    uint8_t status = _i2crb.status;
-    if (status == I2C_STATUS_PENDING) return;  // Busy, so don't do anything.
-    if (status == I2C_STATUS_OK) {
-      switch (_nextState) {
-        case STATE_STARTSCAN:
-          // Configure ADC and multiplexer for next scan.  See ADS111x datasheet for details
-          // of configuration register settings.
-          _outBuffer[0] = 0x01; // Config register address
-          _outBuffer[1] = 0xC0 + (_currentPin << 4); // Trigger single-shot, channel n
-          _outBuffer[2] = 0xA3;           // 250 samples/sec, comparator off
-          // Write command, without waiting for completion.
-          I2CManager.write(_i2cAddress, _outBuffer, 3, &_i2crb);
-
-          delayUntil(currentMicros + scanInterval);
-          _nextState = STATE_STARTREAD;
-          break;
-
-        case STATE_STARTREAD:
-          // Reading the pin value
-          _outBuffer[0] = 0x00;  // Conversion register address
-          I2CManager.read(_i2cAddress, _inBuffer, 2, _outBuffer, 1, &_i2crb); // Read register
-          _nextState = STATE_GETVALUE;
-          break;
-
-        case STATE_GETVALUE:
-          _value[_currentPin] = ((uint16_t)_inBuffer[0] << 8) + (uint16_t)_inBuffer[1];
-          #ifdef IO_ANALOGUE_SLOW
-          DIAG(F("ADS111x pin:%d value:%d"), _currentPin, _value[_currentPin]);
-          #endif
-
-          // Move to next pin
-          if (++_currentPin >= _nPins) _currentPin = 0;
-          _nextState = STATE_STARTSCAN;
-          break;
-        
-        default:
-          break;
-      }
-    } else { // error status
-      DIAG(F("ADS111x I2C:x%d Error:%d %S"), _i2cAddress, status, I2CManager.getErrorMessage(status));
-      _deviceState = DEVSTATE_FAILED;
-    }
-  }
-
-  int _readAnalogue(VPIN vpin) override {
-    int pin = vpin - _firstVpin;
-    return _value[pin];
-  }
-  
-  void _display() override {
-    DIAG(F("ADS111x I2C:x%x Configured on Vpins:%d-%d %S"), _i2cAddress, _firstVpin, _firstVpin+_nPins-1,
-      _deviceState == DEVSTATE_FAILED ? F("OFFLINE") : F(""));
-  }
-
-  // ADC conversion rate is 250SPS, or 4ms per conversion.  Set the period between updates to 10ms. 
-  // This is enough to allow the conversion to reliably complete in time.
-  #ifndef IO_ANALOGUE_SLOW
-  const unsigned long scanInterval = 10000UL;  // Period between successive ADC scans in microseconds.
-  #else
-  const unsigned long scanInterval = 1000000UL;  // Period between successive ADC scans in microseconds.
-  #endif
-  enum : uint8_t {
-    STATE_STARTSCAN,
-    STATE_STARTREAD, 
-    STATE_GETVALUE,
-  };
-  uint16_t _value[4];
-  uint8_t _i2cAddress;
-  uint8_t _outBuffer[3];
-  uint8_t _inBuffer[2];
-  uint8_t _currentPin;  // ADC pin currently being scanned
-  I2CRB _i2crb;
-  uint8_t _nextState;
-};
-
-#endif // io_analogueinputs_h

IO_DCCAccessory.cpp

@@ -20,49 +20,49 @@
 #include "DCC.h"
 #include "IODevice.h"
 #include "DIAG.h"
-#include "defines.h"
 
-#define PACKEDADDRESS(addr, subaddr) (((addr) << 2)  + (subaddr))
-#define ADDRESS(packedaddr) ((packedaddr) >> 2)
-#define SUBADDRESS(packedaddr) ((packedaddr) % 4)
+// Note: For DCC Accessory Decoders, a particular output can be specified by 
+// a linear address, or by an address/subaddress pair, where the subaddress is
+// in the range 0 to 3 and specifies an output within a group of 4.
+// NMRA and DCC++EX accepts addresses in the range 0-511.  Linear addresses
+// are not specified by the NMRA and so different manufacturers may calculate them
+// in different ways.  DCC+EX uses a range of 1-2044 which excludes decoder address 0.
+// Therefore, I've avoided using linear addresses here because of the ambiguities 
+// involved.  Instead I've used the term 'packedAddress'.
 
-void DCCAccessoryDecoder::create(VPIN firstVpin, int nPins, int DCCAddress, int DCCSubaddress) {
-  if (checkNoOverlap(firstVpin,nPins)) new DCCAccessoryDecoder(firstVpin, nPins, DCCAddress, DCCSubaddress);
+void DCCAccessoryDecoder::create(VPIN vpin, int nPins, int DCCAddress, int DCCSubaddress) {
+  new DCCAccessoryDecoder(vpin, nPins, DCCAddress, DCCSubaddress);
 }
 
-// Constructors
+// Constructor
 DCCAccessoryDecoder::DCCAccessoryDecoder(VPIN vpin, int nPins, int DCCAddress, int DCCSubaddress) {
    _firstVpin = vpin;
   _nPins = nPins;
-  _packedAddress = PACKEDADDRESS(DCCAddress, DCCSubaddress);
-  addDevice(this);
+  _packedAddress = (DCCAddress << 2) + DCCSubaddress;
 }
 
 void DCCAccessoryDecoder::_begin() {
-#if defined(DIAG_IO)
-  _display();
-#endif
+  int endAddress = _packedAddress + _nPins - 1;
+  int DCCAddress = _packedAddress >> 2;
+  int DCCSubaddress = _packedAddress & 3;
+  DIAG(F("DCC Accessory Decoder configured Vpins:%d-%d Linear Address:%d-%d (%d/%d-%d/%d)"), _firstVpin, _firstVpin+_nPins-1,
+      _packedAddress, _packedAddress+_nPins-1,
+     DCCAddress, DCCSubaddress, endAddress >> 2, endAddress % 4);
 }
 
-// Device-specific write function.  State 1=closed, 0=thrown.  Adjust for RCN-213 compliance
+// Device-specific write function.
 void DCCAccessoryDecoder::_write(VPIN id, int state) {
   int packedAddress = _packedAddress + id - _firstVpin;
-#if defined(HAL_ACCESSORY_COMMAND_REVERSE)
-  state = !state;
-#ifdef DIAG_IO
-  DIAG(F("DCC Write Linear Address:%d State:%d (inverted)"), packedAddress, state);
-#endif
-#else
-#ifdef DIAG_IO
+  #ifdef DIAG_IO
   DIAG(F("DCC Write Linear Address:%d State:%d"), packedAddress, state);
-#endif
-#endif
-  DCC::setAccessory(ADDRESS(packedAddress), SUBADDRESS(packedAddress), state);
+  #endif
+  DCC::setAccessory(packedAddress >> 2, packedAddress % 4, state);
 }
 
 void DCCAccessoryDecoder::_display() {
   int endAddress = _packedAddress + _nPins - 1;
-  DIAG(F("DCCAccessoryDecoder Configured on Vpins:%d-%d Addresses %d/%d-%d/%d)"), _firstVpin, _firstVpin+_nPins-1,
-      ADDRESS(_packedAddress), SUBADDRESS(_packedAddress), ADDRESS(endAddress), SUBADDRESS(endAddress));
+  DIAG(F("DCC Accessory Vpins:%d-%d Linear Address:%d-%d (%d/%d-%d/%d)"), _firstVpin, _firstVpin+_nPins-1,
+      _packedAddress, _packedAddress+_nPins-1,
+      _packedAddress >> 2, _packedAddress % 4, endAddress >> 2, endAddress % 4);
 }
 

IO_DFPlayer.h

@@ -1,256 +0,0 @@
-/*
- *  © 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/>.
- */
-
-/*
- * DFPlayer is an MP3 player module with an SD card holder.  It also has an integrated
- * amplifier, so it only needs a power supply and a speaker.
- * 
- * This driver allows the device to be controlled through IODevice::write() and 
- * IODevice::writeAnalogue() calls.
- * 
- * The driver is configured as follows:
- * 
- *       DFPlayer::create(firstVpin, nPins, Serialn);
- * 
- * Where firstVpin is the first vpin reserved for reading the device,
- *       nPins is the number of pins to be allocated (max 5)
- *   and Serialn is the name of the Serial port connected to the DFPlayer (e.g. Serial1).
- * 
- * Example:
- *   In mySetup function within mySetup.cpp:
- *       DFPlayer::create(3500, 5, Serial1);
- * 
- * Writing an analogue value 0-2999 to the first pin will select a numbered file from the SD card;
- * Writing an analogue value 0-30 to the second pin will set the volume of the output;
- * Writing a digital value to the first pin will play or stop the file;
- * Reading a digital value from any pin will return true(1) if the player is playing, false(0) otherwise.
- * 
- * From EX-RAIL, the following commands may be used:
- *   SET(3500)      -- starts playing the first file on the SD card
- *   SET(3501)      -- starts playing the second file on the SD card
- *   etc.
- *   RESET(3500)    -- stops all playing on the player
- *   WAITFOR(3500)  -- wait for the file currently being played by the player to complete
- *   SERVO(3500,23,0)  -- plays file 23 at current volume
- *   SERVO(3500,23,30)  -- plays file 23 at volume 30 (maximum)
- *   SERVO(3501,20,0)   -- Sets the volume to 20
- * 
- * NB The DFPlayer's serial lines are not 5V safe, so connecting the Arduino TX directly 
- * to the DFPlayer's RX terminal will cause lots of noise over the speaker, or worse.
- * A 1k resistor in series with the module's RX terminal will alleviate this.
- */
-
-#ifndef IO_DFPlayer_h
-#define IO_DFPlayer_h
-
-#include "IODevice.h"
-
-class DFPlayer : public IODevice {
-private: 
-  HardwareSerial *_serial;
-  bool _playing = false;
-  uint8_t _inputIndex = 0;
-  unsigned long _commandSendTime; // Allows timeout processing
-
-public:
- 
-  static void create(VPIN firstVpin, int nPins, HardwareSerial &serial) {
-    if (checkNoOverlap(firstVpin,nPins)) new DFPlayer(firstVpin, nPins, serial);
-  }
-
-protected:
-  // Constructor
-  DFPlayer(VPIN firstVpin, int nPins, HardwareSerial &serial) :
-    IODevice(firstVpin, nPins),
-    _serial(&serial) 
-  {
-    addDevice(this);
-  }
-
- void _begin() override {
-    _serial->begin(9600);
-    _deviceState = DEVSTATE_INITIALISING;
-
-    // Send a query to the device to see if it responds
-    sendPacket(0x42); 
-    _commandSendTime = micros();
-  }
-
-  void _loop(unsigned long currentMicros) override {
-    // Check for incoming data on _serial, and update busy flag accordingly.
-    // Expected message is in the form "7F FF 06 3D xx xx xx xx xx EF"
-    while (_serial->available()) {
-      int c = _serial->read();
-      if (c == 0x7E) 
-        _inputIndex = 1;
-      else if ((c==0xFF && _inputIndex==1)
-            || (c==0x3D && _inputIndex==3) 
-            || (_inputIndex >=4 && _inputIndex <= 8))
-        _inputIndex++;
-      else if (c==0x06 && _inputIndex==2) { 
-        // Valid message prefix, so consider the device online
-        if (_deviceState==DEVSTATE_INITIALISING) {
-          _deviceState = DEVSTATE_NORMAL;
-          #ifdef DIAG_IO
-          _display();
-          #endif
-        }
-        _inputIndex++;
-      } else if (c==0xEF && _inputIndex==9) {
-        // End of play
-        if (_playing) {
-          #ifdef DIAG_IO
-          DIAG(F("DFPlayer: Finished"));
-          #endif
-          _playing = false;
-        }
-        _inputIndex = 0;
-      } else 
-        _inputIndex = 0;  // Unrecognised character sequence, start again!
-    }
-    // Check if the initial prompt to device has timed out.  Allow 1 second
-    if (_deviceState == DEVSTATE_INITIALISING && currentMicros - _commandSendTime > 1000000UL) {
-      DIAG(F("DFPlayer device not responding on serial port"));
-      _deviceState = DEVSTATE_FAILED;
-    }
-    delayUntil(currentMicros + 10000); // Only enter every 10ms
-  }
-
-  // Write with value 1 starts playing a song.  The relative pin number is the file number.
-  // Write with value 0 stops playing.
-  void _write(VPIN vpin, int value) override {
-    int pin = vpin - _firstVpin;
-    if (value) {
-      // Value 1, start playing
-      #ifdef DIAG_IO
-      DIAG(F("DFPlayer: Play %d"), pin+1);
-      #endif
-      sendPacket(0x03, pin+1);
-      _playing = true;
-    } else {
-      // Value 0, stop playing
-      #ifdef DIAG_IO
-      DIAG(F("DFPlayer: Stop"));
-      #endif
-      sendPacket(0x16);
-      _playing = false;
-    }
-  }
-
-  // WriteAnalogue on first pin uses the nominated value as a file number to start playing, if file number > 0.
-  // Volume may be specified as second parameter to writeAnalogue.
-  // If value is zero, the player stops playing.  
-  // WriteAnalogue on second pin sets the output volume.
-  void _writeAnalogue(VPIN vpin, int value, uint8_t volume=0, uint16_t=0) override { 
-    uint8_t pin = vpin - _firstVpin;
- 
-    // Validate parameter.
-    volume = min(30,volume);
-
-    if (pin == 0) {
-      // Play track 
-      if (value > 0) {
-        #ifdef DIAG_IO
-        DIAG(F("DFPlayer: Play %d"), value);
-        #endif
-        sendPacket(0x03, value); // Play track
-        _playing = true;
-        if (volume > 0) {
-          #ifdef DIAG_IO
-          DIAG(F("DFPlayer: Volume %d"), volume);
-          #endif
-          sendPacket(0x06, volume);  // Set volume
-        }
-      } else {
-        #ifdef DIAG_IO
-        DIAG(F("DFPlayer: Stop"));
-        #endif
-        sendPacket(0x16); // Stop play
-        _playing = false;
-      }
-    } else if (pin == 1) {
-      // Set volume (0-30)
-      if (value > 30) value = 30;
-      else if (value < 0) value = 0;
-      #ifdef DIAG_IO
-      DIAG(F("DFPlayer: Volume %d"), value);
-      #endif
-      sendPacket(0x06, value);      
-    }
-  }
-
-  // A read on any pin indicates whether the player is still playing.
-  int _read(VPIN) override {
-    return _playing;
-  }
-
-  void _display() override {
-    DIAG(F("DFPlayer Configured on Vpins:%d-%d %S"), _firstVpin, _firstVpin+_nPins-1,
-      (_deviceState==DEVSTATE_FAILED) ? F("OFFLINE") : F(""));
-  }
-  
-private:
-  // 7E FF 06 0F 00 01 01 xx xx EF
-  // 0	->	7E is start code
-  // 1	->	FF is version
-  // 2	->	06 is length
-  // 3	->	0F is command
-  // 4	->	00 is no receive
-  // 5~6	->	01 01 is argument
-  // 7~8	->	checksum = 0 - ( FF+06+0F+00+01+01 )
-  // 9	->	EF is end code
-
-  void sendPacket(uint8_t command, uint16_t arg = 0)
-  {
-    uint8_t out[] = { 0x7E,
-        0xFF,
-        06,
-        command,
-        00,
-        static_cast<uint8_t>(arg >> 8),
-        static_cast<uint8_t>(arg & 0x00ff),
-        00,
-        00,
-        0xEF };
-
-    setChecksum(out);
-
-    _serial->write(out, sizeof(out));
-  }
-
-  uint16_t calcChecksum(uint8_t* packet)
-  {
-    uint16_t sum = 0;
-    for (int i = 1; i < 7; i++)
-    {
-      sum += packet[i];
-    }
-    return -sum;
-  }
-
-  void setChecksum(uint8_t* out)
-  {
-    uint16_t sum = calcChecksum(out);
-
-    out[7] = (sum >> 8);
-    out[8] = (sum & 0xff);
-  }
-};
-
-#endif // IO_DFPlayer_h

IO_EXTurntable.h

@@ -1,121 +0,0 @@
-/*
- *  © 2021, Peter Cole. All rights reserved.
- *
- *  This file is part of CommandStation-EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-/*
-* The IO_EXTurntable device driver is used to control a turntable via an Arduino with a stepper motor over I2C.
-*
-* The EX-Turntable code lives in a separate repo (https://github.com/DCC-EX/Turntable-EX) and contains the stepper motor logic.
-*
-* This device driver sends a step position to Turntable-EX to indicate the step position to move to using either of these commands:
-* <D TT vpin steps activity> in the serial console
-* MOVETT(vpin, steps, activity) in EX-RAIL
-* Refer to the documentation for further information including the valid activities.
-*/
-
-#ifndef IO_EXTurntable_h
-#define IO_EXTurntable_h
-
-#include "IODevice.h"
-#include "I2CManager.h"
-#include "DIAG.h"
-
-void EXTurntable::create(VPIN firstVpin, int nPins, uint8_t I2CAddress) {
-  new EXTurntable(firstVpin, nPins, I2CAddress);
-}
-
-// Constructor
-EXTurntable::EXTurntable(VPIN firstVpin, int nPins, uint8_t I2CAddress) {
-  _firstVpin = firstVpin;
-  _nPins = nPins;
-  _I2CAddress = I2CAddress;
-  addDevice(this);
-}
-
-// Initialisation of TurntableEX
-void EXTurntable::_begin() {
-  I2CManager.begin();
-  I2CManager.setClock(1000000);
-  if (I2CManager.exists(_I2CAddress)) {
-#ifdef DIAG_IO
-    _display();
-#endif
-  } else {
-    _deviceState = DEVSTATE_FAILED;
-  }
-}
-
-// Processing loop to obtain status of stepper
-// 0 = finished moving and in correct position
-// 1 = still moving
-void EXTurntable::_loop(unsigned long currentMicros) {
-  uint8_t readBuffer[1];
-  I2CManager.read(_I2CAddress, readBuffer, 1);
-  _stepperStatus = readBuffer[0];
-  // DIAG(F("Turntable-EX returned status: %d"), _stepperStatus);
-  delayUntil(currentMicros + 500000);  // Wait 500ms before checking again, turntables turn slowly
-}
-
-// Read returns status as obtained in our loop.
-// Return false if our status value is invalid.
-int EXTurntable::_read(VPIN vpin) {
-  if (_deviceState == DEVSTATE_FAILED) return 0;
-  // DIAG(F("_read status: %d"), _stepperStatus);
-  if (_stepperStatus > 1) {
-    return false;
-  } else {
-    return _stepperStatus;
-  }
-}
-
-// writeAnalogue to send the steps and activity to Turntable-EX.
-// Sends 3 bytes containing the MSB and LSB of the step count, and activity.
-// value contains the steps, bit shifted to MSB + LSB.
-// activity contains the activity flag as per this list:
-// 
-// Turn = 0,             // Rotate turntable, maintain phase
-// Turn_PInvert = 1,     // Rotate turntable, invert phase
-// Home = 2,             // Initiate homing
-// Calibrate = 3,        // Initiate calibration sequence
-// LED_On = 4,           // Turn LED on
-// LED_Slow = 5,         // Set LED to a slow blink
-// LED_Fast = 6,         // Set LED to a fast blink
-// LED_Off = 7,          // Turn LED off
-// Acc_On = 8,           // Turn accessory pin on
-// Acc_Off = 9           // Turn accessory pin off
-void EXTurntable::_writeAnalogue(VPIN vpin, int value, uint8_t activity, uint16_t duration) {
-  if (_deviceState == DEVSTATE_FAILED) return;
-  uint8_t stepsMSB = value >> 8;
-  uint8_t stepsLSB = value & 0xFF;
-#ifdef DIAG_IO
-  DIAG(F("TurntableEX WriteAnalogue Vpin:%d Value:%d Activity:%d Duration:%d"),
-    vpin, value, activity, duration);
-  DIAG(F("I2CManager write I2C Address:%d stepsMSB:%d stepsLSB:%d activity:%d"),
-    _I2CAddress, stepsMSB, stepsLSB, activity);
-#endif
-  _stepperStatus = 1;     // Tell the device driver Turntable-EX is busy
-  I2CManager.write(_I2CAddress, 3, stepsMSB, stepsLSB, activity);
-}
-
-// Display Turnetable-EX device driver info.
-void EXTurntable::_display() {
-  DIAG(F("TurntableEX I2C:x%x Configured on Vpins:%d-%d %S"), _I2CAddress, (int)_firstVpin, 
-    (int)_firstVpin+_nPins-1, (_deviceState==DEVSTATE_FAILED) ? F("OFFLINE") : F(""));
-}
-
-#endif

IO_ExampleSerial.cpp

@@ -36,15 +36,13 @@ IO_ExampleSerial::IO_ExampleSerial(VPIN firstVpin, int nPins, HardwareSerial *se
 
 // Static create method for one module.
 void IO_ExampleSerial::create(VPIN firstVpin, int nPins, HardwareSerial *serial, unsigned long baud) {
-  if (checkNoOverlap(firstVpin,nPins)) new IO_ExampleSerial(firstVpin, nPins, serial, baud);
+  new IO_ExampleSerial(firstVpin, nPins, serial, baud);
 }
 
 // Device-specific initialisation
 void IO_ExampleSerial::_begin() {
   _serial->begin(_baud);
-#if defined(DIAG_IO)
-  _display();
-#endif
+  DIAG(F("ExampleSerial configured Vpins:%d-%d"), _firstVpin, _firstVpin+_nPins-1);
 
   // Send a few # characters to the output
   for (uint8_t i=0; i<3; i++)
@@ -123,7 +121,7 @@ void IO_ExampleSerial::_loop(unsigned long currentMicros) {
 }
 
 void IO_ExampleSerial::_display() {
-  DIAG(F("IO_ExampleSerial Configured on VPins:%d-%d"), (int)_firstVpin, 
+  DIAG(F("IO_ExampleSerial VPins:%d-%d"), (int)_firstVpin, 
     (int)_firstVpin+_nPins-1);
 }
 

IO_ExampleSerial.h

@@ -36,10 +36,10 @@
 
 class IO_ExampleSerial : public IODevice {
 public:
+  IO_ExampleSerial(VPIN firstVpin, int nPins, HardwareSerial *serial, unsigned long baud);
   static void create(VPIN firstVpin, int nPins, HardwareSerial *serial, unsigned long baud);  
 
 protected:
-  IO_ExampleSerial(VPIN firstVpin, int nPins, HardwareSerial *serial, unsigned long baud);
   void _begin() override;
   void _loop(unsigned long currentMicros) override;
   void _write(VPIN vpin, int value) override;

IO_GPIOBase.h

@@ -45,17 +45,21 @@ protected:
   int _read(VPIN vpin) override;
   void _display() override;
   void _loop(unsigned long currentMicros) override;
+  bool _hasCallback(VPIN vpin) {
+    (void)vpin;   // suppress compiler warning
+    return true;  // Enable callback if caller wants to use it.
+  }
 
   // Data fields
- 
+  uint8_t _I2CAddress; 
   // Allocate enough space for all input pins
   T _portInputState; 
   T _portOutputState;
   T _portMode;
   T _portPullup;
-  T _portInUse;
   // Interval between refreshes of each input port
   static const int _portTickTime = 4000;
+  unsigned long _lastLoopEntry = 0;
 
   // Virtual functions for interfacing with I2C GPIO Device
   virtual void _writeGpioPort() = 0;
@@ -69,10 +73,6 @@ protected:
 
   I2CRB requestBlock;
   FSH *_deviceName;
-#if defined(ARDUINO_ARCH_ESP32)
-  // workaround: Has somehow no min function for all types
-  static inline T min(T a, int b) { return a < b ? a : b; };
-#endif
 };
 
 // Because class GPIOBase is a template, the implementation (below) must be contained within the same
@@ -80,13 +80,12 @@ protected:
 
 // Constructor
 template <class T>
-GPIOBase<T>::GPIOBase(FSH *deviceName, VPIN firstVpin, uint8_t nPins, uint8_t I2CAddress, int interruptPin) :
-  IODevice(firstVpin, nPins)
-{
+GPIOBase<T>::GPIOBase(FSH *deviceName, VPIN firstVpin, uint8_t nPins, uint8_t I2CAddress, int interruptPin) {
   _deviceName = deviceName;
+  _firstVpin = firstVpin;
+  _nPins = nPins;
   _I2CAddress = I2CAddress;
   _gpioInterruptPin = interruptPin;
-  _hasCallback = true;
   // Add device to list of devices.
   addDevice(this);
 }
@@ -100,19 +99,14 @@ void GPIOBase<T>::_begin() {
   I2CManager.begin();
   I2CManager.setClock(400000);
   if (I2CManager.exists(_I2CAddress)) {
-#if defined(DIAG_IO)
     _display();
-#endif
     _portMode = 0;  // default to input mode
     _portPullup = -1; // default to pullup enabled
-    _portInputState = -1;
-    _portInUse = 0;
-    _setupDevice();
-    _deviceState = DEVSTATE_NORMAL;
-  } else {
-    DIAG(F("%S I2C:x%x Device not detected"), _deviceName, _I2CAddress);
-    _deviceState = DEVSTATE_FAILED;
+    _portInputState = -1; 
   }
+  _setupDevice();
+  _deviceState = DEVSTATE_NORMAL;
+  _lastLoopEntry = micros();
 }
 
 // Configuration parameters for inputs: 
@@ -132,15 +126,11 @@ bool GPIOBase<T>::_configure(VPIN vpin, ConfigTypeEnum configType, int paramCoun
     _portPullup |= mask;
   else
     _portPullup &= ~mask;
-  // Mark that port has been accessed
-  _portInUse |= mask;
-  // Set input mode
-  _portMode &= ~mask;
 
   // Call subclass's virtual function to write to device
-  _writePortModes();
   _writePullups();
-  // Port change will be notified on next loop entry.
+  // Re-read port following change
+  _readGpioPort();
 
   return true;
 }
@@ -155,12 +145,9 @@ void GPIOBase<T>::_loop(unsigned long currentMicros) {
       _deviceState = DEVSTATE_NORMAL;
     } else {
       _deviceState = DEVSTATE_FAILED;
-      DIAG(F("%S I2C:x%x Error:%d %S"), _deviceName, _I2CAddress, status, 
-        I2CManager.getErrorMessage(status));
+      DIAG(F("%S I2C:x%x Error:%d"), _deviceName, _I2CAddress, status);
     }
     _processCompletion(status);
-  // Set unused pin and write mode pin value to 1
-    _portInputState |= ~_portInUse | _portMode;
 
     // Scan for changes in input states and invoke callback (if present)
     T differences = lastPortStates ^ _portInputState;
@@ -182,25 +169,27 @@ void GPIOBase<T>::_loop(unsigned long currentMicros) {
     #endif
   }
 
-  // Check if interrupt configured.  If not, or if it is active (pulled down), then
-  //  initiate a scan.
-  if (_gpioInterruptPin < 0 || !digitalRead(_gpioInterruptPin)) {
-    // TODO: Could suppress reads if there are no pins configured as inputs!
+  // Check if interrupt configured.  If so, and pin is not pulled down, finish.
+  if (_gpioInterruptPin >= 0) {
+    if (digitalRead(_gpioInterruptPin)) return;
+  } else
+  // No interrupt pin.  Check if tick has elapsed.  If not, finish.
+  if (currentMicros - _lastLoopEntry < _portTickTime) return;
 
-    // Read input
-    if (_deviceState == DEVSTATE_NORMAL) {
-      _readGpioPort(false);  // Initiate non-blocking read
-      _deviceState= DEVSTATE_SCANNING;
-    }
+  // TODO: Could suppress reads if there are no pins configured as inputs!
+
+  // Read input
+  _lastLoopEntry = currentMicros;
+  if (_deviceState == DEVSTATE_NORMAL) {
+    _readGpioPort(false);  // Initiate non-blocking read
+    _deviceState= DEVSTATE_SCANNING;
   }
-  // Delay next entry until tick elapsed.
-  delayUntil(currentMicros + _portTickTime);
 }
 
 template <class T>
 void GPIOBase<T>::_display() {
-  DIAG(F("%S I2C:x%x Configured on Vpins:%d-%d %S"), _deviceName, _I2CAddress, 
-    _firstVpin, _firstVpin+_nPins-1, (_deviceState==DEVSTATE_FAILED) ? F("OFFLINE") : F(""));
+  DIAG(F("%S I2C:x%x Configured on Vpins:%d-%d"), _deviceName, _I2CAddress, 
+    _firstVpin, _firstVpin+_nPins-1);
 }
 
 template <class T>
@@ -211,9 +200,8 @@ void GPIOBase<T>::_write(VPIN vpin, int value) {
   DIAG(F("%S I2C:x%x Write Pin:%d Val:%d"), _deviceName, _I2CAddress, pin, value);
   #endif
 
-  // Set port mode output if currently not output mode
+  // Set port mode output
   if (!(_portMode & mask)) {
-    _portInUse |= mask;
     _portMode |= mask;
     _writePortModes();
   }
@@ -233,16 +221,12 @@ int GPIOBase<T>::_read(VPIN vpin) {
   int pin = vpin - _firstVpin;
   T mask = 1 << pin;
 
-  // Set port mode to input if currently output or first use
-  if ((_portMode | ~_portInUse) & mask) {
+  // Set port mode to input
+  if (_portMode & mask) {
     _portMode &= ~mask;
-    _portInUse |= mask;
-    _writePullups();
     _writePortModes();
     // Port won't have been read yet, so read it now.
     _readGpioPort();
-  // Set unused pin and write mode pin value to 1
-    _portInputState |= ~_portInUse | _portMode;
     #ifdef DIAG_IO
     DIAG(F("%S I2C:x%x PortStates:%x"), _deviceName, _I2CAddress, _portInputState);
     #endif
@@ -250,4 +234,4 @@ int GPIOBase<T>::_read(VPIN vpin) {
   return (_portInputState & mask) ? 0 : 1;  // Invert state (5v=0, 0v=1)
 }
 
-#endif
+#endif

IO_HCSR04.h

@@ -17,37 +17,31 @@
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*
+/* 
  * The HC-SR04 module has an ultrasonic transmitter (40kHz) and a receiver.
- * It is operated through two signal pins.  When the transmit pin is set to 1
- * for 10us, on the falling edge the transmitter sends a short transmission of
+ * It is operated through two signal pins.  When the transmit pin is set to 1 for 
+ * 10us, on the falling edge the transmitter sends a short transmission of 
  * 8 pulses (like a sonar 'ping').  This is reflected off objects and received
  * by the receiver.  A pulse is sent on the receive pin whose length is equal
  * to the delay between the transmission of the pulse and the detection of
  * its echo.  The distance of the reflecting object is calculated by halving
  * the time (to allow for the out and back distance), then multiplying by the
  * speed of sound (assumed to be constant).
- *
+ * 
  * This driver polls the HC-SR04 by sending the trigger pulse and then measuring
- * the length of the received pulse.  If the calculated distance is less than
- * the threshold, the output state returned by a read() call changes to 1.  If
- * the distance is greater than the threshold plus a hysteresis margin, the
- * output changes to 0. The device also supports readAnalogue(), which returns
- * the measured distance in cm, or 32767 if the distance exceeds the
- * offThreshold.
- *
- * It might be thought that the measurement would be more reliable if interrupts
- * were disabled while the pulse is being timed.  However, this would affect
- * other functions in the CS so the measurement is being performed with
- * interrupts enabled.  Also, we could use an interrupt pin in the Arduino for
- * the timing, but the same consideration applies.  In any case, the DCC
- * interrupt occurs once every 58us, so any IRC code is much faster than that.
- * And 58us corresponds to 1cm in the calculation, so the effect of
- * interrupts is negligible.
- *
- * Note: The timing accuracy required for measuring the pulse length means that
- * the pins have to be direct Arduino pins; GPIO pins on an IO Extender cannot
- * provide the required accuracy.
+ * the length of the received pulse.  If the calculated distance is less than the
+ * threshold, the output changes to 1.  If it is greater than the threshold plus
+ * a hysteresis margin, the output changes to 0.
+ * 
+ * The measurement would be more reliable if interrupts were disabled while the
+ * pulse is being timed.  However, this would affect other functions in the CS
+ * so the measurement is being performed with interrupts enabled.  Also, we could
+ * use an interrupt pin in the Arduino for the timing, but the same consideration 
+ * applies.
+ * 
+ * Note: The timing accuracy required by this means that the pins have to be 
+ * direct Arduino pins; GPIO pins on an IO Extender cannot provide the required
+ * accuracy.
  */
 
 #ifndef IO_HCSR04_H
@@ -59,46 +53,45 @@ class HCSR04 : public IODevice {
 
 private:
   // pins must be arduino GPIO pins, not extender pins or HAL pins.
-  int _trigPin = -1;
-  int _echoPin = -1;
+  int _transmitPin = -1;
+  int _receivePin = -1;
   // Thresholds for setting active state in cm.
   uint8_t _onThreshold;  // cm
   uint8_t _offThreshold; // cm
-  // Last measured distance in cm.
-  uint16_t _distance;
   // Active=1/inactive=0 state 
   uint8_t _value = 0;
+  // Time of last loop execution
+  unsigned long _lastExecutionTime;
   // Factor for calculating the distance (cm) from echo time (ms).
   //  Based on a speed of sound of 345 metres/second.
   const uint16_t factor = 58; // ms/cm
 
 public:
- 
-  // Static create function provides alternative way to create object
-  static void create(VPIN vpin, int trigPin, int echoPin, uint16_t onThreshold, uint16_t offThreshold) {
-    if (checkNoOverlap(vpin))
-        new HCSR04(vpin, trigPin, echoPin, onThreshold, offThreshold);
-  }
-
-protected:
   // Constructor perfroms static initialisation of the device object
-  HCSR04 (VPIN vpin, int trigPin, int echoPin, uint16_t onThreshold, uint16_t offThreshold) {
+  HCSR04 (VPIN vpin, int transmitPin, int receivePin, uint16_t onThreshold, uint16_t offThreshold) {
     _firstVpin = vpin;
     _nPins = 1;
-    _trigPin = trigPin;
-    _echoPin = echoPin;
+    _transmitPin = transmitPin;
+    _receivePin = receivePin;
     _onThreshold = onThreshold;
     _offThreshold = offThreshold;
     addDevice(this);
   }
- // _begin function called to perform dynamic initialisation of the device
+
+  // Static create function provides alternative way to create object
+  static void create(VPIN vpin, int transmitPin, int receivePin, uint16_t onThreshold, uint16_t offThreshold) {
+    new HCSR04(vpin, transmitPin, receivePin, onThreshold, offThreshold);
+  }
+
+protected:
+  // _begin function called to perform dynamic initialisation of the device
   void _begin() override {
-    pinMode(_trigPin, OUTPUT);
-    pinMode(_echoPin, INPUT);
-    ArduinoPins::fastWriteDigital(_trigPin, 0);
-#if defined(DIAG_IO)
-    _display();
-#endif
+    pinMode(_transmitPin, OUTPUT);
+    pinMode(_receivePin, INPUT);
+    ArduinoPins::fastWriteDigital(_transmitPin, 0);
+    _lastExecutionTime = micros();
+    DIAG(F("HCSR04 configured on VPIN:%d TXpin:%d RXpin:%d On:%dcm Off:%dcm"),
+      _firstVpin, _transmitPin, _receivePin, _onThreshold, _offThreshold);
   }
 
   // _read function - just return _value (calculated in _loop).
@@ -107,21 +100,13 @@ protected:
     return _value;
   }
 
-  int _readAnalogue(VPIN vpin) override {
-    (void)vpin; // avoid compiler warning
-    return _distance;
-  }
-
   // _loop function - read HC-SR04 once every 50 milliseconds.
   void _loop(unsigned long currentMicros) override {
-    read_HCSR04device();
-    // Delay next loop entry until 50ms have elapsed.
-    delayUntil(currentMicros + 50000UL);
-  }
+    if (currentMicros - _lastExecutionTime > 50000) {
+      _lastExecutionTime = currentMicros;
 
-  void _display() override {
-    DIAG(F("HCSR04 Configured on Vpin:%d TrigPin:%d EchoPin:%d On:%dcm Off:%dcm"),
-      _firstVpin, _trigPin, _echoPin, _onThreshold, _offThreshold);
+      _value = read_HCSR04device();
+    }
   }
 
 private:
@@ -136,52 +121,51 @@ private:
   //  measured distance is less than the onThreshold, and is set to 0 if the measured distance is
   //  greater than the offThreshold.
   //
-  void read_HCSR04device() {
+  uint8_t read_HCSR04device() {
     // uint16 enough to time up to 65ms
     uint16_t startTime, waitTime, currentTime, maxTime;  
 
     // If receive pin is still set on from previous call, abort the read.
-    if (ArduinoPins::fastReadDigital(_echoPin))
-      return;
+    if (ArduinoPins::fastReadDigital(_receivePin)) return _value;
 
     // Send 10us pulse to trigger transmitter
-    ArduinoPins::fastWriteDigital(_trigPin, 1);
+    ArduinoPins::fastWriteDigital(_transmitPin, 1);
     delayMicroseconds(10);
-    ArduinoPins::fastWriteDigital(_trigPin, 0);
+    ArduinoPins::fastWriteDigital(_transmitPin, 0);
 
     // Wait for receive pin to be set
     startTime = currentTime = micros();
     maxTime = factor * _offThreshold * 2;
-    while (!ArduinoPins::fastReadDigital(_echoPin)) {
+    while (!ArduinoPins::fastReadDigital(_receivePin)) {
       // lastTime = currentTime;
       currentTime = micros();
       waitTime = currentTime - startTime;
       if (waitTime > maxTime) {
         // Timeout waiting for pulse start, abort the read
-        return;
+        return _value;
       }
     }
 
     // Wait for receive pin to reset, and measure length of pulse
     startTime = currentTime = micros();
     maxTime = factor * _offThreshold;
-    while (ArduinoPins::fastReadDigital(_echoPin)) {
+    while (ArduinoPins::fastReadDigital(_receivePin)) {
       currentTime = micros();
       waitTime = currentTime - startTime;
       // If pulse is too long then set return value to zero,
       //  and finish without waiting for end of pulse.
       if (waitTime > maxTime) {
         // Pulse length longer than maxTime, reset value.
-        _value = 0;
-        _distance = 32767;
-        return;
+        return 0;
       }
     } 
     // Check if pulse length is below threshold, if so set value.
     //DIAG(F("HCSR04: Pulse Len=%l Distance=%d"), waitTime, distance);
-    _distance = waitTime / factor; // in centimetres
-    if (_distance < _onThreshold) 
-      _value = 1;
+    uint16_t distance = waitTime / factor; // in centimetres
+    if (distance < _onThreshold) 
+      return 1;
+
+    return _value;
   }
 
 };

IO_MCP23008.h

@@ -1,5 +1,4 @@
 /*
- *  © 2022 Paul M Antoine
  *  © 2021, Neil McKechnie. All rights reserved.
  *  
  *  This file is part of DCC++EX API
@@ -26,35 +25,31 @@
 class MCP23008 : public GPIOBase<uint8_t> {
 public:
   static void create(VPIN firstVpin, uint8_t nPins, uint8_t I2CAddress, int interruptPin=-1) {
-    if (checkNoOverlap(firstVpin, nPins,I2CAddress)) new MCP23008(firstVpin, nPins, I2CAddress, interruptPin);
+    new MCP23008(firstVpin, nPins, I2CAddress, interruptPin);
   }
 
-private:
   // Constructor
   MCP23008(VPIN firstVpin, uint8_t nPins, uint8_t I2CAddress, int interruptPin=-1)
-    : GPIOBase<uint8_t>((FSH *)F("MCP23008"), firstVpin, min(nPins, (uint8_t)8), I2CAddress, interruptPin) {
+    : GPIOBase<uint8_t>((FSH *)F("MCP23008"), firstVpin, min(nPins, 8), I2CAddress, interruptPin) {
 
     requestBlock.setRequestParams(_I2CAddress, inputBuffer, sizeof(inputBuffer),
       outputBuffer, sizeof(outputBuffer));
     outputBuffer[0] = REG_GPIO;
   }
   
+private:
   void _writeGpioPort() override {
     I2CManager.write(_I2CAddress, 2, REG_GPIO, _portOutputState);
   }
   void _writePullups() override {
-    // Set pullups only for in-use pins.  This prevents pullup being set for a pin that
-    //  is intended for use as an output but hasn't been written to yet.
-    I2CManager.write(_I2CAddress, 2, REG_GPPU, _portPullup & _portInUse);  
+    I2CManager.write(_I2CAddress, 2, REG_GPPU, _portPullup);  
   }
   void _writePortModes() override {
-    // Write 0 to IODIR for in-use pins that are outputs, 1 for others.
-    uint8_t temp = ~(_portMode & _portInUse);
-    I2CManager.write(_I2CAddress, 2, REG_IODIR, temp);
-    // Enable interrupt-on-change for in-use pins that are inputs (_portMode=0)
-    temp = ~_portMode & _portInUse;
+    // Each bit is 1 for an input, 0 for an output, i.e. inverted.
+    I2CManager.write(_I2CAddress, 2, REG_IODIR, ~_portMode);
+    // Enable interrupt-on-change for pins that are inputs (_portMode=0)
     I2CManager.write(_I2CAddress, 2, REG_INTCON, 0x00);
-    I2CManager.write(_I2CAddress, 2, REG_GPINTEN, temp);
+    I2CManager.write(_I2CAddress, 2, REG_GPINTEN, ~_portMode);
   }
   void _readGpioPort(bool immediate) override {
     if (immediate) {

IO_MCP23017.h

@@ -31,10 +31,9 @@
 class MCP23017 : public GPIOBase<uint16_t> {
 public:
   static void create(VPIN vpin, int nPins, uint8_t I2CAddress, int interruptPin=-1) {
-    if (checkNoOverlap(vpin, nPins, I2CAddress)) new MCP23017(vpin, min(nPins,16), I2CAddress, interruptPin);
+    new MCP23017(vpin, min(nPins,16), I2CAddress, interruptPin);
   }
-
-private:  
+  
   // Constructor
   MCP23017(VPIN vpin, int nPins, uint8_t I2CAddress, int interruptPin=-1) 
     : GPIOBase<uint16_t>((FSH *)F("MCP23017"), vpin, nPins, I2CAddress, interruptPin) 
@@ -43,23 +42,20 @@ private:
       outputBuffer, sizeof(outputBuffer));
     outputBuffer[0] = REG_GPIOA;
   }
+
+private:
   void _writeGpioPort() override {
     I2CManager.write(_I2CAddress, 3, REG_GPIOA, _portOutputState, _portOutputState>>8);
   }
   void _writePullups() override {
-    // Set pullups only for in-use pins.  This prevents pullup being set for a pin that
-    //  is intended for use as an output but hasn't been written to yet.
-    uint16_t temp = _portPullup & _portInUse;
-    I2CManager.write(_I2CAddress, 3, REG_GPPUA, temp, temp>>8);  
+    I2CManager.write(_I2CAddress, 3, REG_GPPUA, _portPullup, _portPullup>>8);  
   }
   void _writePortModes() override {
-    // Write 0 to IODIR for in-use pins that are outputs, 1 for others.
-    uint16_t temp = ~(_portMode & _portInUse);
-    I2CManager.write(_I2CAddress, 3, REG_IODIRA, temp, temp>>8);
-    // Enable interrupt for in-use pins which are inputs (_portMode=0)
-    temp = ~_portMode & _portInUse;
+    // Write 1 to IODIR for pins that are inputs, 0 for outputs (i.e. _portMode inverted)
+    I2CManager.write(_I2CAddress, 3, REG_IODIRA, ~_portMode, (~_portMode)>>8);
+    // Enable interrupt for those pins which are inputs (_portMode=0)
     I2CManager.write(_I2CAddress, 3, REG_INTCONA, 0x00, 0x00);
-    I2CManager.write(_I2CAddress, 3, REG_GPINTENA, temp, temp>>8);
+    I2CManager.write(_I2CAddress, 3, REG_GPINTENA, ~_portMode, (~_portMode)>>8);
   }
   void _readGpioPort(bool immediate) override {
     if (immediate) {

IO_PCA9685.cpp

@@ -39,36 +39,34 @@ static void writeRegister(byte address, byte reg, byte value);
 
 // Create device driver instance.
 void PCA9685::create(VPIN firstVpin, int nPins, uint8_t I2CAddress) {
-  if (checkNoOverlap(firstVpin, nPins,I2CAddress)) new PCA9685(firstVpin, nPins, I2CAddress);
+  new PCA9685(firstVpin, nPins, I2CAddress);
 }
 
 // Configure a port on the PCA9685.
 bool PCA9685::_configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, int params[]) {
   if (configType != CONFIGURE_SERVO) return false;
-  if (paramCount != 5) return false;
+  if (paramCount != 4) return false;
   #ifdef DIAG_IO
-  DIAG(F("PCA9685 Configure VPIN:%d Apos:%d Ipos:%d Profile:%d Duration:%d state:%d"), 
-    vpin, params[0], params[1], params[2], params[3], params[4]);
+  DIAG(F("PCA9685 Configure VPIN:%d Apos:%d Ipos:%d Profile:%d state:%d"), 
+    vpin, params[0], params[1], params[2], params[3]);
   #endif
 
   int8_t pin = vpin - _firstVpin;
   struct ServoData *s = _servoData[pin];
-  if (s == NULL) { 
+  if (!s) { 
     _servoData[pin] = (struct ServoData *)calloc(1, sizeof(struct ServoData));
     s = _servoData[pin];
     if (!s) return false; // Check for failed memory allocation
   }
 
   s->activePosition = params[0];
-  s->inactivePosition = params[1];
+  s->currentPosition = s->inactivePosition = params[1];
   s->profile = params[2];
-  s->duration = params[3];
-  int state = params[4];
 
-  if (state != -1) {
-    // Position servo to initial state
-    _writeAnalogue(vpin, state ? s->activePosition : s->inactivePosition, 0, 0);
-  } 
+  // Position servo to initial state
+  s->state = -1; // Set unknown state, to force reposition
+  _write(vpin, params[3]);
+
   return true;
 }
 
@@ -77,8 +75,6 @@ PCA9685::PCA9685(VPIN firstVpin, int nPins, uint8_t I2CAddress) {
   _firstVpin = firstVpin;
   _nPins = min(nPins, 16);
   _I2CAddress = I2CAddress;
-  // To save RAM, space for servo configuration is not allocated unless a pin is used.
-  // Initialise the pointers to NULL.
   for (int i=0; i<_nPins; i++)
     _servoData[i] = NULL;
 
@@ -97,6 +93,7 @@ void PCA9685::_begin() {
 
   // Initialise I/O module here.
   if (I2CManager.exists(_I2CAddress)) {
+    DIAG(F("PCA9685 I2C:%x configured Vpins:%d-%d"), _I2CAddress, _firstVpin, _firstVpin+_nPins-1);
     writeRegister(_I2CAddress, PCA9685_MODE1, MODE1_SLEEP | MODE1_AI);    
     writeRegister(_I2CAddress, PCA9685_PRESCALE, PRESCALE_50HZ);   // 50Hz clock, 20ms pulse period.
     writeRegister(_I2CAddress, PCA9685_MODE1, MODE1_AI);
@@ -104,15 +101,10 @@ void PCA9685::_begin() {
     // In theory, we should wait 500us before sending any other commands to each device, to allow
     // the PWM oscillator to get running.  However, we don't do any specific wait, as there's 
     // plenty of other stuff to do before we will send a command.
-  #if defined(DIAG_IO)
-    _display();
-  #endif
-  } else
-    _deviceState = DEVSTATE_FAILED;
+  }
 }
 
-// Device-specific write function, invoked from IODevice::write().  
-// For this function, the configured profile is used.
+// Device-specific write function, invoked from IODevice::write().
 void PCA9685::_write(VPIN vpin, int value) {
   #ifdef DIAG_IO
   DIAG(F("PCA9685 Write Vpin:%d Value:%d"), vpin, value);
@@ -121,96 +113,97 @@ void PCA9685::_write(VPIN vpin, int value) {
   if (value) value = 1;
 
   struct ServoData *s = _servoData[pin];
-  if (s != NULL) {
-    // Use configured parameters
-    _writeAnalogue(vpin, value ? s->activePosition : s->inactivePosition, s->profile, s->duration);
-  }  else {
-     /* simulate digital pin on PWM */
-      _writeAnalogue(vpin, value ? 4095 : 0, Instant | NoPowerOff, 0);     
-      }
+  if (!s) {
+    // Pin not configured, just write default positions to servo controller
+    if (value) 
+      writeDevice(pin, _defaultActivePosition);
+    else 
+      writeDevice(pin, _defaultInactivePosition);
+  } else {
+    // Use configured parameters for advanced transitions
+    uint8_t profile = s->profile;
+    // If current position not known, go straight to selected position.
+    if (s->state == -1) profile = Instant;
+
+    // Animated profile.  Initiate the appropriate action.
+    s->numSteps = profile==Fast ? 10 : 
+                  profile==Medium ? 20 : 
+                  profile==Slow ? 40 : 
+                  profile==Bounce ? sizeof(_bounceProfile)-1 : 
+                  1;
+    s->state = value;
+    s->stepNumber = 0;
+
+    // Update new from/to positions to initiate or change animation.
+    s->fromPosition = s->currentPosition;
+    s->toPosition = s->state ? s->activePosition : s->inactivePosition;
+  }
 }
 
 // Device-specific writeAnalogue function, invoked from IODevice::writeAnalogue().
-// Profile is as follows:
-//  Bit 7:     0=Set PWM to 0% to power off servo motor when finished
-//             1=Keep PWM pulses on (better when using PWM to drive an LED)
-//  Bits 6-0:  0           Use specified duration (defaults to 0 deciseconds)
-//             1 (Fast)    Move servo in 0.5 seconds
-//             2 (Medium)  Move servo in 1.0 seconds
-//             3 (Slow)    Move servo in 2.0 seconds
-//             4 (Bounce)  Servo 'bounces' at extremes.
-//            
-void PCA9685::_writeAnalogue(VPIN vpin, int value, uint8_t profile, uint16_t duration) {
+void PCA9685::_writeAnalogue(VPIN vpin, int value, int profile) {
   #ifdef DIAG_IO
-  DIAG(F("PCA9685 WriteAnalogue Vpin:%d Value:%d Profile:%d Duration:%d %S"), 
-    vpin, value, profile, duration, _deviceState == DEVSTATE_FAILED?F("DEVSTATE_FAILED"):F(""));
+  DIAG(F("PCA9685 WriteAnalogue Vpin:%d Value:%d Profile:%d"), vpin, value, profile);
   #endif
-  if (_deviceState == DEVSTATE_FAILED) return;
   int pin = vpin - _firstVpin;
   if (value > 4095) value = 4095;
   else if (value < 0) value = 0;
 
   struct ServoData *s = _servoData[pin];
-  if (s == NULL) {
-    // Servo pin not configured, so configure now using defaults
-    s = _servoData[pin] = (struct ServoData *) calloc(sizeof(struct ServoData), 1);
-    if (s == NULL) return;  // Check for memory allocation failure
-    s->activePosition = 4095;
-    s->inactivePosition = 0;
-    s->currentPosition = value;
-    s->profile = Instant | NoPowerOff;  // Use instant profile (but not this time)
-  }
 
+  if (!s) {
+    // Servo pin not configured, so configure now.
+    s = _servoData[pin] = (struct ServoData *) calloc(sizeof(struct ServoData), 1);
+    s->activePosition = _defaultActivePosition;
+    s->inactivePosition = _defaultInactivePosition;
+    s->currentPosition = value; // Don't know where we're moving from.
+  }
+  s->profile = profile;
   // Animated profile.  Initiate the appropriate action.
-  s->currentProfile = profile;
-  uint8_t profileValue = profile & ~NoPowerOff;  // Mask off 'don't-power-off' bit.
-  s->numSteps = profileValue==Fast ? 10 :   // 0.5 seconds
-                profileValue==Medium ? 20 : // 1.0 seconds
-                profileValue==Slow ? 40 :   // 2.0 seconds
-                profileValue==Bounce ? sizeof(_bounceProfile)-1 : // ~ 1.5 seconds
-                duration * 2 + 1; // Convert from deciseconds (100ms) to refresh cycles (50ms)
+  s->numSteps = profile==Fast ? 10 : 
+                profile==Medium ? 20 : 
+                profile==Slow ? 40 : 
+                profile==Bounce ? sizeof(_bounceProfile)-1 : 
+                1;
   s->stepNumber = 0;
   s->toPosition = value;
   s->fromPosition = s->currentPosition;
 }
 
-// _read returns true if the device is currently in executing an animation, 
+// _isActive returns true if the device is currently in executing an animation, 
 //  changing the output over a period of time.
-int PCA9685::_read(VPIN vpin) {
-  if (_deviceState == DEVSTATE_FAILED) return 0;
+bool PCA9685::_isActive(VPIN vpin) {
   int pin = vpin - _firstVpin;
   struct ServoData *s = _servoData[pin];
-  if (s == NULL) 
+  if (!s) 
     return false; // No structure means no animation!
   else
-    return (s->stepNumber < s->numSteps);
+    return (s->numSteps != 0);
 }
 
 void PCA9685::_loop(unsigned long currentMicros) {
-  for (int pin=0; pin<_nPins; pin++) {
-    updatePosition(pin);
+  if (currentMicros - _lastRefreshTime >= refreshInterval * 1000) {
+    for (int pin=0; pin<_nPins; pin++) {
+      updatePosition(pin);
+    }
+    _lastRefreshTime = currentMicros;
   }
-  delayUntil(currentMicros + refreshInterval * 1000UL);
 }
 
 // Private function to reposition servo
 // TODO: Could calculate step number from elapsed time, to allow for erratic loop timing.
 void PCA9685::updatePosition(uint8_t pin) {
   struct ServoData *s = _servoData[pin];
-  
-  if (s == NULL) return; // No pin configuration/state data
-
+  if (!s) return;
   if (s->numSteps == 0) return; // No animation in progress
-
   if (s->stepNumber == 0 && s->fromPosition == s->toPosition) {
-    // Go straight to end of sequence, output final position.
-    s->stepNumber = s->numSteps-1;
+    // No movement required, so go straight to final step
+    s->stepNumber = s->numSteps;
   }
-
   if (s->stepNumber < s->numSteps) {
     // Animation in progress, reposition servo
     s->stepNumber++;
-    if ((s->currentProfile & ~NoPowerOff) == Bounce) {
+    if (s->profile == Bounce) {
       // Retrieve step positions from array in flash
       byte profileValue = GETFLASH(&_bounceProfile[s->stepNumber]);
       s->currentPosition = map(profileValue, 0, 100, s->fromPosition, s->toPosition);
@@ -224,12 +217,10 @@ void PCA9685::updatePosition(uint8_t pin) {
     // We've finished animation, wait a little to allow servo to catch up
     s->stepNumber++;
   } else if (s->stepNumber == s->numSteps + _catchupSteps 
-            && s->currentPosition != 0) {
+            && s->currentPosition != 4095 && s->currentPosition != 0) {
 #ifdef IO_SWITCH_OFF_SERVO
-    if ((s->currentProfile & NoPowerOff) == 0) {
-      // Wait has finished, so switch off PWM to prevent annoying servo buzz
-      writeDevice(pin, 0);
-    }
+    // Wait has finished, so switch off PWM to prevent annoying servo buzz
+    writeDevice(pin, 0);
 #endif
     s->numSteps = 0;  // Done now.
   }
@@ -242,25 +233,20 @@ void PCA9685::writeDevice(uint8_t pin, int value) {
   DIAG(F("PCA9685 I2C:x%x WriteDevice Pin:%d Value:%d"), _I2CAddress, pin, value);
   #endif
   // Wait for previous request to complete
-  uint8_t status = requestBlock.wait();
-  if (status != I2C_STATUS_OK) {
-    _deviceState = DEVSTATE_FAILED;
-    DIAG(F("PCA9685 I2C:x%x failed %S"), _I2CAddress, I2CManager.getErrorMessage(status));
-  } else {
-    // Set up new request.
-    outputBuffer[0] = PCA9685_FIRST_SERVO + 4 * pin;
-    outputBuffer[1] = 0;
-    outputBuffer[2] = (value == 4095 ? 0x10 : 0);  // 4095=full on
-    outputBuffer[3] = value & 0xff;
-    outputBuffer[4] = value >> 8;
-    I2CManager.queueRequest(&requestBlock);
-  }
+  requestBlock.wait();
+  // Set up new request.
+  outputBuffer[0] = PCA9685_FIRST_SERVO + 4 * pin;
+  outputBuffer[1] = 0;
+  outputBuffer[2] = (value == 4095 ? 0x10 : 0);  // 4095=full on
+  outputBuffer[3] = value & 0xff;
+  outputBuffer[4] = value >> 8;
+  I2CManager.queueRequest(&requestBlock);
 }
 
 // Display details of this device.
 void PCA9685::_display() {
-  DIAG(F("PCA9685 I2C:x%x Configured on Vpins:%d-%d %S"), _I2CAddress, (int)_firstVpin, 
-    (int)_firstVpin+_nPins-1, (_deviceState==DEVSTATE_FAILED) ? F("OFFLINE") : F(""));
+  DIAG(F("PCA9685 I2C:x%x Vpins:%d-%d"), _I2CAddress, (int)_firstVpin, 
+    (int)_firstVpin+_nPins-1);
 }
 
 // Internal helper function for this device

IO_PCF8574.h

@@ -1,5 +1,4 @@
 /*
- *  © 2022 Paul M Antoine
  *  © 2021, Neil McKechnie. All rights reserved.
  *  
  *  This file is part of DCC++EX API
@@ -18,24 +17,6 @@
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/* 
- * The PCF8574 is a simple device; it only has one register.  The device 
- * input/output mode and pullup are configured through this, and the 
- * output state is written and the input state read through it too.
- * 
- * This is accomplished by having a weak resistor in series with the output,
- * and a read-back of the other end of the resistor.  As an output, the 
- * pin state is set to 1 or 0, and the output voltage goes to +5V or 0V
- * (through the weak resistor).
- * 
- * In order to use the pin as an input, the output is written as
- * a '1' in order to pull up the resistor.  Therefore the input will be
- * 1 unless the pin is pulled down externally, in which case it will be 0.
- * 
- * As a consequence of this approach, it is not possible to use the device for
- * inputs without pullups.
- */
-
 #ifndef IO_PCF8574_H
 #define IO_PCF8574_H
 
@@ -44,16 +25,16 @@
 class PCF8574 : public GPIOBase<uint8_t> {
 public:
   static void create(VPIN firstVpin, uint8_t nPins, uint8_t I2CAddress, int interruptPin=-1) {
-    if (checkNoOverlap(firstVpin, nPins,I2CAddress)) new PCF8574(firstVpin, nPins, I2CAddress, interruptPin);
+    new PCF8574(firstVpin, nPins, I2CAddress, interruptPin);
   }
 
-private:
   PCF8574(VPIN firstVpin, uint8_t nPins, uint8_t I2CAddress, int interruptPin=-1)
-    : GPIOBase<uint8_t>((FSH *)F("PCF8574"), firstVpin, min(nPins, (uint8_t)8), I2CAddress, interruptPin) 
+    : GPIOBase<uint8_t>((FSH *)F("PCF8574"), firstVpin, min(nPins, 8), I2CAddress, interruptPin) 
   {
     requestBlock.setReadParams(_I2CAddress, inputBuffer, 1);
   }
   
+private:
   // The pin state is '1' if the pin is an input or if it is an output set to 1.  Zero otherwise. 
   void _writeGpioPort() override {
     I2CManager.write(_I2CAddress, 1, _portOutputState | ~_portMode);
@@ -76,7 +57,7 @@ private:
     if (immediate) {
       uint8_t buffer[1];
       I2CManager.read(_I2CAddress, buffer, 1);
-      _portInputState = buffer[0];
+      _portInputState = ((uint16_t)buffer) & 0xff;
     } else {
       requestBlock.wait(); // Wait for preceding operation to complete
       // Issue new request to read GPIO register
@@ -87,9 +68,9 @@ private:
   // This function is invoked when an I/O operation on the requestBlock completes.
   void _processCompletion(uint8_t status) override {
     if (status == I2C_STATUS_OK) 
-      _portInputState = inputBuffer[0];
+      _portInputState = ((uint16_t)inputBuffer[0]) & 0xff;
     else  
-      _portInputState = 0xff; 
+      _portInputState = 0xff;
   }
 
   // Set up device ports

IO_VL53L0X.h

@@ -1,300 +0,0 @@
-/*
- *  © 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/>.
- */
-
-/*
- * The VL53L0X Time-Of-Flight sensor operates by sending a short laser pulse and detecting
- * the reflection of the pulse.  The time between the pulse and the receipt of reflections
- * is measured and used to determine the distance to the reflecting object.
- * 
- * For economy of memory and processing time, this driver includes only part of the code 
- * that ST provide in their API.  Also, the API code isn't very clear and it is not easy
- * to identify what operations are useful and what are not. 
- * The operation shown here doesn't include any calibration, so is probably not as accurate
- * as using the full driver, but it's probably accurate enough for the purpose.
- * 
- * The device driver allocates up to 3 vpins to the device.  A digital read on the first pin
- * will return a value that indicates whether the object is within the threshold range (1)
- * or not (0).  An analogue read on the first pin returns the last measured distance (in mm), 
- * the second pin returns the signal strength, and the third pin returns detected 
- * ambient light level.  By default the device takes around 60ms to complete a ranging 
- * operation, so we do a 100ms cycle (10 samples per second).
- * 
- * The VL53L0X is initially set to respond to I2C address 0x29.  If you only have one module,
- * you can use this address.  However, the address can be modified by software.  If
- * you select another address, that address will be written to the device and used until the device is reset.
- * 
- * If you have more than one module, then you will need to specify a digital VPIN (Arduino
- * digital output or I/O extender pin) which you connect to the module's XSHUT pin.  Now,
- * when the device driver starts, the XSHUT pin is set LOW to turn the module off.  Once 
- * all VL53L0X modules are turned off, the driver works through each module in turn by
- * setting XSHUT to HIGH to turn the module on,, then writing the module's desired I2C address.
- * In this way, many VL53L0X modules can be connected to the one I2C bus, each one 
- * using a distinct I2C address.
- * 
- * WARNING:  If the device's XSHUT pin is not connected, then it is very prone to noise, 
- * and the device may even reset when handled.  If you're not using XSHUT, then it's 
- * best to tie it to +5V.
- * 
- * The driver is configured as follows:
- * 
- * Single VL53L0X module:
- *      VL53L0X::create(firstVpin, nPins, i2cAddress, lowThreshold, highThreshold);
- * Where firstVpin is the first vpin reserved for reading the device,
- *       nPins is 1, 2 or 3,
- *       i2cAddress is the address of the device (normally 0x29),
- *       lowThreshold is the distance at which the digital vpin state is set to 1 (in mm),
- *   and highThreshold is the distance at which the digital vpin state is set to 0 (in mm).
- * 
- * Multiple VL53L0X modules:
- *       VL53L0X::create(firstVpin, nPins, i2cAddress, lowThreshold, highThreshold, xshutPin);
- *       ...
- * Where firstVpin is the first vpin reserved for reading the device,
- *       nPins is 1, 2 or 3,
- *       i2cAddress is the address of the device (any valid address except 0x29),
- *       lowThreshold is the distance at which the digital vpin state is set to 1 (in mm),
- *       highThreshold is the distance at which the digital vpin state is set to 0 (in mm),
- *   and xshutPin is the VPIN number corresponding to a digital output that is connected to the
- *       XSHUT terminal on the module.
- * 
- * Example:
- *   In mySetup function within mySetup.cpp:
- *      VL53L0X::create(4000, 3, 0x29, 200, 250);
- *      Sensor::create(4000, 4000, 0);  // Create a sensor
- * 
- *   When an object comes within 200mm of the sensor, a message 
- *      <Q 4000>
- *   will be sent over the serial USB, and when the object moves more than 250mm from the sensor, 
- *   a message
- *      <q 4000>
- *   will be sent. 
- * 
- */
-
-#ifndef IO_VL53L0X_h
-#define IO_VL53L0X_h
-
-#include "IODevice.h"
-
-class VL53L0X : public IODevice {
-private: 
-  uint8_t _i2cAddress;
-  uint16_t _ambient;
-  uint16_t _distance;
-  uint16_t _signal;
-  uint16_t _onThreshold;
-  uint16_t _offThreshold;
-  VPIN _xshutPin;
-  bool _value;
-  uint8_t _nextState = 0;
-  I2CRB _rb;
-  uint8_t _inBuffer[12];
-  uint8_t _outBuffer[2];
-  // State machine states.
-  enum : uint8_t {
-    STATE_INIT = 0,
-    STATE_CONFIGUREADDRESS = 1,
-    STATE_SKIP = 2,
-    STATE_CONFIGUREDEVICE = 3,
-    STATE_INITIATESCAN = 4,
-    STATE_CHECKSTATUS = 5,
-    STATE_GETRESULTS = 6,
-    STATE_DECODERESULTS = 7,
-  };
-
-  // Register addresses
-  enum : uint8_t {
-    VL53L0X_REG_SYSRANGE_START=0x00,
-    VL53L0X_REG_RESULT_INTERRUPT_STATUS=0x13,
-    VL53L0X_REG_RESULT_RANGE_STATUS=0x14,
-    VL53L0X_CONFIG_PAD_SCL_SDA__EXTSUP_HV=0x89,
-    VL53L0X_REG_I2C_SLAVE_DEVICE_ADDRESS=0x8A,
-  };
-  const uint8_t VL53L0X_I2C_DEFAULT_ADDRESS=0x29;
-
-
-  public:
-  static void create(VPIN firstVpin, int nPins, uint8_t i2cAddress, uint16_t onThreshold, uint16_t offThreshold, VPIN xshutPin = VPIN_NONE) {
-     if (checkNoOverlap(firstVpin, nPins,i2cAddress)) new VL53L0X(firstVpin, nPins, i2cAddress, onThreshold, offThreshold, xshutPin);
-  }
-
-protected:
-  VL53L0X(VPIN firstVpin, int nPins, uint8_t i2cAddress, uint16_t onThreshold, uint16_t offThreshold, VPIN xshutPin = VPIN_NONE) {
-    _firstVpin = firstVpin;
-    _nPins = min(nPins, 3);
-    _i2cAddress = i2cAddress;
-    _onThreshold = onThreshold;
-    _offThreshold = offThreshold;
-    _xshutPin = xshutPin;
-    _value = 0;
-    addDevice(this);
-  }
-  void _begin() override {
-    if (_xshutPin == VPIN_NONE) {
-      // Check if device is already responding on the nominated address.
-      if (I2CManager.exists(_i2cAddress)) {
-        // Yes, it's already on this address, so skip the address initialisation.
-        _nextState = STATE_CONFIGUREDEVICE;
-      } else {
-        _nextState = STATE_INIT;
-      }
-    }
-  }
-
-  void _loop(unsigned long currentMicros) override {
-    uint8_t status;
-    switch (_nextState) {
-      case STATE_INIT:
-        // On first entry to loop, reset this module by pulling XSHUT low.  All modules
-        // will be reset in turn.
-        if (_xshutPin != VPIN_NONE) IODevice::write(_xshutPin, 0);
-        _nextState = STATE_CONFIGUREADDRESS;
-        break;
-      case STATE_CONFIGUREADDRESS:
-        // On second entry, set XSHUT pin high to allow the module to restart.
-        // On the module, there is a diode in series with the XSHUT pin to 
-        // protect the low-voltage pin against +5V.
-        if (_xshutPin != VPIN_NONE) IODevice::write(_xshutPin, 1);
-        // Allow the module time to restart
-        delay(10);
-        // Then write the desired I2C address to the device, while this is the only
-        //  module responding to the default address.
-        I2CManager.write(VL53L0X_I2C_DEFAULT_ADDRESS, 2, VL53L0X_REG_I2C_SLAVE_DEVICE_ADDRESS, _i2cAddress);
-        _nextState = STATE_SKIP;
-        break;
-      case STATE_SKIP:
-        // Do nothing on the third entry.
-        _nextState = STATE_CONFIGUREDEVICE;
-        break;
-      case STATE_CONFIGUREDEVICE:
-        // On next entry, check if device address has been set.
-        if (I2CManager.exists(_i2cAddress)) {
-          #ifdef DIAG_IO
-          _display();
-          #endif
-          // Set 2.8V mode
-          write_reg(VL53L0X_CONFIG_PAD_SCL_SDA__EXTSUP_HV, 
-            read_reg(VL53L0X_CONFIG_PAD_SCL_SDA__EXTSUP_HV) | 0x01);
-        } else {
-          DIAG(F("VL53L0X I2C:x%x device not responding"), _i2cAddress);
-          _deviceState = DEVSTATE_FAILED;
-        }
-        _nextState = STATE_INITIATESCAN;
-        break;
-      case STATE_INITIATESCAN:
-        // Not scanning, so initiate a scan
-        _outBuffer[0] = VL53L0X_REG_SYSRANGE_START;
-        _outBuffer[1] = 0x01;
-        I2CManager.write(_i2cAddress, _outBuffer, 2, &_rb);
-        _nextState = STATE_CHECKSTATUS;
-        break;
-      case STATE_CHECKSTATUS:
-        status = _rb.status;
-        if (status == I2C_STATUS_PENDING) return; // try next time
-        if (status != I2C_STATUS_OK) {
-          DIAG(F("VL53L0X I2C:x%x Error:%d %S"), _i2cAddress, status, I2CManager.getErrorMessage(status));
-          _deviceState = DEVSTATE_FAILED;
-          _value = false;
-        } else
-          _nextState = 2;
-        delayUntil(currentMicros + 95000); // wait for 95 ms before checking.
-        _nextState = STATE_GETRESULTS;
-        break;
-      case STATE_GETRESULTS:
-        // Ranging completed.  Request results
-        _outBuffer[0] = VL53L0X_REG_RESULT_RANGE_STATUS;
-        I2CManager.read(_i2cAddress, _inBuffer, 12, _outBuffer, 1, &_rb);
-        _nextState = 3;
-        delayUntil(currentMicros + 5000); // Allow 5ms to get data
-        _nextState = STATE_DECODERESULTS;
-        break;
-      case STATE_DECODERESULTS:
-        // If I2C write still busy, return.
-        status = _rb.status;
-        if (status == I2C_STATUS_PENDING) return; // try again next time
-        if (status == I2C_STATUS_OK) {
-          if (!(_inBuffer[0] & 1)) return; // device still busy
-          uint8_t deviceRangeStatus = ((_inBuffer[0] & 0x78) >> 3);
-          if (deviceRangeStatus == 0x0b) {
-            // Range status OK, so use data
-            _ambient = makeuint16(_inBuffer[7], _inBuffer[6]);
-            _signal = makeuint16(_inBuffer[9], _inBuffer[8]);
-            _distance = makeuint16(_inBuffer[11], _inBuffer[10]);
-            if (_distance <= _onThreshold) 
-              _value = true;
-            else if (_distance > _offThreshold) 
-              _value = false;
-          }
-        }
-        // Completed. Restart scan on next loop entry.
-        _nextState = STATE_INITIATESCAN;
-        break;
-      default:
-        break;
-    }
-  }
-
-  // For analogue read, first pin returns distance, second pin is signal strength, and third is ambient level.
-  int _readAnalogue(VPIN vpin) override {
-    int pin = vpin - _firstVpin;
-    switch (pin) {
-      case 0:
-        return _distance;
-      case 1:
-        return _signal;
-      case 2:
-        return _ambient;
-      default:
-        return -1;
-    }
-  }
-
-  // For digital read, return zero for all but first pin.
-  int _read(VPIN vpin) override {
-    if (vpin == _firstVpin)
-      return _value;
-    else
-      return 0;
-  }
-
-  void _display() override {
-    DIAG(F("VL53L0X I2C:x%x Configured on Vpins:%d-%d On:%dmm Off:%dmm %S"),
-      _i2cAddress, _firstVpin, _firstVpin+_nPins-1, _onThreshold, _offThreshold,
-      (_deviceState==DEVSTATE_FAILED) ? F("OFFLINE") : F(""));
-  }
-  
-
-private:
-  inline uint16_t makeuint16(byte lsb, byte msb) {
-    return (((uint16_t)msb) << 8) | lsb;
-  }
-  uint8_t write_reg(uint8_t reg, uint8_t data) {
-    // write byte to register
-    uint8_t outBuffer[2];
-    outBuffer[0] = reg;
-    outBuffer[1] = data;
-    return I2CManager.write(_i2cAddress, outBuffer, 2);
-  }
-  uint8_t read_reg(uint8_t reg) {
-    // read byte from register and return value
-    I2CManager.read(_i2cAddress, _inBuffer, 1, &reg, 1);
-    return _inBuffer[0];
-  }
-};
-
-#endif // IO_VL53L0X_h

LCDDisplay.h

@@ -19,12 +19,15 @@
 #ifndef LCDDisplay_h
 #define LCDDisplay_h
 #include <Arduino.h>
-#include "defines.h"
 #include "DisplayInterface.h"
 
+#if __has_include ( "config.h")
+  #include "config.h"
+#endif
+
 // Allow maximum message length to be overridden from config.h
 #if !defined(MAX_MSG_SIZE) 
-#define MAX_MSG_SIZE 20
+#define MAX_MSG_SIZE 16
 #endif
 
 // Set default scroll mode (overridable in config.h)

LCN.cpp

@@ -48,13 +48,10 @@ void LCN::loop() {
     }
     else if (ch == 't' || ch == 'T') { // Turnout opcodes
       if (Diag::LCN) DIAG(F("LCN IN %d%c"),id,(char)ch);
-      if (!Turnout::exists(id)) LCNTurnout::create(id);
+      Turnout * tt = Turnout::get(id);
+      if (!tt) tt=Turnout::createLCN(id);
       Turnout::setClosedStateOnly(id,ch=='t');
-      id = 0;
-    }
-    else if (ch == 'y' || ch == 'Y') { // Turnout opcodes
-      if (Diag::LCN) DIAG(F("LCN IN %d%c"),id,(char)ch);
-      Turnout::setClosed(id,ch=='y');
+      Turnout::turnoutlistHash++; // signals ED update of turnout data
       id = 0;
     }
     else if (ch == 'S' || ch == 's') {

LCN.h

@@ -1,7 +1,5 @@
 /*
- *  © 2021 Harald Barth
- *  © 2021 Fred Decker
- *  All rights reserved.
+ *  (c) 2021 Fred Decker.  All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *

LiquidCrystal_I2C.cpp

@@ -196,7 +196,7 @@ void LiquidCrystal_I2C::send(uint8_t value, uint8_t mode) {
   outputBuffer[len++] = highnib;
   outputBuffer[len++] = lownib|En;
   outputBuffer[len++] = lownib;
-  I2CManager.write(_Addr, outputBuffer, len);  // Write command synchronously
+  I2CManager.write(_Addr, outputBuffer, len, &requestBlock);
 }
 
 // write 4 data bits to the HD44780 LCD controller.
@@ -205,15 +205,19 @@ void LiquidCrystal_I2C::write4bits(uint8_t value) {
   // Enable must be set/reset for at least 450ns.  This is well within the
   // I2C clock cycle time of 2.5us at 400kHz. Data is clocked in to the
   // HD44780 on the trailing edge of the Enable pin.
+  // Wait for previous request to complete before writing to outputbuffer.
+  requestBlock.wait();
   uint8_t len = 0;
   outputBuffer[len++] = _data|En;
   outputBuffer[len++] = _data;
-  I2CManager.write(_Addr, outputBuffer, len);  // Write command synchronously
+  I2CManager.write(_Addr, outputBuffer, len, &requestBlock);
 }
 
 // write a byte to the PCF8574 I2C interface.  We don't need to set
 // the enable pin for this.
 void LiquidCrystal_I2C::expanderWrite(uint8_t value) {
+  // Wait for previous request to complete before writing to outputbuffer.
+  requestBlock.wait();
   outputBuffer[0] = value | _backlightval;
-  I2CManager.write(_Addr, outputBuffer, 1);  // Write command synchronously
+  I2CManager.write(_Addr, outputBuffer, 1, &requestBlock);
 }

LiquidCrystal_I2C.h

@@ -75,8 +75,10 @@ public:
   void backlight();
   
   void command(uint8_t);
+  void init();
 
 private:
+  void init_priv();
   void send(uint8_t, uint8_t);
   void write4bits(uint8_t);
   void expanderWrite(uint8_t);
@@ -86,9 +88,9 @@ private:
   uint8_t _displaymode;
   uint8_t _backlightval;
 
+  I2CRB requestBlock;
   uint8_t outputBuffer[4];
-  // I/O is synchronous, so if this is called we're not busy!
-  bool isBusy() override { return false; } 
+  bool isBusy() { return requestBlock.isBusy(); }
 };
 
 #endif

MotorDriver.cpp

@@ -1,12 +1,7 @@
 /*
- *  © 2022 Paul M Antoine
- *  © 2021 Mike S
- *  © 2021 Fred Decker
- *  © 2020-2022 Harald Barth
- *  © 2020-2021 Chris Harlow
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
  *  
- *  This file is part of CommandStation-EX
+ *  This file is part of Asbelos DCC API
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,72 +18,27 @@
  */
 #include <Arduino.h>
 #include "MotorDriver.h"
-#include "DCCWaveform.h"
 #include "DCCTimer.h"
 #include "DIAG.h"
-#define ADC_INPUT_MAX_VALUE 1023 // 10 bit ADC
 
-#if defined(ARDUINO_ARCH_ESP32)
-#include "ESP32-fixes.h"
-#include <driver/adc.h>
-#include <soc/sens_reg.h>
-#include <soc/sens_struct.h>
-#undef ADC_INPUT_MAX_VALUE
-#define ADC_INPUT_MAX_VALUE 4095 // 12 bit ADC
-#define pinToADC1Channel(X) (adc1_channel_t)(((X) > 35) ? (X)-36 : (X)-28)
-
-int IRAM_ATTR local_adc1_get_raw(int channel) {
-  uint16_t adc_value;
-  SENS.sar_meas_start1.sar1_en_pad = (1 << channel); // only one channel is selected
-  while (SENS.sar_slave_addr1.meas_status != 0);
-  SENS.sar_meas_start1.meas1_start_sar = 0;
-  SENS.sar_meas_start1.meas1_start_sar = 1;
-  while (SENS.sar_meas_start1.meas1_done_sar == 0);
-  adc_value = SENS.sar_meas_start1.meas1_data_sar;
-  return adc_value;
-}
-
-#endif
+#define setHIGH(fastpin)  *fastpin.inout |= fastpin.maskHIGH
+#define setLOW(fastpin)   *fastpin.inout &= fastpin.maskLOW
+#define isHIGH(fastpin)   (*fastpin.inout & fastpin.maskHIGH)
+#define isLOW(fastpin)    (!isHIGH(fastpin))
 
+bool MotorDriver::usePWM=false;
 bool MotorDriver::commonFaultPin=false;
-
-volatile portreg_t shadowPORTA;
-volatile portreg_t shadowPORTB;
-volatile portreg_t shadowPORTC;
-
-MotorDriver::MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, int8_t brake_pin,
+       
+MotorDriver::MotorDriver(byte power_pin, byte signal_pin, byte signal_pin2, int8_t brake_pin,
                          byte current_pin, float sense_factor, unsigned int trip_milliamps, byte fault_pin) {
   powerPin=power_pin;
-  invertPower=power_pin < 0;
-  if (invertPower) {
-    powerPin = 0-power_pin;
-    IODevice::write(powerPin,HIGH);// set to OUTPUT and off
-  } else {
-    powerPin = power_pin;
-    IODevice::write(powerPin,LOW);// set to OUTPUT and off
-  }
+  getFastPin(F("POWER"),powerPin,fastPowerPin);
+  pinMode(powerPin, OUTPUT);
   
   signalPin=signal_pin;
   getFastPin(F("SIG"),signalPin,fastSignalPin);
   pinMode(signalPin, OUTPUT);
-
-  fastSignalPin.shadowinout = NULL;
-  if (HAVE_PORTA(fastSignalPin.inout == &PORTA)) {
-    DIAG(F("Found PORTA pin %d"),signalPin);
-    fastSignalPin.shadowinout = fastSignalPin.inout;
-    fastSignalPin.inout = &shadowPORTA;
-  }
-  if (HAVE_PORTB(fastSignalPin.inout == &PORTB)) {
-    DIAG(F("Found PORTB pin %d"),signalPin);
-    fastSignalPin.shadowinout = fastSignalPin.inout;
-    fastSignalPin.inout = &shadowPORTB;
-  }
-  if (HAVE_PORTC(fastSignalPin.inout == &PORTC)) {
-    DIAG(F("Found PORTC pin %d"),signalPin);
-    fastSignalPin.shadowinout = fastSignalPin.inout;
-    fastSignalPin.inout = &shadowPORTC;
-  }
-
+  
   signalPin2=signal_pin2;
   if (signalPin2!=UNUSED_PIN) {
     dualSignal=true;
@@ -102,23 +52,15 @@ MotorDriver::MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, i
     invertBrake=brake_pin < 0;
     brakePin=invertBrake ? 0-brake_pin : brake_pin;
     getFastPin(F("BRAKE"),brakePin,fastBrakePin);
-    // if brake is used for railcom  cutout we need to do PORTX register trick here as well
     pinMode(brakePin, OUTPUT);
-    setBrake(true);  // start with brake on in case we hace DC stuff going on
+    setBrake(false);
   }
   else brakePin=UNUSED_PIN;
   
   currentPin=current_pin;
   if (currentPin!=UNUSED_PIN) {
-#ifdef ARDUINO_ARCH_ESP32
-    pinMode(currentPin, ANALOG);
-    adc1_config_width(ADC_WIDTH_BIT_12);
-    adc1_config_channel_atten(pinToADC1Channel(currentPin),ADC_ATTEN_DB_11);
-    senseOffset = adc1_get_raw(pinToADC1Channel(currentPin));
-#else
     pinMode(currentPin, INPUT);
     senseOffset=analogRead(currentPin); // value of sensor at zero current
-#endif
   }
 
   faultPin=fault_pin;
@@ -127,40 +69,15 @@ MotorDriver::MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, i
     pinMode(faultPin, INPUT);
   }
 
-  // This conversion performed at compile time so the remainder of the code never needs
-  // float calculations or libraray code. 
-  senseFactorInternal=sense_factor * senseScale; 
+  senseFactor=sense_factor;
   tripMilliamps=trip_milliamps;
-  rawCurrentTripValue=mA2raw(trip_milliamps);
-
-  if (rawCurrentTripValue + senseOffset > ADC_INPUT_MAX_VALUE) {
-    // This would mean that the values obtained from the ADC never
-    // can reach the trip value. So independent of the current, the
-    // short circuit protection would never trip. So we adjust the
-    // trip value so that it is tiggered when the ADC reports it's
-    // maximum value instead.
-
-    //    DIAG(F("Changing short detection value from %d to %d mA"),
-    // raw2mA(rawCurrentTripValue), raw2mA(ADC_INPUT_MAX_VALUE-senseOffset));
-    rawCurrentTripValue=ADC_INPUT_MAX_VALUE-senseOffset;
-  }
-
+  rawCurrentTripValue=(int)(trip_milliamps / sense_factor);
+  
   if (currentPin==UNUSED_PIN) 
-    DIAG(F("** WARNING ** No current or short detection"));
-  else  {
-    DIAG(F("CurrentPin=A%d, Offset=%d, TripValue=%d"),
+    DIAG(F("MotorDriver ** WARNING ** No current or short detection"));  
+  else  
+    DIAG(F("MotorDriver currentPin=A%d, senseOffset=%d, rawCurentTripValue(relative to offset)=%d"),
     currentPin-A0, senseOffset,rawCurrentTripValue);
-
-    // self testing diagnostic for the non-float converters... may be removed when happy
-    //  DIAG(F("senseFactorInternal=%d raw2mA(1000)=%d mA2Raw(1000)=%d"),
-    //   senseFactorInternal, raw2mA(1000),mA2raw(1000));
-  }
-
-  // prepare values for current detection
-  sampleDelay = 0;
-  lastSampleTaken = millis();
-  progTripValue = mA2raw(TRIP_CURRENT_PROG); 
-
 }
 
 bool MotorDriver::isPWMCapable() {
@@ -168,21 +85,15 @@ bool MotorDriver::isPWMCapable() {
 }
 
 
-void MotorDriver::setPower(POWERMODE mode) {
-  bool on=mode==POWERMODE::ON;
+void MotorDriver::setPower(bool on) {
   if (on) {
-    noInterrupts();
-    IODevice::write(powerPin,invertPower ? LOW : HIGH);
-    interrupts();
-    if (isProgTrack)
-      DCCWaveform::progTrack.clearResets();
+    // toggle brake before turning power on - resets overcurrent error
+    // on the Pololu board if brake is wired to ^D2.
+    setBrake(true);
+    setBrake(false);
+    setHIGH(fastPowerPin);
   }
-  else {
-      noInterrupts();
-      IODevice::write(powerPin,invertPower ? HIGH : LOW);
-      interrupts();
-  }
-  powerMode=mode; 
+  else setLOW(fastPowerPin);
 }
 
 // setBrake applies brake if on == true. So to get
@@ -193,16 +104,32 @@ void MotorDriver::setPower(POWERMODE mode) {
 // (HIGH == release brake) and setBrake does
 // compensate for that.
 //
-void MotorDriver::setBrake(bool on, bool interruptContext) {
+void MotorDriver::setBrake(bool on) {
   if (brakePin == UNUSED_PIN) return;
-  if (!interruptContext) {noInterrupts();}
-  if (on ^ invertBrake)
-    setHIGH(fastBrakePin);
-  else
-    setLOW(fastBrakePin);
-  if (!interruptContext) {interrupts();}
+  if (on ^ invertBrake) setHIGH(fastBrakePin);
+  else setLOW(fastBrakePin);
 }
 
+void MotorDriver::setSignal( bool high) {
+   if (usePWM) {
+    DCCTimer::setPWM(signalPin,high);
+   }
+   else {
+     if (high) {
+        setHIGH(fastSignalPin);
+        if (dualSignal) setLOW(fastSignalPin2);
+     }
+     else {
+        setLOW(fastSignalPin);
+        if (dualSignal) setHIGH(fastSignalPin2);
+     }
+   }
+}
+
+#if defined(ARDUINO_TEENSY32) || defined(ARDUINO_TEENSY35)|| defined(ARDUINO_TEENSY36)
+volatile unsigned int overflow_count=0;
+#endif
+
 bool MotorDriver::canMeasureCurrent() {
   return currentPin!=UNUSED_PIN;
 }
@@ -217,106 +144,40 @@ bool MotorDriver::canMeasureCurrent() {
 int MotorDriver::getCurrentRaw() {
   if (currentPin==UNUSED_PIN) return 0; 
   int current;
-  // This function should NOT be called in an interruot so we 
-  // dont need to fart about saving and restoring CPU specific 
-  // interrupt registers. 
-#ifdef ARDUINO_ARCH_ESP32
-  current = local_adc1_get_raw(pinToADC1Channel(currentPin))-senseOffset;
-#else
-  noInterrupts();
+#if defined(ARDUINO_TEENSY40) || defined(ARDUINO_TEENSY41)
+  bool irq = disableInterrupts();
+  current = analogRead(currentPin)-senseOffset;
+  enableInterrupts(irq);
+#elif defined(ARDUINO_TEENSY32) || defined(ARDUINO_TEENSY35)|| defined(ARDUINO_TEENSY36)
+  unsigned char sreg_backup;
+  sreg_backup = SREG;   /* save interrupt enable/disable state */
+  cli();
+  current = analogRead(currentPin)-senseOffset;
+  overflow_count = 0;
+  SREG = sreg_backup;    /* restore interrupt state */
+#else
   current = analogRead(currentPin)-senseOffset;
-  interrupts();
 #endif
   if (current<0) current=0-current;
-  if ((faultPin != UNUSED_PIN)  && isLOW(fastFaultPin) && powerMode==POWERMODE::ON)
+  if ((faultPin != UNUSED_PIN)  && isLOW(fastFaultPin) && isHIGH(fastPowerPin))
       return (current == 0 ? -1 : -current);
   return current;
-   
-}
-
-void MotorDriver::setDCSignal(byte speedcode) {
-  if (brakePin == UNUSED_PIN)
-    return;
-#if defined(ARDUINO_ARCH_ESP32)
-  DCCEXanalogWriteFrequency(brakePin, 100); // set DC PWM frequency to 100Hz XXX May move to setup
-#endif
-#if defined(ARDUINO_AVR_UNO)
-  TCCR2B = (TCCR2B & B11111000) | B00000110; // set divisor on timer 2 to result in (approx) 122.55Hz
-#endif
-#if defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560)
-  TCCR2B = (TCCR2B & B11111000) | B00000110; // set divisor on timer 2 to result in (approx) 122.55Hz
-  TCCR4B = (TCCR4B & B11111000) | B00000100; // same for timer 4 but maxcount and thus divisor differs
-#endif
-  // spedcoode is a dcc speed & direction
-  byte tSpeed=speedcode & 0x7F; // DCC Speed with 0,1 stop and speed steps 2 to 127
-  byte tDir=speedcode & 0x80;
-  byte brake;
-  if (tSpeed <= 1) brake = 255;
-  else if (tSpeed >= 127) brake = 0;
-  else  brake = 2 * (128-tSpeed);
-  if (invertBrake)
-    brake=255-brake;
-#if defined(ARDUINO_ARCH_ESP32)
-  DCCEXanalogWrite(brakePin,brake);
-#else
-  analogWrite(brakePin,brake);
-#endif
-  //DIAG(F("DCSignal %d"), speedcode);
-  if (HAVE_PORTA(fastSignalPin.shadowinout == &PORTA)) {
-    noInterrupts();
-    HAVE_PORTA(shadowPORTA=PORTA);
-    setSignal(tDir);
-    HAVE_PORTA(PORTA=shadowPORTA);
-    interrupts();
-  } else if (HAVE_PORTB(fastSignalPin.shadowinout == &PORTB)) {
-    noInterrupts();
-    HAVE_PORTB(shadowPORTB=PORTB);
-    setSignal(tDir);
-    HAVE_PORTB(PORTB=shadowPORTB);
-    interrupts();
-  } else if (HAVE_PORTC(fastSignalPin.shadowinout == &PORTC)) {
-    noInterrupts();
-    HAVE_PORTC(shadowPORTC=PORTC);
-    setSignal(tDir);
-    HAVE_PORTC(PORTC=shadowPORTC);
-    interrupts();
-  } else {
-    noInterrupts();
-    setSignal(tDir);
-    interrupts();
-  }
-}
-
-int MotorDriver::getCurrentRawInInterrupt() {
-  
-  // IMPORTANT:  This function must be called in Interrupt() time within the 56uS timer
+  // IMPORTANT:  This function can be called in Interrupt() time within the 56uS timer
   //             The default analogRead takes ~100uS which is catastrphic
   //             so DCCTimer has set the sample time to be much faster.  
-  if (currentPin==UNUSED_PIN) return 0; 
-#ifdef ARDUINO_ARCH_ESP32 //On ESP we do all in loop() instead of in interrupt
-  return getCurrentRaw();
-#else
-  return analogRead(currentPin)-senseOffset;
-#endif
-}  
+}
 
 unsigned int MotorDriver::raw2mA( int raw) {
-  return (int32_t)raw * senseFactorInternal / senseScale;
+  return (unsigned int)(raw * senseFactor);
 }
-unsigned int MotorDriver::mA2raw( unsigned int mA) {
-  return (int32_t)mA * senseScale / senseFactorInternal;
+int MotorDriver::mA2raw( unsigned int mA) {
+  return (int)(mA / senseFactor);
 }
 
 void  MotorDriver::getFastPin(const FSH* type,int pin, bool input, FASTPIN & result) {
     // DIAG(F("MotorDriver %S Pin=%d,"),type,pin);
-    (void) type; // avoid compiler warning if diag not used above.
-#if defined(ARDUINO_ARCH_SAMD)
-    PortGroup *port = digitalPinToPort(pin);
-#elif defined(ARDUINO_ARCH_STM32)
-    GPIO_TypeDef *port = digitalPinToPort(pin);
-#else
+    (void) type; // avoid compiler warning if diag not used above. 
     uint8_t port = digitalPinToPort(pin);
-#endif
     if (input)
       result.inout = portInputRegister(port);
     else
@@ -325,65 +186,3 @@ void  MotorDriver::getFastPin(const FSH* type,int pin, bool input, FASTPIN & res
     result.maskLOW = ~result.maskHIGH;
     // DIAG(F(" port=0x%x, inoutpin=0x%x, isinput=%d, mask=0x%x"),port, result.inout,input,result.maskHIGH);
 }
-
-void MotorDriver::checkPowerOverload(bool useProgLimit, byte trackno) {
-  if (millis() - lastSampleTaken  < sampleDelay) return;
-  lastSampleTaken = millis();
-  int tripValue= useProgLimit?progTripValue:getRawCurrentTripValue();
-  
-  // Trackname for diag messages later
-  switch (powerMode) {
-    case POWERMODE::OFF:
-      sampleDelay = POWER_SAMPLE_OFF_WAIT;
-      break;
-    case POWERMODE::ON:
-      // Check current
-      lastCurrent=getCurrentRaw();
-      if (lastCurrent < 0) {
-	  // We have a fault pin condition to take care of
-	  lastCurrent = -lastCurrent;
-	  setPower(POWERMODE::OVERLOAD); // Turn off, decide later how fast to turn on again
-	  if (commonFaultPin) {
-	      if (lastCurrent < tripValue) {
-		      setPower(POWERMODE::ON); // maybe other track
-	      }
-	      // Write this after the fact as we want to turn on as fast as possible
-	      // because we don't know which output actually triggered the fault pin
-	      DIAG(F("COMMON FAULT PIN ACTIVE: POWERTOGGLE TRACK %c"), trackno + 'A');
-	  } else {
-	    DIAG(F("TRACK %c FAULT PIN ACTIVE - OVERLOAD"), trackno + 'A');
-	      if (lastCurrent < tripValue) {
-		  lastCurrent = tripValue; // exaggerate
-	      }
-	  }
-      }
-      if (lastCurrent < tripValue) {
-        sampleDelay = POWER_SAMPLE_ON_WAIT;
-	if(power_good_counter<100)
-	  power_good_counter++;
-	else
-	  if (power_sample_overload_wait>POWER_SAMPLE_OVERLOAD_WAIT) power_sample_overload_wait=POWER_SAMPLE_OVERLOAD_WAIT;
-      } else {
-        setPower(POWERMODE::OVERLOAD);
-        unsigned int mA=raw2mA(lastCurrent);
-        unsigned int maxmA=raw2mA(tripValue);
-	      power_good_counter=0;
-        sampleDelay = power_sample_overload_wait;
-        DIAG(F("TRACK %c POWER OVERLOAD %dmA (limit %dmA) shutdown for %dms"), trackno + 'A', mA, maxmA, sampleDelay);
-	if (power_sample_overload_wait >= 10000)
-	    power_sample_overload_wait = 10000;
-	else
-	    power_sample_overload_wait *= 2;
-      }
-      break;
-    case POWERMODE::OVERLOAD:
-      // Try setting it back on after the OVERLOAD_WAIT
-      setPower(POWERMODE::ON);
-      sampleDelay = POWER_SAMPLE_ON_WAIT;
-      // Debug code....
-      DIAG(F("TRACK %c POWER RESTORE (check %dms)"), trackno + 'A', sampleDelay);
-      break;
-    default:
-      sampleDelay = 999; // cant get here..meaningless statement to avoid compiler warning.
-  }
-}

MotorDriver.h

@@ -1,12 +1,7 @@
 /*
- *  © 2022 Paul M Antoine
- *  © 2021 Mike S
- *  © 2021 Fred Decker
- *  © 2020 Chris Harlow
- *  © 2022 Harald Barth
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
  *  
- *  This file is part of CommandStation-EX
+ *  This file is part of Asbelos DCC API
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -24,52 +19,6 @@
 #ifndef MotorDriver_h
 #define MotorDriver_h
 #include "FSH.h"
-#include "IODevice.h"
-#include "DCCTimer.h"
-
-#define setHIGH(fastpin)  *fastpin.inout |= fastpin.maskHIGH
-#define setLOW(fastpin)   *fastpin.inout &= fastpin.maskLOW
-#define isHIGH(fastpin)   (*fastpin.inout & fastpin.maskHIGH)
-#define isLOW(fastpin)    (!isHIGH(fastpin))
-
-#define TOKENPASTE(x, y) x ## y
-#define TOKENPASTE2(x, y) TOKENPASTE(x, y)
-
-#if defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560)
-#define HAVE_PORTA(X) X
-#define HAVE_PORTB(X) X
-#define HAVE_PORTC(X) X
-#endif
-#if defined(ARDUINO_AVR_UNO)
-#define HAVE_PORTB(X) X
-#endif
-#if defined(ARDUINO_ARCH_SAMD)
-#define PORTA REG_PORT_OUT0
-#define HAVE_PORTA(X) X
-#define PORTB REG_PORT_OUT1
-#define HAVE_PORTB(X) X
-#endif
-#if defined(ARDUINO_ARCH_STM32)
-#define PORTA GPIOA->ODR
-#define HAVE_PORTA(X) X
-#define PORTB GPIOB->ODR
-#define HAVE_PORTB(X) X
-#define PORTC GPIOC->ODR
-#define HAVE_PORTC(X) X
-#endif
-
-// if macros not defined as pass-through we define
-// them here as someting that is valid as a
-// statement and evaluates to false.
-#ifndef HAVE_PORTA
-#define HAVE_PORTA(X) byte TOKENPASTE2(Unique_, __LINE__) __attribute__((unused)) =0
-#endif
-#ifndef HAVE_PORTB
-#define HAVE_PORTB(X) byte TOKENPASTE2(Unique_, __LINE__) __attribute__((unused)) =0
-#endif
-#ifndef HAVE_PORTC
-#define HAVE_PORTC(X) byte TOKENPASTE2(Unique_, __LINE__) __attribute__((unused)) =0
-#endif
 
 // Virtualised Motor shield 1-track hardware Interface
 
@@ -77,154 +26,63 @@
 #define UNUSED_PIN 127 // inside int8_t
 #endif
 
-class pinpair {
-public:
-  pinpair(byte p1, byte p2) {
-    pin = p1;
-    invpin = p2;
-  };
-  byte pin = UNUSED_PIN;
-  byte invpin = UNUSED_PIN;
-};
-
-#if defined(__IMXRT1062__) || defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_STM32)
-typedef uint32_t portreg_t;
-#else
-typedef uint8_t portreg_t;
-#endif
-
+#if defined(__IMXRT1062__)
 struct FASTPIN {
-  volatile portreg_t *inout;
-  portreg_t maskHIGH;
-  portreg_t maskLOW;
-  volatile portreg_t *shadowinout;
+  volatile uint32_t *inout;
+  uint32_t maskHIGH;  
+  uint32_t maskLOW;  
 };
-// The port registers that are shadowing
-// the real port registers. These are
-// defined in Motordriver.cpp
-extern volatile portreg_t shadowPORTA;
-extern volatile portreg_t shadowPORTB;
-extern volatile portreg_t shadowPORTC;
-
-enum class POWERMODE : byte { OFF, ON, OVERLOAD };
+#else
+struct FASTPIN {
+  volatile uint8_t *inout;
+  uint8_t maskHIGH;  
+  uint8_t maskLOW;  
+};
+#endif
 
 class MotorDriver {
   public:
-    
-    MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, int8_t brake_pin, 
+    MotorDriver(byte power_pin, byte signal_pin, byte signal_pin2, int8_t brake_pin, 
                 byte current_pin, float senseFactor, unsigned int tripMilliamps, byte faultPin);
-    void setPower( POWERMODE mode);
-    POWERMODE getPower() { return powerMode;}
-    // as the port registers can be shadowed to get syncronized DCC signals
-    // we need to take care of that and we have to turn off interrupts if
-    // we setSignal() or setBrake() or setPower() during that time as
-    // otherwise the call from interrupt context can undo whatever we do
-    // from outside interrupt
-    void setBrake( bool on, bool interruptContext=false);
-  __attribute__((always_inline)) inline void setSignal( bool high) {
-      if (trackPWM) {
-	DCCTimer::setPWM(signalPin,high);
-      }
-      else {
-	if (high) {
-	  setHIGH(fastSignalPin);
-	  if (dualSignal) setLOW(fastSignalPin2);
-	}
-	else {
-	  setLOW(fastSignalPin);
-	  if (dualSignal) setHIGH(fastSignalPin2);
-	}
-      }
-    };
-    inline void enableSignal(bool on) {
-      if (on)
-	pinMode(signalPin, OUTPUT);
-      else
-	pinMode(signalPin, INPUT);
-    };
-    inline pinpair getSignalPin() { return pinpair(signalPin,signalPin2); };
-    void setDCSignal(byte speedByte);
-    inline void detachDCSignal() {
-#if defined(__arm__)
-      pinMode(brakePin, OUTPUT);
-#elif defined(ARDUINO_ARCH_ESP32)
-      ledcDetachPin(brakePin);
-#else
-      setDCSignal(128);
-#endif
-    };
-    int  getCurrentRaw();
-    int getCurrentRawInInterrupt();
-    unsigned int raw2mA( int raw);
-    unsigned int mA2raw( unsigned int mA);
-    inline bool brakeCanPWM() {
-#if defined(ARDUINO_ARCH_ESP32) || defined(__arm__)
-      // TODO: on ARM we can use digitalPinHasPWM, and may wish/need to
-      return true;
-#else
-#ifdef digitalPinToTimer
-      return ((brakePin!=UNUSED_PIN) && (digitalPinToTimer(brakePin)));
-#else
-      return (brakePin<14 && brakePin >1);
-#endif //digitalPinToTimer
-#endif //ESP32/ARM
-    }
+    virtual void setPower( bool on);
+    virtual void setSignal( bool high);
+    virtual void setBrake( bool on);
+    virtual int  getCurrentRaw();
+    virtual unsigned int raw2mA( int raw);
+    virtual int mA2raw( unsigned int mA);
     inline int getRawCurrentTripValue() {
 	    return rawCurrentTripValue;
     }
     bool isPWMCapable();
     bool canMeasureCurrent();
-    bool trackPWM = false; // this track uses PWM timer to generate the DCC waveform
+    static bool usePWM;
     static bool commonFaultPin; // This is a stupid motor shield which has only a common fault pin for both outputs
     inline byte getFaultPin() {
 	return faultPin;
     }
-    inline void makeProgTrack(bool on) {  // let this output know it's a prog track.
-      isProgTrack = on;
-    }
-    void checkPowerOverload(bool useProgLimit, byte trackno);
   private:
-    bool isProgTrack = false; // tells us if this is a prog track
     void  getFastPin(const FSH* type,int pin, bool input, FASTPIN & result);
     void  getFastPin(const FSH* type,int pin, FASTPIN & result) {
 	getFastPin(type, pin, 0, result);
     }
-    VPIN powerPin;
-    byte signalPin, signalPin2, currentPin, faultPin, brakePin;
-    FASTPIN fastSignalPin, fastSignalPin2, fastBrakePin,fastFaultPin;
+    byte powerPin, signalPin, signalPin2, currentPin, faultPin, brakePin;
+    FASTPIN fastPowerPin,fastSignalPin, fastSignalPin2, fastBrakePin,fastFaultPin;
     bool dualSignal;       // true to use signalPin2
     bool invertBrake;       // brake pin passed as negative means pin is inverted
-    bool invertPower;       // power pin passed as negative means pin is inverted
-    
-    // Raw to milliamp conversion factors avoiding float data types.
-    // Milliamps=rawADCreading * sensefactorInternal / senseScale
-    //
-    // senseScale is chosen as 256 to give enough scale for 2 decimal place 
-    // raw->mA conversion with an ultra fast optimised integer multiplication  
-    int senseFactorInternal;  // set to senseFactor * senseScale
-    static const int senseScale=256;
+    float senseFactor;
     int senseOffset;
     unsigned int tripMilliamps;
     int rawCurrentTripValue;
-    // current sampling
-    POWERMODE powerMode;
-    unsigned long lastSampleTaken;
-    unsigned int sampleDelay;
-    int progTripValue;
-    int  lastCurrent;
-    int maxmA;
-    int tripmA;
-
-    // Wait times for power management. Unit: milliseconds
-    static const int  POWER_SAMPLE_ON_WAIT = 100;
-    static const int  POWER_SAMPLE_OFF_WAIT = 1000;
-    static const int  POWER_SAMPLE_OVERLOAD_WAIT = 20;
-    
-    // Trip current for programming track, 250mA. Change only if you really
-    // need to be non-NMRA-compliant because of decoders that are not either.
-    static const int TRIP_CURRENT_PROG=250;
-    unsigned long power_sample_overload_wait = POWER_SAMPLE_OVERLOAD_WAIT;
-    unsigned int power_good_counter = 0;
-
+#if defined(ARDUINO_TEENSY40) || defined(ARDUINO_TEENSY41)
+    static bool disableInterrupts() {
+      uint32_t primask;
+      __asm__ volatile("mrs %0, primask\n" : "=r" (primask)::);
+      __disable_irq();
+      return (primask == 0) ? true : false;
+    }
+    static void enableInterrupts(bool doit) {
+      if (doit) __enable_irq();
+    }
+#endif
 };
 #endif

MotorDrivers.h

@@ -1,7 +1,4 @@
 /*
- *  © 2022 Paul M Antoine
- *  © 2021 Fred Decker
- *  © 2020-2022 Harald Barth
  *  (c) 2020 Chris Harlow. All rights reserved.
  *  (c) 2021 Fred Decker.  All rights reserved.
  *  (c) 2020 Harald Barth. All rights reserved.
@@ -39,55 +36,17 @@
 #define UNUSED_PIN 127 // inside int8_t
 #endif
 
-// The MotorDriver definition is:
-//
 // MotorDriver(byte power_pin, byte signal_pin, byte signal_pin2, int8_t brake_pin, byte current_pin,
 //             float senseFactor, unsigned int tripMilliamps, byte faultPin);
 //
-// power_pin:     Turns the board on/off. Often called ENABLE or PWM on the shield
-// signal_pin:    Where the DCC signal goes in. Often called DIR on the shield
-// signal_pin2:   Inverse of signal_pin. A few shields need this as well, can be replace by hardware inverter
-// brake_pin:     When tuned on, brake is set - output shortened (*)
-// current_pin:   Current sense voltage pin from shield to ADC
-// senseFactor:   Relation between volts on current_pin and actual output current
-// tripMilliamps: Short circuit trip limit in milliampere, max 32767 (32.767A)
-// faultPin:      Some shields have a pin to to report a fault condition to the uCPU. High when fault occurs
-//
-// (*) If the brake_pin is negative that means the sense
+// If the brakePin is negative that means the sense
 // of the brake pin on the motor bridge is inverted
 // (HIGH == release brake)
-
-// Arduino STANDARD Motor Shield, used on different architectures:
-
-#if defined(ARDUINO_ARCH_SAMD)
-// Setup for SAMD21 Sparkfun DEV board using Arduino standard Motor Shield R3 (MUST be R3
-// for 3v3 compatibility!!) senseFactor for 3.3v systems is 1.95 as calculated when using
-// 10-bit A/D samples, and for 12-bit samples it's more like 0.488, but we probably need
-// to tweak both these
+//
+// Arduino standard Motor Shield
 #define STANDARD_MOTOR_SHIELD F("STANDARD_MOTOR_SHIELD"),                                                 \
-                              new MotorDriver(3, 12, UNUSED_PIN, 9, A0, 1.95, 1500, UNUSED_PIN), \
-                              new MotorDriver(11, 13, UNUSED_PIN, 8, A1, 1.95, 1500, UNUSED_PIN)
-#define SAMD_STANDARD_MOTOR_SHIELD STANDARD_MOTOR_SHIELD
-
-#elif defined(ARDUINO_ARCH_ESP32)
-// STANDARD shield on an ESPDUINO-32 (ESP32 in Uno form factor). The shield must be eiter the
-// 3.3V compatible R3 version or it has to be modified to not supply more than 3.3V to the
-// analog inputs. Here we use analog inputs A4 and A5 as A0 and A1 are wired in a way so that
-// they are not useable at the same time as WiFi (what a bummer). The numbers below are the
-// actual GPIO numbers. In comments the numbers the pins have on an Uno.
-#define STANDARD_MOTOR_SHIELD F("STANDARD_MOTOR_SHIELD"),                                                 \
-    new MotorDriver(25/* 3*/, 19/*12*/, UNUSED_PIN, 13/*9*/, 36/*A4*/, 0.70, 1500, UNUSED_PIN), \
-    new MotorDriver(23/*11*/, 18/*13*/, UNUSED_PIN, 12/*8*/, 39/*A5*/, 0.70, 1500, UNUSED_PIN)
-
-#else
-// STANDARD shield on any Arduino Uno or Mega compatible with the original specification.
-#define STANDARD_MOTOR_SHIELD F("STANDARD_MOTOR_SHIELD"),                                                 \
-                              new MotorDriver(3, 12, UNUSED_PIN, 9, A0, 2.99, 1500, UNUSED_PIN), \
-                              new MotorDriver(11, 13, UNUSED_PIN, 8, A1, 2.99, 1500, UNUSED_PIN)
-#define BRAKE_PWM_SWAPPED_MOTOR_SHIELD F("BPS_MOTOR_SHIELD"),                                       \
-                              new MotorDriver(-9 , 12, UNUSED_PIN, -3, A0, 2.99, 1500, UNUSED_PIN), \
-                              new MotorDriver(-8 , 13, UNUSED_PIN,-11, A1, 2.99, 1500, UNUSED_PIN)
-#endif
+                              new MotorDriver(3, 12, UNUSED_PIN, UNUSED_PIN, A0, 2.99, 2000, UNUSED_PIN), \
+                              new MotorDriver(11, 13, UNUSED_PIN, UNUSED_PIN, A1, 2.99, 2000, UNUSED_PIN)
 
 // Pololu Motor Shield
 #define POLOLU_MOTOR_SHIELD F("POLOLU_MOTOR_SHIELD"),                                                 \
@@ -104,17 +63,6 @@
 //                          new MotorDriver(2, 8, UNUSED_PIN, -10, A1, 18, 3000, 12)
 // See Pololu dial_mc33926_shield_schematic.pdf and truth table on page 17 of the MC33926 data sheet.
 
-// Pololu Dual TB9051FTG Motor Shield
-// This is the shield without modifications. Unfortunately the TB9051FTG driver chip on
-// the shield makes short delays when direction is switched. That means that the chip
-// can NOT provide a standard conformant DCC signal independent how hard we try. If your
-// Decoders tolerate that signal, use it by all mean but it is not recommended. Without
-// modifications it uses the following pins below which means no HA waveform and no
-// RailCom on an Arduino Mega 2560 but the DCC signal is broken anyway.
-#define POLOLU_TB9051FTG F("POLOLU_TB9051FTG"),              \
-   new MotorDriver(2, 7, UNUSED_PIN,  -9, A0, 10, 2500,  6), \
-   new MotorDriver(4, 8, UNUSED_PIN, -10, A1, 10, 2500, 12)
-
 // Firebox Mk1
 #define FIREBOX_MK1 F("FIREBOX_MK1"),                                                  \
                     new MotorDriver(3, 6, 7, UNUSED_PIN, A5, 9.766, 5500, UNUSED_PIN), \
@@ -127,34 +75,12 @@
 
 // FunduMoto Motor Shield
 #define FUNDUMOTO_SHIELD F("FUNDUMOTO_SHIELD"),                                              \
-                         new MotorDriver(10, 12, UNUSED_PIN, UNUSED_PIN, A0, 2.99, 1500, UNUSED_PIN), \
-                         new MotorDriver(11, 13, UNUSED_PIN, UNUSED_PIN, A1, 2.99, 1500, UNUSED_PIN)
+                         new MotorDriver(10, 12, UNUSED_PIN, 9, A0, 2.99, 2000, UNUSED_PIN), \
+                         new MotorDriver(11, 13, UNUSED_PIN, UNUSED_PIN, A1, 2.99, 2000, UNUSED_PIN)
 
 // IBT_2 Motor Board for Main and Arduino Motor Shield for Prog
 #define IBT_2_WITH_ARDUINO F("IBT_2_WITH_ARDUINO_SHIELD"),                                              \
                          new MotorDriver(4, 5, 6, UNUSED_PIN, A5, 41.54, 5000, UNUSED_PIN), \
-                         new MotorDriver(11, 13, UNUSED_PIN, UNUSED_PIN, A1, 2.99, 1500, UNUSED_PIN)
-// YFROBOT Motor Shield (V3.1)
-#define YFROBOT_MOTOR_SHIELD F("YFROBOT_MOTOR_SHIELD"), \
-    new MotorDriver(5, 4, UNUSED_PIN, UNUSED_PIN, A0, 2.99, 1500, UNUSED_PIN), \
-    new MotorDriver(6, 7, UNUSED_PIN, UNUSED_PIN, A1, 2.99, 1500, UNUSED_PIN)
-
-// Makeblock ORION UNO like sized board with integrated motor driver
-// This is like an Uno with H-bridge and RJ12 contacts instead of pin rows.
-// No current sense. Barrel connector max 12V, Vmotor max 15V. 1.1A polyfuse as output protection.
-// Main is marked M1 and near RJ12 #5
-// Prog is marked M2 and near RJ12 #4
-// For details see
-// http://docs.makeblock.com/diy-platform/en/electronic-modules/main-control-boards/makeblock-orion.html
-#define ORION_UNO_INTEGRATED_SHIELD F("ORION_UNO_INTEGRATED_SHIELD"),		      \
-    new MotorDriver(6, 7, UNUSED_PIN, UNUSED_PIN, UNUSED_PIN, 1.0, 1100, UNUSED_PIN), \
-    new MotorDriver(5, 4, UNUSED_PIN, UNUSED_PIN, UNUSED_PIN, 1.0, 1100, UNUSED_PIN)
-
-// This is an example how to setup a motor shield definition for a motor shield connected
-// to an NANO EVERY board. You have to make the connectons from the shield to the board
-// as in this example or adjust the values yourself.
-#define NANOEVERY_EXAMPLE F("NANOEVERY_EXAMPLE"), \
- new MotorDriver(5,  6, UNUSED_PIN, UNUSED_PIN, A0, 2.99, 1500, UNUSED_PIN),\
- new MotorDriver(9, 10, UNUSED_PIN, UNUSED_PIN, A1, 2.99, 1500, UNUSED_PIN)
+                         new MotorDriver(11, 13, UNUSED_PIN, UNUSED_PIN, A1, 2.99, 2000, UNUSED_PIN)
 
 #endif

Outputs.cpp

@@ -1,9 +1,5 @@
 /*
- *  © 2021 Neil McKechnie
- *  © 2021 Harald Barth
- *  © 2020-2021 Fred Decker
- *  © 2020-2021 Chris Harlow
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
  *  
  *  This file is part of Asbelos DCC API
  *
@@ -86,9 +82,7 @@ the state of any outputs being monitored or controlled by a separate interface o
 **********************************************************************/
 
 #include "Outputs.h"
-#ifndef DISABLE_EEPROM
 #include "EEStore.h"
-#endif
 #include "StringFormatter.h"
 #include "IODevice.h"
 
@@ -108,11 +102,10 @@ void  Output::activate(uint16_t s){
   data.active = s;                     // if s>0, set status to active, else inactive
   // set state of output pin to HIGH or LOW depending on whether bit zero of iFlag is set to 0 (ACTIVE=HIGH) or 1 (ACTIVE=LOW)
   IODevice::write(data.pin, s ^ data.invert);  
-#ifndef DISABLE_EEPROM
+
   // Update EEPROM if output has been stored.    
   if(EEStore::eeStore->data.nOutputs > 0 && num > 0)
     EEPROM.put(num, data.oStatus);
-#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -148,7 +141,7 @@ bool Output::remove(uint16_t n){
 
 ///////////////////////////////////////////////////////////////////////////////
 // Static function to load configuration and state of all Outputs from EEPROM
-#ifndef DISABLE_EEPROM
+
 void Output::load(){
   struct OutputData data;
   Output *tt;
@@ -183,7 +176,6 @@ void Output::store(){
   }
 
 }
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // Static function to create an Output object

Outputs.h

@@ -1,8 +1,5 @@
 /*
- *  © 2021 Harald Barth
- *  © 2021 Fred Decker
- *  © 2020 Chris Harlow
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
  *  
  *  This file is part of Asbelos DCC API
  *
@@ -51,10 +48,8 @@ public:
   bool isActive();
   static Output* get(uint16_t);
   static bool remove(uint16_t);
-#ifndef DISABLE_EEPROM
   static void load();
   static void store();
-#endif
   static Output *create(uint16_t, VPIN, int, int=0);
   static Output *firstOutput;
   struct OutputData data;

README.md

@@ -17,12 +17,12 @@ Both CommandStation-EX and BaseStation-Classic support much of the NMRA Digital
 * Control of all cab functions F0-F28 and F29-F68
 * Main Track: Write configuration variable bytes and set/clear specific configuration variable (CV) bits (aka Programming on Main or POM)
 * Programming Track: Same as the main track with the addition of reading configuration variable bytes
-* And many more custom features. see [What's new in CommandStation-EX?](#whats-new-in-commandstation-ex)
+* And manu more custom features. see [What's new in CommandStation-EX?](#whats-new-in-commandstation-ex)
 
 
 # What’s in this Repository?
 
-This repository, CommandStation-EX, contains a complete DCC++ EX Commmand Station sketch designed for compiling and uploading into an Arduino Uno, Mega, or Nano.
+This repository, CommandStation-EX, contains a complete DCC++ EX Commmand Station sketch designed for compiling and uploading into an Arduino Uno, Mega, or Nano.  All sketch files are in the folder named CommandStation-EX and its subforlders. 
 
 To utilize this sketch, you can use the following: 
 
@@ -69,7 +69,7 @@ in config.h.
 * Automatic slot (register) management 
 * Automation (coming soon)
 
-NOTE: DCC-EX is a major rewrite to the code. We started over and rebuilt it from the ground up! For what that means, you can read [HERE](https://dcc-ex.com/about/rewrite.html).
+NOTE: DCC-EX is a major rewrite to the code. We started over and rebuilt it from the ground up! For what that means to you, click [HERE](notes/rewrite.md).
 
 # More information
 You can learn more at the [DCC++ EX website](https://dcc-ex.com/)

RMFT.h

@@ -1,8 +1,8 @@
-#ifndef EXRAIL_H
-#define EXRAIL_H
+#ifndef RMFT_H
+#define RMFT_H
 
-#if defined(EXRAIL_ACTIVE)
- #include "EXRAIL2.h"
+#if defined(RMFT_ACTIVE)
+ #include "RMFT2.h"
 
   class RMFT {
     public:
@@ -10,7 +10,7 @@
       static void inline loop() {RMFT2::loop();}
   };
 
-  #include "EXRAILMacros.h"
+  #include "RMFTMacros.h"
   
 #else 
   // Dummy RMFT 

RMFT2.cpp

@@ -0,0 +1,693 @@
+/*
+ *  © 2020,2021 Chris Harlow. All rights reserved.
+ *  
+ *  This file is part of CommandStation-EX
+ *
+ *  This is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  It is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include <Arduino.h>
+#include "RMFT2.h"
+#include "DCC.h"
+#include "DIAG.h"
+#include "WiThrottle.h"
+#include "DCCEXParser.h"
+#include "Turnouts.h"
+
+
+// Command parsing keywords
+const int16_t HASH_KEYWORD_EXRAIL=15435;    
+const int16_t HASH_KEYWORD_ON = 2657;
+const int16_t HASH_KEYWORD_START=23232;
+const int16_t HASH_KEYWORD_RESERVE=11392;
+const int16_t HASH_KEYWORD_FREE=-23052;
+const int16_t HASH_KEYWORD_LATCH=1618;  
+const int16_t HASH_KEYWORD_UNLATCH=1353;
+const int16_t HASH_KEYWORD_PAUSE=-4142;
+const int16_t HASH_KEYWORD_RESUME=27609;
+const int16_t HASH_KEYWORD_KILL=5218;
+
+// One instance of RMFT clas is used for each "thread" in the automation.
+// Each thread manages a loco on a journey through the layout, and/or may manage a scenery automation.
+// The thrrads exist in a ring, each time through loop() the next thread in the ring is serviced.
+
+// Statics 
+int16_t RMFT2::progtrackLocoId;  // used for callback when detecting a loco on prograck
+bool RMFT2::diag=false;      // <D EXRAIL ON>  
+RMFT2 * RMFT2::loopTask=NULL; // loopTask contains the address of ONE of the tasks in a ring.
+RMFT2 * RMFT2::pausingTask=NULL; // Task causing a PAUSE.
+ // when pausingTask is set, that is the ONLY task that gets any service,
+ // and all others will have their locos stopped, then resumed after the pausing task resumes.
+byte RMFT2::flags[MAX_FLAGS];
+
+#define GET_OPCODE GETFLASH(RMFT2::RouteCode+progCounter)
+#define GET_OPERAND(n) GETFLASHW(RMFT2::RouteCode+progCounter+1+(n*3))
+#define SKIPOP progCounter+=3
+
+/* static */ void RMFT2::begin() { 
+  DCCEXParser::setRMFTFilter(RMFT2::ComandFilter);
+  for (int f=0;f<MAX_FLAGS;f++) flags[f]=0;
+  int progCounter;
+  // first pass startup, define any turnouts or servos, set signals red and count size.
+  for (progCounter=0;; SKIPOP){
+     byte opcode=GET_OPCODE;
+     if (opcode==OPCODE_ENDEXRAIL) break;
+
+     if (opcode==OPCODE_SIGNAL) {
+      VPIN red=GET_OPERAND(0);
+      VPIN amber=GET_OPERAND(1);
+      VPIN green=GET_OPERAND(2);
+      IODevice::write(red,true);
+      if (amber) IODevice::write(amber,false);
+      IODevice::write(green,false);
+      continue;
+     }
+     
+     if (opcode==OPCODE_TURNOUT) {
+      VPIN id=GET_OPERAND(0);
+      int addr=GET_OPERAND(1);
+      byte subAddr=GET_OPERAND(2);
+      Turnout::createDCC(id,addr,subAddr);
+      continue;
+     }
+
+     if (opcode==OPCODE_SERVOTURNOUT) {
+      int16_t id=GET_OPERAND(0);
+      VPIN pin=GET_OPERAND(1);
+      int activeAngle=GET_OPERAND(2);
+      int inactiveAngle=GET_OPERAND(3);
+      int profile=GET_OPERAND(4);
+      Turnout::createServo(id,pin,activeAngle,inactiveAngle,profile);
+      continue;
+     }
+
+     if (opcode==OPCODE_PINTURNOUT) {
+      int16_t id=GET_OPERAND(0);
+      VPIN pin=GET_OPERAND(1);
+      Turnout::createVpin(id,pin);
+      continue;
+     }
+     // other opcodes are not needed on this pass
+  } 
+  SKIPOP; // include ENDROUTES opcode
+  DIAG(F("EXRAIL %db, MAX_FLAGS=%d"), progCounter,MAX_FLAGS);
+  new RMFT2(0); // add the startup route
+}
+
+// This filter intercepts <> commands to do the following:
+// - Implement RMFT specific commands/diagnostics 
+// - Reject/modify JMRI commands that would interfere with RMFT processing 
+void RMFT2::ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16_t p[]) {
+    (void)stream; // avoid compiler warning if we don't access this parameter 
+    bool reject=false;
+    switch(opcode) {
+        
+     case 'D':
+        if (p[0]==HASH_KEYWORD_EXRAIL) { // <D EXRAIL ON/OFF>
+           diag = paramCount==2 && (p[1]==HASH_KEYWORD_ON || p[1]==1);
+           opcode=0;
+        }
+        break;
+          
+     case '/':  // New EXRAIL command
+          reject=!parseSlash(stream,paramCount,p);
+          opcode=0;
+          break;
+          
+     default:  // other commands pass through 
+     break;       
+   }
+ if (reject) {
+   opcode=0;
+   StringFormatter::send(stream,F("<X>"));
+   }
+}
+     
+bool RMFT2::parseSlash(Print * stream, byte & paramCount, int16_t p[]) {
+
+          if (paramCount==0) { // STATUS
+                 StringFormatter::send(stream, F("<* EXRAIL STATUS"));
+                 RMFT2 * task=loopTask;
+                 while(task) {
+                   StringFormatter::send(stream,F("\nID=%d,PC=%d,LOCO=%d%c,SPEED=%d%c"),
+                         (int)(task->taskId),task->progCounter,task->loco,
+                         task->invert?'I':' ',
+                         task->speedo, 
+                         task->forward?'F':'R'
+                         );
+                   task=task->next;      
+                   if (task==loopTask) break;      
+                 }
+                 // Now stream the flags 
+                 for (int id=0;id<MAX_FLAGS; id++) {
+                   byte flag=flags[id];
+                   if (flag & ~TASK_FLAG) { // not interested in TASK_FLAG only. Already shown above 
+                     StringFormatter::send(stream,F("\nflags[%d} "),id);
+                     if (flag & SECTION_FLAG) StringFormatter::send(stream,F(" RESERVED"));
+                     if (flag & LATCH_FLAG) StringFormatter::send(stream,F(" LATCHED"));
+                     }                 
+                 }
+                 StringFormatter::send(stream,F(" *>\n"));
+                 return true;
+            }
+          switch (p[0]) {
+            case HASH_KEYWORD_PAUSE: // </ PAUSE>
+                 if (paramCount!=1) return false;
+                 DCC::setThrottle(0,1,true);  // pause all locos on the track         
+                 pausingTask=(RMFT2 *)1; // Impossible task address
+                 return true;
+                 
+            case HASH_KEYWORD_RESUME: // </ RESUME>
+                 if (paramCount!=1) return false;
+                 pausingTask=NULL;
+                 {
+                  RMFT2 * task=loopTask;                 
+                  while(task) {
+                      if (task->loco) task->driveLoco(task->speedo);
+                      task=task->next;      
+                      if (task==loopTask) break;      
+                    }
+                 }        
+                 return true;
+                 
+                      
+            case HASH_KEYWORD_START: // </ START [cab] route >
+                 if (paramCount<2 || paramCount>3) return false;
+                 {
+                  int route=(paramCount==2) ? p[1] : p[2];
+                  uint16_t cab=(paramCount==2)? 0 : p[1];
+                  int pc=locateRouteStart(route);                 
+                  if (pc<0) return false;
+                    RMFT2* task=new RMFT2(pc);
+                    task->loco=cab;                    
+                 }
+              return true;
+                 
+            default:
+              break;
+          }
+          
+          // all other / commands take 1 parameter 0 to MAX_FLAGS-1     
+
+          if (paramCount!=2 || p[1]<0  || p[1]>=MAX_FLAGS) return false;
+
+          switch (p[0]) {  
+               case HASH_KEYWORD_KILL: // Kill taskid
+                    {
+                    RMFT2 * task=loopTask;
+                    while(task) {
+                      if (task->taskId==p[1]) {
+                         delete task;
+                         return  true;
+                      }
+                      task=task->next;      
+                      if (task==loopTask) break;      
+                    }
+                 }
+                 return false;
+                    
+            case HASH_KEYWORD_RESERVE:  // force reserve a section
+                 setFlag(p[1],SECTION_FLAG);
+                 return true;
+    
+            case HASH_KEYWORD_FREE:  // force free a section
+                 setFlag(p[1],0,SECTION_FLAG);
+                 return true;
+                
+            case HASH_KEYWORD_LATCH:
+                 setFlag(p[1], LATCH_FLAG);
+                 return true;
+   
+            case HASH_KEYWORD_UNLATCH:
+                 setFlag(p[1], 0, LATCH_FLAG);
+                 return true;
+                  
+            default:
+                 return false;                 
+          }
+    }
+
+
+// This emits Routes and Automations to Withrottle
+// Automations are given a state to set the button to "handoff" which implies 
+// handing over the loco to the automation.
+// Routes are given "Set" buttons and do not cause the loco to be handed over. 
+void RMFT2::emitWithrottleRouteList(Print* stream) {
+   StringFormatter::send(stream,F("PRT]\\[Routes}|{Route]\\[Set}|{2]\\[Handoff}|{4\nPRL"));
+   emitWithrottleDescriptions(stream);
+   StringFormatter::send(stream,F("\n"));
+}
+
+
+RMFT2::RMFT2(int progCtr) {
+  progCounter=progCtr;
+
+  // get an unused  task id from the flags table 
+  taskId=255; // in case of overflow
+  for (int f=0;f<MAX_FLAGS;f++) {
+    if (!getFlag(f,TASK_FLAG)) {
+      taskId=f;
+      setFlag(f, TASK_FLAG);
+      break;
+    }
+  }
+  delayTime=0;
+  loco=0;
+  speedo=0;
+  forward=true;
+  invert=false;
+  stackDepth=0;
+   
+  // chain into ring of RMFTs
+  if (loopTask==NULL) {
+    loopTask=this;
+    next=this;
+  }
+  else {
+        next=loopTask->next;
+        loopTask->next=this;
+  }
+}
+
+
+RMFT2::~RMFT2() {
+  driveLoco(1); // ESTOP my loco if any 
+  setFlag(taskId,0,TASK_FLAG); // we are no longer using this id
+  if (next==this) loopTask=NULL;
+  else for (RMFT2* ring=next;;ring=ring->next) if (ring->next == this) {
+           ring->next=next;
+           loopTask=next;
+           break;
+       }
+}
+
+void RMFT2::createNewTask(int route, uint16_t cab) {
+      int pc=locateRouteStart(route);
+      if (pc<0) return;
+      RMFT2* task=new RMFT2(pc);
+      task->loco=cab;
+}
+
+   
+int RMFT2::locateRouteStart(int16_t _route) {
+  if (_route==0) return 0; // Route 0 is always start of ROUTES for default startup 
+  for (int progCounter=0;;SKIPOP) {
+    byte opcode=GET_OPCODE;
+    if (opcode==OPCODE_ENDEXRAIL) {
+      DIAG(F("RMFT2 sequence %d not found"), _route);
+      return -1;
+    }
+    if ((opcode==OPCODE_ROUTE || opcode==OPCODE_AUTOMATION || opcode==OPCODE_SEQUENCE) 
+       &&  _route==(int)GET_OPERAND(0)) return progCounter;
+  }
+  return -1;
+}
+
+
+void RMFT2::driveLoco(byte speed) {
+     if (loco<=0) return;  // Prevent broadcast! 
+     if (diag) DIAG(F("EXRAIL drive %d %d %d"),loco,speed,forward^invert);
+     DCC::setThrottle(loco,speed, forward^invert);
+     speedo=speed;
+}
+
+bool RMFT2::readSensor(int16_t sensorId) {
+  VPIN vpin=abs(sensorId);
+  if (getFlag(vpin,LATCH_FLAG)) return true; // latched on
+  bool s= IODevice::read(vpin) ^ (sensorId<0);
+  if (s && diag) DIAG(F("EXRAIL Sensor %d hit"),sensorId);
+  return s;
+}
+
+bool RMFT2::skipIfBlock() {
+  // returns false if killed
+  short nest = 1;
+  while (nest > 0) {
+    SKIPOP;
+    byte opcode =  GET_OPCODE;
+    switch(opcode) {
+      case OPCODE_ENDEXRAIL: 
+           kill(F("missing ENDIF"), nest);
+           return false;  
+      case OPCODE_IF:
+      case OPCODE_IFNOT:
+      case OPCODE_IFRANDOM:
+      case OPCODE_IFRESERVE:
+           nest++;
+           break;
+      case OPCODE_ENDIF:
+           nest--;
+           break;
+      default:
+      break;
+    }
+  }
+  return true; 
+}
+
+
+
+/* static */ void RMFT2::readLocoCallback(int cv) {
+     progtrackLocoId=cv;
+}
+
+void RMFT2::loop() {
+  
+  // Round Robin call to a RMFT task each time 
+     if (loopTask==NULL) return; 
+     
+     loopTask=loopTask->next;
+ 
+     if (pausingTask==NULL || pausingTask==loopTask) loopTask->loop2();
+}    
+
+  
+void RMFT2::loop2() {
+   if (delayTime!=0 && millis()-delayStart < delayTime) return;
+     
+  byte opcode = GET_OPCODE;
+  int16_t operand =  GET_OPERAND(0);
+  // if (diag) DIAG(F("RMFT2 %d %d"),opcode,operand); 
+  // Attention: Returning from this switch leaves the program counter unchanged.
+  //            This is used for unfinished waits for timers or sensors.
+  //            Breaking from this switch will step to the next step in the route. 
+  switch ((OPCODE)opcode) {
+    
+    case OPCODE_THROW:
+         Turnout::setClosed(operand, false);
+         break;
+          
+    case OPCODE_CLOSE:
+         Turnout::setClosed(operand, true);
+         break; 
+    
+    case OPCODE_REV:
+      forward = false;
+      driveLoco(operand);
+      break;
+    
+    case OPCODE_FWD:
+      forward = true;
+      driveLoco(operand);
+      break;
+      
+    case OPCODE_SPEED:
+      driveLoco(operand);
+      break;
+    
+    case OPCODE_INVERT_DIRECTION:
+      invert= !invert;
+      driveLoco(speedo);
+      break;
+      
+    case OPCODE_RESERVE:
+      if (getFlag(operand,SECTION_FLAG)) {
+        driveLoco(0);
+        delayMe(500);
+        return;
+      }
+      setFlag(operand,SECTION_FLAG);
+      break;
+    
+    case OPCODE_FREE:
+      setFlag(operand,0,SECTION_FLAG);
+      break;
+    
+    case OPCODE_AT:
+      if (readSensor(operand)) break;
+      delayMe(50);
+      return;
+    
+    case OPCODE_AFTER: // waits for sensor to hit and then remain off for 0.5 seconds. (must come after an AT operation)
+      if (readSensor(operand)) {
+        // reset timer to half a second and keep waiting
+        waitAfter=millis();
+        return; 
+      }
+      if (millis()-waitAfter < 500 ) return;   
+      break;
+    
+    case OPCODE_LATCH:
+      setFlag(operand,LATCH_FLAG);
+      break;
+    
+    case OPCODE_UNLATCH:
+      setFlag(operand,0,LATCH_FLAG);
+      break;
+
+    case OPCODE_SET:
+      IODevice::write(operand,true);
+      break;
+  
+    case OPCODE_RESET:
+      IODevice::write(operand,false);
+      break;
+    
+    case OPCODE_PAUSE:
+         DCC::setThrottle(0,1,true);  // pause all locos on the track
+         pausingTask=this;
+         break;
+
+    case OPCODE_POM:
+        if (loco) DCC::writeCVByteMain(loco, operand, GET_OPERAND(1));
+        break;
+
+    case OPCODE_RESUME:
+         pausingTask=NULL;
+         driveLoco(speedo);
+         for (RMFT2 * t=next; t!=this;t=t->next) if (t->loco >0) t->driveLoco(t->speedo);
+          break;        
+    
+    case OPCODE_IF: // do next operand if sensor set
+      if (!readSensor(operand)) if (!skipIfBlock()) return;
+      break;
+    
+    case OPCODE_IFNOT: // do next operand if sensor not set
+      if (readSensor(operand)) if (!skipIfBlock()) return;
+      break;
+   
+    case OPCODE_IFRANDOM: // do block on random percentage
+      if (random(100)>=operand) if (!skipIfBlock()) return;
+      break;
+   
+    case OPCODE_IFRESERVE: // do block if we successfully RERSERVE
+      if (!getFlag(operand,SECTION_FLAG)) setFlag(operand,SECTION_FLAG);
+      else if (!skipIfBlock()) return;
+      break;
+      
+    case OPCODE_ENDIF:
+      break;
+    
+    case OPCODE_DELAY:
+      delayMe(operand*100);
+      break;
+   
+    case OPCODE_DELAYMINS:
+      delayMe(operand*60*1000);
+      break;
+    
+    case OPCODE_RANDWAIT:
+      delayMe((long)random(operand*100));
+      break;
+    
+    case OPCODE_RED:
+      doSignal(operand,true,false,false);
+      break;
+    
+    case OPCODE_AMBER:
+      doSignal(operand,false,true,false);
+      break;
+    
+    case OPCODE_GREEN:
+      doSignal(operand,false,false,true);
+      break;
+       
+    case OPCODE_FON:      
+      if (loco) DCC::setFn(loco,operand,true);
+      break;
+    
+    case OPCODE_FOFF:
+      if (loco) DCC::setFn(loco,operand,false);
+      break;
+
+    case OPCODE_FOLLOW:
+      progCounter=locateRouteStart(operand);
+      if (progCounter<0) kill(F("FOLLOW unknown"), operand); 
+      return;
+  
+    case OPCODE_CALL:
+      if (stackDepth==MAX_STACK_DEPTH) {
+        kill(F("CALL stack"), stackDepth);
+        return;
+      }
+      callStack[stackDepth++]=progCounter;
+      progCounter=locateRouteStart(operand);
+      if (progCounter<0) kill(F("CALL unknown"),operand); 
+      return;
+
+    case OPCODE_RETURN:
+      if (stackDepth==0) {
+        kill(F("RETURN stack"));
+        return;
+      }
+      progCounter=callStack[--stackDepth];
+      return;
+      
+    case OPCODE_ENDTASK:
+    case OPCODE_ENDEXRAIL:
+      kill();
+      return;
+      
+    case OPCODE_JOIN:
+       DCC::setProgTrackSyncMain(true);
+       break;
+
+    case OPCODE_UNJOIN:
+       DCC::setProgTrackSyncMain(false);
+       break;
+       
+    case OPCODE_READ_LOCO1: // READ_LOCO is implemented as 2 separate opcodes
+       DCC::getLocoId(readLocoCallback);
+       break;
+      
+      case OPCODE_READ_LOCO2:
+       if (progtrackLocoId<0) {
+        delayMe(100);
+        return; // still waiting for callback
+       }
+       loco=progtrackLocoId;
+       speedo=0;
+       forward=true;
+       invert=false;
+       break;
+       
+       case OPCODE_START:
+           {
+            int newPc=locateRouteStart(operand);
+            if (newPc<0) break; 
+            new RMFT2(newPc); 
+           }
+           break;
+           
+      case OPCODE_SENDLOCO:  // cab, route
+           {
+            int newPc=locateRouteStart(GET_OPERAND(1));
+            if (newPc<0) break; 
+            RMFT2* newtask=new RMFT2(newPc); // create new task 
+            newtask->loco=operand; 
+           }
+           break;
+           
+       case OPCODE_SETLOCO:
+           {
+             loco=operand; 
+             speedo=0;
+             forward=true;
+             invert=false;
+            }
+       break;
+
+          
+       case OPCODE_SERVO: // OPCODE_SERVO,V(id),OPCODE_PAD,V(position),OPCODE_PAD,V(profile),
+        IODevice::writeAnalogue(operand,GET_OPERAND(1),GET_OPERAND(2));          
+        break;
+
+       case OPCODE_PRINT:
+            printMessage(operand);
+            break;
+               
+       case OPCODE_ROUTE:
+       case OPCODE_AUTOMATION:
+       case OPCODE_SEQUENCE:
+          DIAG(F("EXRAIL begin(%d)"),operand);
+          break;
+
+       case OPCODE_PAD: // Just a padding for previous opcode needing >1 operad byte.
+       case OPCODE_SIGNAL: // Signal definition ignore at run time
+       case OPCODE_TURNOUT: // Turnout definition ignored at runtime
+       case OPCODE_SERVOTURNOUT: // Turnout definition ignored at runtime
+       case OPCODE_PINTURNOUT: // Turnout definition ignored at runtime
+       case OPCODE_ONCLOSE: // Turnout event catcers ignored here
+       case OPCODE_ONTHROW: // Turnout definition ignored at runtime
+       break;
+    
+    default:
+      kill(F("INVOP"),operand);
+    }
+    // Falling out of the switch means move on to the next opcode
+    SKIPOP;
+}
+
+void RMFT2::delayMe(long delay) {
+     delayTime=delay;
+     delayStart=millis();
+}
+
+void RMFT2::setFlag(VPIN id,byte onMask, byte offMask) {  
+   if (FLAGOVERFLOW(id)) return; // Outside range limit
+   byte f=flags[id];
+   f &= ~offMask;
+   f |= onMask;
+   flags[id]=f;
+}
+
+bool RMFT2::getFlag(VPIN id,byte mask) {
+   if (FLAGOVERFLOW(id)) return 0; // Outside range limit
+   return flags[id]&mask;   
+}
+
+void RMFT2::kill(const FSH * reason, int operand) {
+     if (reason) DIAG(F("EXRAIL ERROR pc=%d, cab=%d, %S %d"), progCounter,loco, reason, operand);
+     else if (diag) DIAG(F("ENDTASK at pc=%d"), progCounter); 
+     delete this;
+}
+
+/* static */ void RMFT2::doSignal(VPIN id,bool red, bool amber, bool green) { 
+  // CAUTION: hides class member progCounter
+  for (int progCounter=0;; SKIPOP){
+     byte opcode=GET_OPCODE;
+     if (opcode==OPCODE_ENDEXRAIL) return;
+     if (opcode!=OPCODE_SIGNAL) continue;
+     byte redpin=GET_OPERAND(1);
+     if (redpin!=id)continue;
+     byte amberpin=GET_OPERAND(2);
+     byte greenpin=GET_OPERAND(3);
+     IODevice::write(redpin,red);
+     if (amberpin) IODevice::write(amberpin,amber);
+     if (greenpin) IODevice::write(amberpin,green);
+     return;
+   }
+  } 
+ void RMFT2::turnoutEvent(VPIN id, bool closed) {
+    byte huntFor=closed ?  OPCODE_ONCLOSE : OPCODE_ONTHROW ;
+    // caution hides class progCounter;
+    for (int progCounter=0;; SKIPOP){
+     byte opcode=GET_OPCODE;
+     if (opcode==OPCODE_ENDEXRAIL) return;
+     if (opcode!=huntFor) continue;
+     if (id!=GET_OPERAND(0)) continue;
+     new RMFT2(progCounter);  // new task starts at this instruction
+     return;
+   }
+ }
+ 
+ void RMFT2::printMessage2(const FSH * msg) {
+        DIAG(F("EXRAIL(%d) %S"),loco,msg);
+   }
+
+// This is called by emitRouteDescriptions to emit a withrottle description for a route or autoomation. 
+void RMFT2::emitRouteDescription(Print * stream, char type, int id, const FSH * description) {
+ StringFormatter::send(stream,F("]\\[%c%d}|{%S}|{%c"),
+              type,id,description, type=='R'?'2':'4');
+}
+ 

RMFT2.h

@@ -0,0 +1,116 @@
+/*
+ *  © 2020, Chris Harlow. All rights reserved.
+ *  
+ *  This file is part of CommandStation-EX
+ *
+ *  This is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  It is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#ifndef RMFT2_H
+#define RMFT2_H
+#include "FSH.h"
+#include "IODevice.h"
+   
+// The following are the operation codes (or instructions) for a kind of virtual machine.
+// Each instruction is normally 2 bytes long with an operation code followed by a parameter.
+// In cases where more than one parameter is required, the first parameter is followed by one  
+// or more OPCODE_PAD instructions with the subsequent parameters. This wastes a byte but makes 
+// searching easier as a parameter can never be confused with an opcode. 
+// 
+enum OPCODE : byte {OPCODE_THROW,OPCODE_CLOSE,
+             OPCODE_FWD,OPCODE_REV,OPCODE_SPEED,OPCODE_INVERT_DIRECTION,
+             OPCODE_RESERVE,OPCODE_FREE,
+             OPCODE_AT,OPCODE_AFTER,
+             OPCODE_LATCH,OPCODE_UNLATCH,OPCODE_SET,OPCODE_RESET,
+             OPCODE_IF,OPCODE_IFNOT,OPCODE_ENDIF,OPCODE_IFRANDOM,OPCODE_IFRESERVE,
+             OPCODE_DELAY,OPCODE_DELAYMINS,OPCODE_RANDWAIT,
+             OPCODE_FON,OPCODE_FOFF,
+             OPCODE_RED,OPCODE_GREEN,OPCODE_AMBER,
+             OPCODE_SERVO,OPCODE_SIGNAL,OPCODE_TURNOUT,
+             OPCODE_PAD,OPCODE_FOLLOW,OPCODE_CALL,OPCODE_RETURN,
+             OPCODE_JOIN,OPCODE_UNJOIN,OPCODE_READ_LOCO1,OPCODE_READ_LOCO2,OPCODE_POM,
+             OPCODE_START,OPCODE_SETLOCO,OPCODE_SENDLOCO,
+             OPCODE_PAUSE, OPCODE_RESUME,
+             OPCODE_ONCLOSE, OPCODE_ONTHROW, OPCODE_SERVOTURNOUT, OPCODE_PINTURNOUT,
+             OPCODE_PRINT,  
+             OPCODE_ROUTE,OPCODE_AUTOMATION,OPCODE_SEQUENCE,OPCODE_ENDTASK,OPCODE_ENDEXRAIL
+             };
+
+
+ 
+  // Flag bits for status of hardware and TPL
+  static const byte SECTION_FLAG = 0x01;
+  static const byte LATCH_FLAG = 0x02;
+  static const byte TASK_FLAG = 0x04;
+
+  static const byte  MAX_STACK_DEPTH=4;
+ 
+   static const short MAX_FLAGS=256;
+  #define FLAGOVERFLOW(x) x>=MAX_FLAGS
+
+ class RMFT2 {
+   public:
+    static void begin();
+    static void loop();
+    RMFT2(int progCounter);
+    RMFT2(int route, uint16_t cab);
+    ~RMFT2();
+    static void readLocoCallback(int cv);
+    static void emitWithrottleRouteList(Print* stream); 
+    static void createNewTask(int route, uint16_t cab);
+    static void turnoutEvent(VPIN id, bool closed);  
+private: 
+    static void ComandFilter(Print * stream, byte & opcode, byte & paramCount, int p[]);
+    static bool parseSlash(Print * stream, byte & paramCount, int p[]) ;
+    static void streamFlags(Print* stream);
+    static void setFlag(VPIN id,byte onMask, byte OffMask=0);
+    static bool getFlag(VPIN id,byte mask);   
+    static int locateRouteStart(int16_t _route);
+    static int progtrackLocoId;
+    static void doSignal(VPIN id,bool red, bool amber, bool green); 
+    static void emitRouteDescription(Print * stream, char type, int id, const FSH * description);
+    static void emitWithrottleDescriptions(Print * stream);
+    
+    static RMFT2 * loopTask;
+    static RMFT2 * pausingTask;
+    void delayMe(long millisecs);
+    void driveLoco(byte speedo);
+    bool readSensor(int16_t sensorId);
+    bool skipIfBlock();
+    bool readLoco();
+    void loop2();
+    void kill(const FSH * reason=NULL,int operand=0);          
+    void printMessage(uint16_t id);  // Built by RMFTMacros.h
+    void printMessage2(const FSH * msg);
+
+    
+   static bool diag;
+   static const  FLASH  byte RouteCode[];
+   static byte flags[MAX_FLAGS];
+ 
+  // Local variables - exist for each instance/task 
+    RMFT2 *next;   // loop chain 
+    int progCounter;    // Byte offset of next route opcode in ROUTES table
+    unsigned long delayStart; // Used by opcodes that must be recalled before completing
+    unsigned long waitAfter; // Used by OPCODE_AFTER
+    unsigned long  delayTime;
+    byte  taskId;
+    
+    int loco;
+    bool forward;
+    bool invert;
+    int speedo;
+    byte stackDepth;
+    int callStack[MAX_STACK_DEPTH];
+};
+#endif

RMFTMacros.h

@@ -0,0 +1,266 @@
+/*
+ *  © 2020,2021 Chris Harlow. All rights reserved.
+ *  
+ *  This file is part of CommandStation-EX
+ *
+ *  This is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  It is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#ifndef RMFTMacros_H
+#define RMFTMacros_H
+
+// remove normal code LCD macro (will be restored later)
+#undef LCD
+
+
+// This file will include and build the EXRAIL script and associated helper tricks.
+// It does this by incliding myAutomation.h several times, each with a set of macros to 
+// extract the relevant parts.
+
+// The entire automation script is contained within a byte array RMFT2::RouteCode[]
+// made up of opcode and parameter pairs.
+// ech opcode is a 1 byte operation plus 2 byte operand. 
+// The array is normally built using the macros below as this makes it easier 
+// to manage the cases where:
+// - padding must be applied to ensure the correct alignment of the next instruction
+// - large parameters must be split up
+// - multiple parameters aligned correctly
+// - a single macro requires multiple operations
+
+// Descriptive texts for routes and animations are created in a sepaerate function which
+// can be called to emit a list of routes/automatuions in a form suitable for Withrottle. 
+ 
+// PRINT(msg) and LCD(row,msg) is implemented in a separate pass to create 
+// a getMessageText(id) function.  
+
+// CAUTION: The macros below are multiple passed over myAutomation.h
+
+// Pass 1 Implements aliases and 
+// converts descriptions to  withrottle format emitter function
+// Most macros are simply ignored in this pass.
+
+
+#define ALIAS(name,value) const int name=value; 
+#define EXRAIL  void  RMFT2::emitWithrottleDescriptions(Print * stream) {
+#define ROUTE(id, description) emitRouteDescription(stream,'R',id,F(description));
+#define AUTOMATION(id, description) emitRouteDescription(stream,'A',id,F(description));
+#define ENDEXRAIL  }
+ 
+#define AFTER(sensor_id)
+#define AMBER(signal_id)
+#define AT(sensor_id)
+#define CALL(route) 
+#define CLOSE(id) 
+#define DELAY(mindelay)
+#define DELAYMINS(mindelay)
+#define DELAYRANDOM(mindelay,maxdelay) 
+#define DONE
+#define ENDIF  
+#define ENDTASK
+#define ESTOP 
+#define FOFF(func)
+#define FOLLOW(route) 
+#define FON(func) 
+#define FREE(blockid) 
+#define FWD(speed) 
+#define GREEN(signal_id)
+#define IF(sensor_id) 
+#define IFNOT(sensor_id)
+#define IFRANDOM(percent) 
+#define IFRESERVE(block) 
+#define INVERT_DIRECTION 
+#define JOIN 
+#define LATCH(sensor_id) 
+#define LCD(row,msg) 
+#define ONCLOSE(turnout_id)
+#define ONTHROW(turnout_id) 
+#define PAUSE
+#define PRINT(msg) 
+#define POM(cv,value)
+#define READ_LOCO 
+#define RED(signal_id) 
+#define RESERVE(blockid) 
+#define RESET(sensor_id) 
+#define RESUME 
+#define RETURN 
+#define REV(speed) 
+#define START(route) 
+#define SENDLOCO(cab,route) 
+#define SERVO(id,position,profile) 
+#define SETLOCO(loco) 
+#define SET(sensor_id) 
+#define SEQUENCE(id) 
+#define SPEED(speed) 
+#define STOP 
+#undef SIGNAL
+#define SIGNAL(redpin,amberpin,greenpin) 
+#define SERVO_TURNOUT(id,pin,activeAngle,inactiveAngle,profile) 
+#define PIN_TURNOUT(id,pin) 
+#define THROW(id)  
+#define TURNOUT(id,addr,subaddr) 
+#define UNJOIN 
+#define UNLATCH(sensor_id) 
+
+#include "myAutomation.h"
+
+// setup for pass 2... Create getMessageText function
+#undef ALIAS
+#undef ROUTE
+#undef AUTOMATION  
+#define ROUTE(id, description)
+#define AUTOMATION(id, description)  
+
+#undef EXRAIL 
+#undef PRINT
+#undef ENDEXRAIL  
+#undef LCD
+const int StringMacroTracker1=__COUNTER__;
+#define ALIAS(name,value) 
+#define EXRAIL void  RMFT2::printMessage(uint16_t id) { switch(id) {
+#define ENDEXRAIL  default: DIAG(F("printMessage error %d %d"),id,StringMacroTracker1); return ; }}
+#define PRINT(msg)  case (__COUNTER__ - StringMacroTracker1) : printMessage2(F(msg));break;
+#define LCD(id,msg)  case (__COUNTER__ - StringMacroTracker1) : StringFormatter::lcd(id,F(msg));break;
+#include "myAutomation.h"
+
+// Setup for Pass 3: create main routes table 
+#undef AFTER
+#undef AMBER
+#undef AT
+#undef AUTOMATION 
+#undef CALL
+#undef CLOSE
+#undef DELAY
+#undef DELAYMINS
+#undef DELAYRANDOM
+#undef DONE
+#undef ENDIF
+#undef ENDEXRAIL
+#undef ENDTASK
+#undef ESTOP
+#undef EXRAIL
+#undef FOFF
+#undef FOLLOW
+#undef FON
+#undef FREE
+#undef FWD
+#undef GREEN
+#undef IF
+#undef IFNOT
+#undef IFRANDOM
+#undef IFRESERVE
+#undef INVERT_DIRECTION
+#undef JOIN
+#undef LATCH
+#undef LCD
+#undef ONCLOSE
+#undef ONTHROW
+#undef PAUSE
+#undef POM
+#undef PRINT
+#undef READ_LOCO
+#undef RED
+#undef RESERVE
+#undef RESET
+#undef RESUME
+#undef RETURN
+#undef REV
+#undef ROUTE 
+#undef START
+#undef SEQUENCE 
+#undef SERVO
+#undef SENDLOCO
+#undef SETLOCO
+#undef SET
+#undef SPEED
+#undef STOP
+#undef SIGNAL
+#undef SERVO_TURNOUT
+#undef PIN_TURNOUT
+#undef THROW
+#undef TURNOUT
+#undef UNJOIN
+#undef UNLATCH
+
+// Define macros for route code creation 
+#define V(val) ((int16_t)(val))&0x00FF,((int16_t)(val)>>8)&0x00FF
+#define NOP 0,0
+
+#define ALIAS(name,value) 
+#define EXRAIL const  FLASH  byte RMFT2::RouteCode[] = {
+#define AUTOMATION(id, description)  OPCODE_AUTOMATION, V(id), 
+#define ROUTE(id, description)  OPCODE_ROUTE, V(id), 
+#define SEQUENCE(id)  OPCODE_SEQUENCE, V(id), 
+#define ENDTASK OPCODE_ENDTASK,NOP,
+#define DONE OPCODE_ENDTASK,NOP,
+#define ENDEXRAIL OPCODE_ENDTASK,NOP,OPCODE_ENDEXRAIL,NOP };
+ 
+#define AFTER(sensor_id) OPCODE_AT,V(sensor_id),OPCODE_AFTER,V(sensor_id),
+#define AMBER(signal_id) OPCODE_AMBER,V(signal_id),
+#define AT(sensor_id) OPCODE_AT,V(sensor_id),
+#define CALL(route) OPCODE_CALL,V(route),
+#define CLOSE(id)  OPCODE_CLOSE,V(id),
+#define DELAY(ms) OPCODE_DELAY,V(ms/100),
+#define DELAYMINS(mindelay) OPCODE_DELAYMINS,V(mindelay),
+#define DELAYRANDOM(mindelay,maxdelay) OPCODE_DELAY,V(mindelay/100),OPCODE_RANDWAIT,V((maxdelay-mindelay)/100),
+#define ENDIF  OPCODE_ENDIF,NOP,
+#define ESTOP OPCODE_SPEED,V(1), 
+#define FOFF(func) OPCODE_FOFF,V(func),
+#define FOLLOW(route) OPCODE_FOLLOW,V(route),
+#define FON(func) OPCODE_FON,V(func),
+#define FREE(blockid) OPCODE_FREE,V(blockid),
+#define FWD(speed) OPCODE_FWD,V(speed),
+#define GREEN(signal_id) OPCODE_GREEN,V(signal_id),
+#define IF(sensor_id) OPCODE_IF,V(sensor_id),
+#define IFNOT(sensor_id) OPCODE_IFNOT,V(sensor_id),
+#define IFRANDOM(percent) OPCODE_IFRANDOM,V(percent),
+#define IFRESERVE(block) OPCODE_IFRESERVE,V(block),
+#define INVERT_DIRECTION OPCODE_INVERT_DIRECTION,NOP,
+#define JOIN OPCODE_JOIN,NOP,
+#define LATCH(sensor_id) OPCODE_LATCH,V(sensor_id),
+#define LCD(id,msg) OPCODE_PRINT,V(__COUNTER__ - StringMacroTracker2),
+#define ONCLOSE(turnout_id) OPCODE_ONCLOSE,V(turnout_id),
+#define ONTHROW(turnout_id) OPCODE_ONTHROW,V(turnout_id),
+#define PAUSE OPCODE_PAUSE,NOP,
+#define POM(cv,value) OPCODE_POM,V(cv),OPCODE_PAD,V(value),
+#define PRINT(msg) OPCODE_PRINT,V(__COUNTER__ - StringMacroTracker2),
+#define READ_LOCO OPCODE_READ_LOCO1,NOP,OPCODE_READ_LOCO2,NOP,
+#define RED(signal_id) OPCODE_RED,V(signal_id),
+#define RESERVE(blockid) OPCODE_RESERVE,V(blockid),
+#define RESET(sensor_id) OPCODE_RESET,V(sensor_id),
+#define RESUME OPCODE_RESUME,NOP,
+#define RETURN OPCODE_RETURN,NOP,
+#define REV(speed) OPCODE_REV,V(speed),
+#define SENDLOCO(cab,route) OPCODE_SENDLOCO,V(cab),OPCODE_PAD,V(route),
+#define START(route) OPCODE_START,V(route),
+#define SERVO(id,position,profile) OPCODE_SERVO,V(id),OPCODE_PAD,V(position),OPCODE_PAD,V(PCA9685::ProfileType::profile),
+#define SETLOCO(loco) OPCODE_SETLOCO,V(loco),
+#define SET(sensor_id) OPCODE_SET,V(sensor_id),
+#define SPEED(speed) OPCODE_SPEED,V(speed),
+#define STOP OPCODE_SPEED,V(0), 
+#define SIGNAL(redpin,amberpin,greenpin) OPCODE_SIGNAL,V(redpin),OPCODE_PAD,V(amberpin),OPCODE_PAD,V(greenpin), 
+#define SERVO_TURNOUT(id,pin,activeAngle,inactiveAngle,profile) OPCODE_SERVOTURNOUT,V(id),OPCODE_PAD,V(pin),OPCODE_PAD,V(activeAngle),OPCODE_PAD,V(inactiveAngle),OPCODE_PAD,V(PCA9685::ProfileType::profile),
+#define PIN_TURNOUT(id,pin) OPCODE_PINTURNOUT,V(id),OPCODE_PAD,V(pin), 
+#define THROW(id)  OPCODE_THROW,V(id),
+#define TURNOUT(id,addr,subaddr) OPCODE_TURNOUT,V(id),OPCODE_PAD,V(addr),OPCODE_PAD,V(subaddr),
+#define UNJOIN OPCODE_UNJOIN,NOP,
+#define UNLATCH(sensor_id) OPCODE_UNLATCH,V(sensor_id),
+
+// PASS2 Build RouteCode
+const int StringMacroTracker2=__COUNTER__;
+#include "myAutomation.h"
+
+// Restore normal code LCD macro
+#undef LCD
+#define LCD   StringFormatter::lcd
+
+#endif

Release_Notes/ThrottleAssists.md

@@ -1,75 +0,0 @@
-Throttle Assist updates for versiuon 4.?
-
-Chris Harlow April 2022
-
-There are a number of additional throttle information commands that have been implemented to assist throttle authors to obtain information from the Command Station in order to implement turnout, route/automation and roster features which are already found in the Withrottle implementations. 
-These commands are new and not overlapped with the existing commands which are probabaly due to be obsoleted as they are over complex and unfit for purpose. 
-
-Turnouts:
-
-The conventional turnout definition commands and the ```<H>``` responses do not contain information about the turnout description which may have been provided in an EXRAIL script. A turnout description is much more user friendly than T123 and having a list helps the throttle UI build a suitable set of buttons.
-
-```<JT>``` command returns a list of turnout ids. The throttle should be uninterested in the turnout technology used but needs to know the ids it can throw/close and monitor the current state. 
-e.g.  response ```<jT 1 17 22 19>``` 
-
-```<JT 17>`` requests info on turnout 17.
-e.g. response ```<jT 17 T "Coal yard exit">``` or ```<jT 17 C "Coal yard exit">```
-(T=thrown, C=closed)
-or ```<jT 17 C "">``` indicating turnout description not given. 
-or ```<jT 17 X>``` indicating turnout unknown (or possibly hidden.) 
-
-Note: It is still the throttles responsibility to monitor the status broadcasts.
- (TBD I'm thinking that the existing broadcast is messy and needs cleaning up)
- However, I'm not keen on dynamically created/deleted turnouts so I have no intention of providing a command that indicates the turnout list has been updated since the throttle started. 
- Also note that turnouts marked in EXRAIL with the HIDDEN keyword instead of a "description" will NOT show up in these commands. 
-
-
- Automations/Routes
-
- A throttle need to know which EXRAIL Automations and Routes it can show the user.
-
- ```<JA>``` Returns a list of Automations/Routes
- e.g. ```<jA 13 16 23>```
- Indicates route/automation ids.
- Information on each route needs to be obtained by 
- ```<JA 13>``` 
- returns e.g. ```<jA 13 R "description">``` for a route
- or  ```<jA 13 A "description">``` for an automation. 
- or ```<jA 13 X>``` for id not found
-
- Whats the difference: 
-   A Route is just a call to an EXRAIL ROUTE, traditionally to set some turnouts or signals but can be used to perform any kind of EXRAIL function... but its not expecting to know the loco.  
-   Thus a route can be triggered by sending in for example ```</START 13>```. 
- 
-   An Automation is a handoff of the last accessed loco id to an EXRAIL AUTOMATION which would typically drive the loco away.
-   Thus an Automation expects a start command with a cab id
-   e.g. ```</START 13 3>```
-
-
-   Roster Information:
-   The ```<JR>``` command requests a list of cab ids from the roster.
-   e.g. responding ```<jR 3 200 6336>```
-   or <jR> for none. 
-
-   Each Roster entry had a name and function map obtained by:
-   ```<JR 200>```  reply like ```<jR 200 "Thomas" "whistle/*bell/squeal/panic">
-   
-   Refer to EXRAIL ROSTER command for function map format.
-
-
-  Obtaining throttle status.
-  ```<t cabid>```  Requests a deliberate update on the cab speed/functions in the same format as the cab broadcast.
-     ```<l cabid slot speedbyte functionMap>```
-      Note that a slot of -1 indicates that the cab is not in the reminders table and this comand will not reserve a slot until such time as the cab is throttled.
-
-
-  COMMANDS TO AVOID
-
-  ```<f cab func1 func2>```     Use ```<F cab function 1/0>```
-  ```<t  slot cab speed dir>``` Just drop the slot number 
-  ```<T commands>``` other than ```<T id 0/1>```
-  ```<s>```
-  ```<c>```
-
-
-

Release_Notes/TrackManager.md

@@ -1,139 +0,0 @@
-# DCC++EX Track Manager
-
-Chris Harlow 2022/03/23
-
-**If you are only interested in a standard setup using just a DCC track and PROG track, then you DO NOT need to read the rest of this document.**
-
-What follows is for advanced users interested in managing power districts and/or running DC locomotives through DCC++EX.
-
-## What is the Track Manager
-Track Manger (TM from now on) is an integral part of DCC++EX software that is responsible for:
-- Managing track power state.
-- Monitoring track overloads and shorts.
-- Routing the DCC main or prog track waveforms to the correct Motor Driver and thus track.
-- Managing the JOIN feature.
-- Intercepting throttle commands to locos running on DC tracks.
-- Handling user or EXRAIL commands to switch track status.
-
-In the default scenario of a single DCC track and a PROG track, the TM behaves as for the previous versions of DCC++EX so if thats what you want, you dont need to mess with it.
-
-The TM is able to handle up to 8 separate track domains. Each domain requires a hardware driver to supply track voltage. A typical motor driver shield supplies two tracks, which is what we have used in the past as main and prog.
-
-Unlike the previous version of DCC++EX, where the shield channel A was always the DCC main and channel B was always the DCC prog track, TM allows :
-- None, any or all the tracks can be DCC Main.
-- None or ONE track may be DCC prog at any given time.
-- Any track may be powered on or off independently of the others.
-- Any track may be disconnected from the DCC signal and used as a DC track with a given loco address. (See DC discussion later)
-
-With such flexibility comes responsibility... the potential for making mistakes means taking extra care with your configuration!
-
-**NOTE** TM does NOT use "zero stretching" to control your DC motor. Instead, it uses true Pulse Width Modulation (PWM) to efficiently run your loco using the same method a decoder uses to control a DCC loco's motor. DC locos can even run better on TM than they can on a normal analog throttle, especially at low speed, since it is always applying the full track voltage, albeit in pulses of varying duration. 
-
-## Using the Track Manager (DCC)
-TM names the tracks A to H. In a default setup, you will normally have tracks A and B where A will default to be the DCC main signal and B will be the DCC prog.
-
-There is a new user command `<=>` which is used to control the TM but the `<0>` and `<1>` commands operate as before.
-
-- `<=>`  lists the current track settings.
-In a default setup this will normally return 
-```
-        <=A DCC>
-        <=B PROG>
-```
-- `<=t DCC>`  sets track t (A..H) to use the DCC main track.   For example `<=C DCC>` sets track C. All tracks that are set to DCC will receive the same DCC signal waveform.
-- `<=t PROG>` Sets track t (A..H) to be the one and only PROG track. Any previous PROG track is turned off.
-- `<=t OFF>` turns off the track t. It will not power on with `<1>` because it will not know what signal to send. 
-
-In an all-DCC environment it is unlikely that you will need to do anything other than setting any additional tracks (C...H) as DCC in your `mySetup.h` file.
-
-Bear in mind that a track may actually be only connected to DCC accessories such as signals and turnouts... your layout, your choice. 
-
-Note that when setting a track to PROG or OFF, its power is switched off automatically. (The PROG track manages power on an as-needed basis under normal circumstances.
-When setting a track to MAIN (or DC, DCX see later) the power is applied according to the most recent `<1>` or `<0>` command as being the most compatible with previous versions.
-
-## using the Track Manager (DC)
-
-TM allows any or all of your tracks to be individually selected as a DC track which responds to throttle commands on any given loco address. So for example if track A is set to DC address 55, then any throttle commands to loco 55 will be transmitted as DC onto track A and thus a DC loco can be driven along that track. almost exactly as if it was DCC.
-Your throttle (JMRI, EX-Webthrottle, Withrottle, Engine Driver etc etc) do not know or care that this is a DC loco so nothing needs to change.
-
-For a simple Command Station setup to run just two DC tracks instead of DCC, you only need to assign DC addresses to tracks A and B. If you want DCC on track A and DC on track B, you just need to set track B to a suitable DC address.
-
-The command to set a track to a DC address is as follows 
-- `<=t DC a>` Sets track t (A..H) to use loco address a. e.g. <=A DC 3>
-
-A simple 2 separate loop DC track, wired the traditional way in opposite directions, may be set like this to use loco addresses 1 and 2.  
-```
-<=A DC 1>
-<=A DC 2>
-```
-
-### Crossing between DC tracks 
-
-There are some slightly mind-bending issues to be addressed, especially if you want to be able to cross between two separate DC tracks or use your layout in DCC or DC mode. This is because the control of DC loco direction is relative to the TRACK and not the LOCO. (you turn a DC loco round on the track and it continues in the same geographical direction. You turn a DCC loco around and it continues to go forwards or backwards in the opposite geographical direction.)
-
-Generally DC tracks are wired so that two mainline tracks are in opposite direction which makes operation easy BUT crossovers between tracks will cause shorts unless you have very complex switching arrangements.
-This is generally incompatible with DCC wiring which expects to be able to cross between tracks with impunity because they are all wired with the same polarity. 
-
-To get over this issue TM allows the polarity of a DC track to be swapped so that tracks wired for DCC may be switched to DC with a polarity chosen at run time according to your operations. So, for example, you may have two loops with a crossing between them. Normally you need them in opposite directions, but when you need to drive over the crossing, you need to switch one or other track so that they are at the same polarity.
-(This is a good case for using EXRAIL to help)
-
-The command `<=t DCX a>` will set track t (A..H) to be DC but with reversed polarity compared with a track set to DC.
-
-Its perfectly OK to cross between DC tracks by setting them to the same loco address and making sure you get the polarity right!
-
-## Connecting Hardware
-Each track requires hardware to control it
-- Power on/off
-- Polarity (direction, signal etc)
-- Brake (shorts tracks together)
-- Current (analog reading)
-
-The standard motor shields provide this for two separate tracks and are predictable and easy to use. However STACKING shields is not a viable way of adding more tracks because it prevents the software from gaining access to the individual track pins. Similarly, wiring all the signal pins together for example, will give you a shared DCC signal but it will eliminate any possibility of switching the track purpose at run time. So, you are going to have to understand enough to wire track drivers to various pins if you wish to extend beyond 2 tracks and take advantage of TM.
-
-You will also need to consider the implications of differing electronic implementations that would cause unexpected issues when a loco moves between tracks. We know this works fine for a typical shield because we use `<1 JOIN>` quite happily but this may be different if you mix hardware types..... (NOT MY PROBLEM !) 
-
-The easiest way to consider the wiring is to treat each track individually (either as a separate driver or as half of a shield).
-
-You will require,for each track, on the Arduino:
-- A GPIO pin (or a HAL vpin perhaps on an I2C extender, code TBA!!!) to switch power.
-- A GPIO pin to switch the signal direction
-- A GPIO pin with PWM capability to switch the Brake (you may omit this if you dont want any DC capability)
-- Optionally An Analog pin to read the current (unless your hardware cant do that, perhaps its just feeding a booster)
-- Optionally a GPIO fault pin if thats how your hardware works. (NOT recommended as you're going to run out of pins)
-
-IF you have no more than 3 tracks and you can arrange for the signal pins to be one of 11,12,13 on a Mega, THEN there is a slight advantage internally and the waveform will be super-sharp.
-
-**Hardware that has two signal pins still needs some code thought!!!!!!!!**
-
-
-## Configuring the Software
-
-Configuring the software to provide more tracks is a simple extension of the existing method of customising the #define of MOTOR_SHIELD_TYPE in config.h
-Since there can be no standard setup of your wiring and hardware choices, it will be necessary to create your custom built MOTOR_SHIELD_TYPE in the manner described in MotorDrivers.h and simply continue to add more `new MotorDriver(` definitions to the list, providing all the pin numbers and electronic limits for each track. (or even shorten the list to 1)
-
-## Using EXRAIL to control Track Manager
-EXRAIL has a single additional command that can be used to automate TM.
-
-- `SET_TRACK(t,mode)`
-where t is the track letter A..H and mode is one of
-- `OFF`  track is switched off
-- `DCC`  track gets DCC signal
-- `PROG` track gets DCC prog signal
-- `DC`   track is set to DC mode with the cab address of the currently executing EXRAIL sequence. 
-- `DCX` as DC but with reversed polarity.
-
-DC/DCX are designed so that you can be automating a DCC loco, drive it onto a separate track and switch to DC without having to know the cab address. (e.g AUTOMATION) 
-If however you are just running a ROUTE you can always do something like this:
-```
- ROUTE(77,"Set track G to DC 123")
-   SETLOCO(123)
-   SET_TRACK(G,DC)
-   DONE
-```
-
-## Where and How for the Code.
-The TM code is primarily in TrackManager.cpp which is responsible for coordinating the track settings and commands. 
-
-Each individual track is handled by an instance of MotorDriver created from the MOTOPR_SHIELD_TYPE definition in config.h 
-
-Many functions formerly in the DCCWaveform code have been moved to TrackManager or MotorDriver, notably the power control and checking. This makes the code easier to follow.

Release_Notes/release_notes_v4.0.0.md

@@ -1,284 +0,0 @@
-Version 4.0 Release Notes
-*************************
-
-The DCC-EX Team is pleased to release CommandStation-EX-v4.0.0 as a Production Release.  Release v4.0.0 is a Major release that adds significant new product design, plus Automation features and bug fixes. The team continues improving the architecture of DCC++EX to make it more flexible and optimizing the code so as to get more performance from the Arduino (and other) microprocessors.  This release includes all of the Point Releases from v3.2.0 to v3.2.0 rc13.
-
-**Downloads (zip and tar.gz) below. These are named without version number in the folder name to make the Arduino IDE happy.**
-
-[CommandStation-EX.zip](https://github.com/DCC-EX/CommandStation-EX/releases/download/v4.0.0-Prod/CommandStation-EX.zip)
-
-
-[CommandStation-EX.tar.gz](https://github.com/DCC-EX/CommandStation-EX/releases/download/v0.0.0-Prod/CommandStation-EX.tar.gz)
-
-**Known Issues**
-
-- **Wi-Fi** - Requires sending `<AT>` commands from a serial monitor if you want to switch between AP mode and STA station mode after initial setup
-- **Pololu Motor Shield** - is supported with this release, but the user may have to adjust timings to enable programming mode due to limitations in its current sensing circuitry
-
-**All New Major DCC++EX 4.0.0 features**
-
-- **New HAL Hardware Abstraction Layer API** that automatically detects and greatly simplifies interfacing to many predefined accessory boards for servos, signals & sensors and added I/O (digital and analog inputs and outputs, servos etc). 
-- HAL Support for;
-  - MCP23008, MCP23017 and PCF9584 I2C GPIO Extender modules. 
-  - PCA9685 PWM (servo & signal) control modules. 
-  - Analogue inputs on Arduino pins and on ADS111x I2C modules. 
-  - MP3 sound playback via DFPlayer module. 
-  - HC-SR04 Ultrasonic range sensor module. 
-  - VL53L0X Laser range sensor module (Time-Of-Flight). 
-  - A new `<D HAL SHOW>` command to list the HAL devices attached to the command station
- 
-**New Command Station Broadcast throttle logic**
-
-- Synchronizes multiple WiThrottles and PC based JMRI Throttles for direction, speed and F-key updates
-
-**New ‘Discovered Servers’ on WiFi Throttles**
-
-- Our New multicast Dynamic Network Server (mDNS) enhancement allows us to display the available WiFi server connections to a DCC++EX Command Station. Selecting it allows your WiThrottle App to connect to and load Server Rosters and function keys to your throttle from the new DCC++EX Command Station Server Roster.
-
-**New DCC++EX 4.0.0 with EX-RAIL Extended Railroad Automation Instruction Language**
-
-- Use to control your entire layout or as a separate accessory/animation controller
-- Awesome, cleverly powerful yet simple user friendly scripting language for user built Automation & Routing scripts. 
-- You can control Engines, Sensors, Turnouts, Signals, Outputs and Accessories that are entered into your new myAutomation.h file, then uploaded into the DCC++EX Command Station.
-- EX-RAIL scripts are automatically displayed as Automation {Handoff} and Route {Set} buttons on supported WiFi Throttle Apps.
-
-**New EX-RAIL ‘Roster’ Feature**
-
-- List and store user defined engine roster & function keys inside the command station, and automatically load them in WiFi Throttle Apps.
-- When choosing “DCC++EX” from discovered servers an Engine Driver or WiThrottle is directly connected to the Command Station. 
-- The EX-RAIL ’ROSTER’ command allows all the engine numbers, names and function keys you’ve listed in your myAutomation.h file to automatically upload the Command Station's ‘Server Roster’ into your Engine Driver and WiThrottle Apps.  
-
-**New JMRI 4.99.2 and above specific DCC++EX 4.0 features**
-
-- Enhanced JMRI DCC++ Configure Base Station pane for building and maintaining Sensor, Turnout and Output devices, or these can automatically be populated from the DCC++EX Command Station's mySetup.h file into JMRI.
-
-- JMRI now supports multiple serial connected DCC++EX Command Stations, to display and track separate "Send DCC++ Command" and "DCC++ Traffic" Monitors for each Command Station at the same time.
-  For example: Use an Uno DCC++EX DecoderPro Programming Station {DCC++Prg} on a desktop programming track and a second Mega DCC++EX EX-RAIL Command Station for Operations {DCC++Ops} on the layout with an additional `<JOINED>` programming spur or siding track for acquiring an engine and ‘Drive Away’ onto the mainline (see the DriveAway feature for more information).
-
-**DCC++EX 4.0.0 additional product enhancements**
-
-- Additional Motor Shields and Motor Board {boosters) supported
-- Additional Accessory boards supported for GPIO expansion, Sensors, Servos & Signals
-- Additional diagnostic commands like ‘D ACK RETRY’ and ‘D EXRAIL ON’ events, ‘D HAL SHOW’ devices and ‘D SERVO’ positions, and ‘D RESET’ the command station while maintaining the serial connection with JMRI
-- Automatic retry on failed ACK detection to give decoders another chance
-- New EX-RAIL ’/’ slash command allows JMRI to directly communicate with many EX-RAIL scripts
-- Turnout class revised to expand turnout capabilities and allow turnout names/descriptors to display in WiThrottle Apps.
-- Build turnouts through either or both mySetup.h and myAutomation.h files, and have them automatically passed to, and populate, JMRI Turnout Tables
-- Turnout user names display in Engine Driver & WiThrottles
-- Output class now allows ID > 255. 
-- Configuration options to globally flip polarity of DCC Accessory states when driven from `<a>` command and `<T>` command.
-- Increased use of display for showing loco decoder programming information. 
-- Can disable EEPROM memory code to allow room for DCC++EX 4.0 to fit on a Uno Command Station
-- Can define border between long and short addresses 
-- Native non-blocking I2C drivers for AVR and Nano architectures (fallback to blocking Wire library for other platforms). 
-- EEPROM layout change - deletes EEPROM contents on first start following upgrade. 
-
-**4.0.0 Bug Fixes**
-
-- Compiles on Nano Every
-- Diagnostic display of ack pulses >32ms
-- Current read from wrong ADC during interrupt
-- AT(+) Command Pass Through 
-- CiDAP WiFi Drop out and the WiThrottle F-key looping error corrected
-- One-off error in CIPSEND drop
-- Common Fault Pin Error
-- Uno Memory Utilization optimized
-
-#### Summary of Release 3.1.0 key features and/or bug fixes by Point Release
-
-**Summary of the key new features added to CommandStation-EX V3.0.16**
-
-- Ignore CV1 bit 7 read if rejected by a non NMRA compliant decoder when identifying loco id
-
-**Summary of the key new features added to CommandStation-EX V3.0.15**
-
-- Send function commands just once instead of repeating them 4 times
-
-**Summary of the key new features added to CommandStation-EX V3.0.14**
-
-- Add feature to tolerate decoders that incorrectly have gaps in their ACK pulse
-- Provide proper track power management when joining and unjoining tracks with <1 JOIN>
-
-**Summary of the key new features added to CommandStation-EX V3.0.13**
-
-- Fix for CAB Functions greater than 127
-
-**Summary of the key new features added to CommandStation-EX V3.0.12**
-
-- Fixed clear screen issue for nanoEvery and nanoWifi
-
-**Summary of the key new features added to CommandStation-EX V3.0.11**
-
-- Reorganized files for support of 128 speed steps
-
-**Summary of the key new features added to CommandStation-EX V3.0.10**
-
-- Added Support for the Teensy 3.2, 3.5, 3.6, 4.0 and 4.1 MCUs
-- No functional change just changes to avoid complier warnings for Teensy/nanoEvery
-
-**Summary of the key new features added to CommandStation-EX V3.0.9**
-
-- Rearranges serial newlines for the benefit of JMRI
-- Major update for efficiencies in displays (LCD, OLED)
-- Add I2C Support functions
-
-**Summary of the key new features added to CommandStation-EX V3.0.8**
-
-- Wraps <* *> around DIAGS for the benefit of JMRI
-
-**Summary of the key new features added to CommandStation-EX V3.0.7**
-
-- Implemented support for older 28 apeed step decoders - Option to turn on 28 step speed decoders in addition to 128. If set, all locos will use 28 steps.
-- Improved overload messages with raw values (relative to offset)
-
-**Summary of the key new features added to CommandStation-EX V3.0.6**
-
-- Prevent compiler warning about deprecated B constants
-- Fix Bug that did not let us transmit 5 byte sized packets - 5 Byte commands like PoM (programming on main) were not being sent correctly
-- Support for Huge function numbers (DCC BinaryStateControl) - Support Functions beyond F28
-- <!> ESTOP all - New command to emergency stop all locos on the main track
-- <- [cab]> estop and forget cab/all cabs - Stop and remove loco from the CS. Stops the repeating throttle messages
-- `<D RESET>` command to reboot Arduino
-- Automatic sensor offset detect
-- Improved startup msgs from Motor Drivers (accuracy and auto sense factors)
-- Drop post-write verify - No need to double check CV writes. Writes are now even faster.
-- Allow current sense pin set to UNUSED_PIN - No need to ground an unused analog current pin. Produce startup warning and callback -2 for prog track cmds.
-
-**Summary of the key new features added to CommandStation-EX V3.0.5**
-
-- Fix Fn Key startup with loco ID and fix state change for F16-28
-- Removed ethernet mac config and made it automatic
-- Show wifi ip and port on lcd
-- Auto load config.example.h with warning
-- Dropped example .ino files
-- Corrected .ino comments
-- Add Pololu fault pin handling
-- Waveform speed/simplicity improvements
-- Improved pin speed in waveform
-- Portability to nanoEvery and UnoWifiRev2 CPUs
-- Analog read speed improvements
-- Drop need for DIO2 library
-- Improved current check code
-- Linear command
-- Removed need for ArduinoTimers files
-- Removed option to choose different timer
-- Added EX-RAIL hooks for automation in future version
-- Fixed Turnout list
-- Allow command keywords in mixed case
-- Dropped unused memstream
-- PWM pin accuracy if requirements met
-
-**Summary of the key new features added to CommandStation-EX V3.0.4**
-
-- "Drive-Away" Feature - added so that throttles like Engine Driver can allow a loco to be programmed on a usable, electrically isolated programming track and then drive off onto the main track
-- WiFi Startup Fixes
-
-**Summary of the key new features added to CommandStation-EX V3.0.3**
-
-- Command to write loco address and clear consist
-- Command will allow for consist address
-- Startup commands implemented
-
-**Summary of the key new features added to CommandStation-EX V3.0.2:**
-
-- Create new output for current in mA for `<c>` command - New current response outputs current in mA, overlimit current, and maximum board capable current
-- Simultaneously update JMRI to handle new current meter
-
-**Summary of the key new features added to CommandStation-EX V3.0.1:**
-
-- Add back fix for jitter
-- Add Turnouts, Outputs and Sensors to `<s>` command output
-
-**CommandStation-EX V3.0.0:**
-
-**Release v3.0.0 was a major rewrite if earlier versions of DCC++.  The code base was re-architeced and core changes were made to the Waveform generator to reduce overhead and make better use of Arduino.** **Summary of the key new features added in Release v3.0.0 include:**
-
-- **New USB Browser Based Throttle** - WebThrottle-EX is a full front-end to controller to control the CS to run trains.
-- **WiFi Support** - AP and station modes supported. Auto-detection of an ESP8266 WiFi module with AT firmware on a Mega's serial port. Connection to JMRI and WiThrottle clients.
-- **Withrottle Integrations** - Act as a host for up to four WiThrottle clients concurrently.
-- **Add LCD/OLED support** - OLED supported on Mega only
-- **Improved CV programming routines** - checks for length of CV pulse, and breaks out of the wait state once it has received an ACK, now reading one CV per second.
-- **Improved current sensing** - rewrote current sensing routines for safer operation. Current thresholds based on milliamps, not magic numbers
-- **Individual track power control** - Ability to toggle power on either or both tracks, and to "JOIN" the tracks and make them output the same waveform for multiple power districts.
-- **Single or Dual-Pin PWM output** - Allows control of H-bridges with PH/EN or dual PWM inputs
-- **New, simpler function command** - `<F>` command allows setting functions based on their number, not based on a code as in `<f>`
-- **Function reminders** - Function reminders are sent in addition to speed reminders
-- **Functions to F28** - All NMRA functions are now supported
-- **Filters and user functions** - Ability to filter commands in the parser and execute custom code based on them. (ex: Redirect Turnout commands via NRF24)
-- **Diagnostic `<D>` commands** - See documentation for a full list of new diagnostic commands
-- **Rewrote DCC++ Parser** - more efficient operation, accepts multi-char input and uses less RAM
-- **Rewritten waveform generator** - capable of using any pin for DCC waveform out, eliminating the need for jumpers
-- **Rewritten packet generator** - Simplify and make smaller, remove idea of "registers" from original code
-- **Add free RAM messages** - Free RAM messages are now printed whenever there is a decerase in available RAM
-- **Fix EEPROM bugs**
-- **Number of locos discovery command** - `<#>` command
-- **Support for more locomotives** - 20 locomotives on an UNO and 50 an a Mega.
-- **Automatic slot management** - slot variable in throttle/function commands are ignored and slot management is taken care of automatically. `<->` and `<- CAB>` commands added to release locos from memory and stop packets to the track.
-
-**Key Contributors**
-
-**Project Lead**
-
-- Fred Decker - Holly Springs, North Carolina, USA (FlightRisk)
-
-**CommandStation-EX Developers**
-
-- Chris Harlow - Bournemouth, UK (UKBloke)
-- Harald Barth - Stockholm, Sweden (Haba)
-- Neil McKechnie - Worcestershire, UK (NeilMck)
-- Fred Decker - Holly Springs, North Carolina, USA (FlightRisk)
-- Dave Cutting - Logan, Utah, USA (Dave Cutting/ David Cutting)
-- M Steve Todd - Oregon, USA (MSteveTodd) 
-- Scott Catalano - Pennsylvania
-- Gregor Baues - Île-de-France, France (grbba)
-
-**Engine Driver and JMRI Interface**
-
-- M Steve Todd
-
-**exInstaller Software**
-
-- Anthony W - Dayton, Ohio, USA (Dex, Dex++)
-
-**Website and Documentation**
-
-- Mani Kumar - Bangalor, India (Mani / Mani Kumar)
-- Fred Decker - Holly Springs, North Carolina, USA (FlightRisk)
-- Dave Cutting - Logan, Utah, USA (Dave Cutting/ David Cutting)
-- Roger Beschizza - Dorset, UK (Roger Beschizza)
-- Keith Ledbetter - Chicago, Illinois, USA (Keith Ledbetter)
-- Kevin Smith - Rochester Hills, Michigan USA (KC Smith)
-- Colin Grabham - Central NSW, Australia (Kebbin)
-
-**WebThrotle-EX**
-
-- Fred Decker - Holly Springs, NC (FlightRisk/FrightRisk)
-- Mani Kumar - Bangalor, India (Mani /Mani Kumar)
-- Matt H - Somewhere in Europe
-
-**Beta Testing / Release Management / Support**
-
-- Larry Dribin - Release Management
-- Kevin Smith - Rochester Hills, Michigan USA (KC Smith)
-- Herb Morton - Kingwood Texas, USA (Ash++)
-- Keith Ledbetter
-- Brad Van der Elst
-- Andrew Pye
-- Mike Bowers
-- Randy McKenzie
-- Roberto Bravin
-- Sam Brigden
-- Alan Lautenslager
-- Martin Bafver
-- Mário André Silva
-- Anthony Kochevar
-- Gajanatha Kobbekaduwe
-- Sumner Patterson
-- Paul - Virginia, USA
-
-**Downloads (zip and tar.gz) below. These are named without version number in the folder name to make the Arduino IDE happy.**
-
-[CommandStation-EX.zip](https://github.com/DCC-EX/CommandStation-EX/releases/download/v4.0.0-Prod/CommandStation-EX.zip)
-
-
-[CommandStation-EX.tar.gz](https://github.com/DCC-EX/CommandStation-EX/releases/download/v4.0.0-Prod/CommandStation-EX.tar.gz)

RingStream.cpp

@@ -1,6 +1,5 @@
 /*
- *  © 2020-2021 Chris Harlow
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
  *  
  *  This file is part of DCC-EX CommandStation-EX
  *
@@ -18,17 +17,9 @@
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
-// NOTE: The use of a marker byte without an escape algorithm means
-// RingStream is unsuitable for binary data. Should binary data need to be 
-// streamed it will be necessary to implementr an escape strategy to handle the 
-// marker char when embedded in data. 
-
 #include "RingStream.h"
 #include "DIAG.h"
 
-const byte FLASH_INSERT_MARKER=0xff;
-
 RingStream::RingStream( const uint16_t len)
 {
   _len=len;
@@ -39,7 +30,6 @@ RingStream::RingStream( const uint16_t len)
   _overflow=false;
   _mark=0;
   _count=0; 
-  _flashInsert=0;
 }
 
 size_t RingStream::write(uint8_t b) {
@@ -55,78 +45,8 @@ size_t RingStream::write(uint8_t b) {
   return 1;
 }
 
-// Ideally, I would prefer to override the Print:print(_FlashStringHelper) function
-// but the library authors omitted to make this virtual.
-// Therefore we obveride the only other simple function that has no side effects
-// in order that StringFormatter can recognise a RingStream and call its 
-// printFlash() directly.  
-int RingStream::availableForWrite()  { 
-  return  THIS_IS_A_RINGSTREAM; 
-  }
-
-size_t RingStream::printFlash(const FSH * flashBuffer) {
-// We are about to add a PROGMEM string to the buffer. 
-// To save RAM we can insert a marker and the
-// progmem address into the buffer instead.
-// The buffer reading code must recognise this marker and 
-// silently extract the progmem bytes.
-// In addition, we must make the count correct as if the 
-// string had been embedded so that things like the wifi code
-// can read the expected count before reading the buffer. 
-
-// Establish the actual length of the progmem string.
-char * flash=(char *)flashBuffer;
-int16_t plength=strlen_P(flash);
-if (plength==0) return 0; // just ignore empty string
-
-// Retain the buffer count as it will be modified by the marker+address insert
-int prevCount=_count;
-write(FLASH_INSERT_MARKER); // write the marker
-uintptr_t iFlash=reinterpret_cast<uintptr_t>(flash); // expect size match with pointer
-
-// write address bytes LSB first (size depends on CPU) 
-for (byte f=0;f<sizeof(iFlash); f++) {
-    write((byte) (iFlash & 0xFF));
-    iFlash>>=8;
-}
-
-// correct the buffer count to reflect the flash length, not the marker/addr.
-_count=prevCount+plength;  
-return plength;
-}
-
 int RingStream::read() {
-  if (_flashInsert) {
-    // we are reading out of a flash string 
-    byte fb=GETFLASH(_flashInsert);
-    _flashInsert++;
-    if (fb) return fb; // we have a byte from the flash
-    // flash insert complete, clear and drop through to next buffer byte
-    _flashInsert=NULL; 
-  }
   if ((_pos_read==_pos_write) && !_overflow) return -1;  // empty  
-  byte b=readRawByte();
-  if (b!=FLASH_INSERT_MARKER) return b; 
-#ifndef ARDUINO_ARCH_ESP32
-  // Detected a flash insert 
-  // read address bytes LSB first (size depends on CPU) 
-  uintptr_t iFlash=0; 
-  for (byte f=0; f<sizeof(iFlash); f++) {
-    uintptr_t bf=readRawByte();
-    bf&=0x00ff;
-    bf<<= (8*f); // shift byte to correct position in iFlash
-    iFlash |= bf;  
-  }
-  _flashInsert=reinterpret_cast<char * >( iFlash);
-  // and try again... so will read the first byte of the insert. 
-  return read();
-#else
-  DIAG(F("Detected flash insert marker at pos %d but there should not be one"),_pos_read);
-  return '\0';
-#endif
-}
-
-byte RingStream::readRawByte() {
   byte b=_buffer[_pos_read];
   _pos_read++;
   if (_pos_read==_len) _pos_read=0;
@@ -134,8 +54,9 @@ byte RingStream::readRawByte() {
   return b;
 }
 
+
 int RingStream::count() {
-  return (readRawByte()<<8) | readRawByte(); 
+  return (read()<<8) | read(); 
   }
 
 int RingStream::freeSpace() {
@@ -147,8 +68,6 @@ int RingStream::freeSpace() {
 
 // mark start of message with client id (0...9)
 void RingStream::mark(uint8_t b) {
-    //DIAG(F("RS mark client %d at %d core %d"), b, _pos_write, xPortGetCoreID());
-    _ringClient = b;
     _mark=_pos_write;
     write(b); // client id
     write((uint8_t)0);  // count MSB placemarker
@@ -159,27 +78,20 @@ void RingStream::mark(uint8_t b) {
 // peekTargetMark is used by the parser stash routines to know which client
 // to send a callback response to some time later. 
 uint8_t RingStream::peekTargetMark() {
-  return _ringClient;
-}
-
-void RingStream::info() {
-  DIAG(F("Info len=%d count=%d pr=%d pw=%d m=%d"),_len, _count,_pos_read,_pos_write,_mark);
+  return _buffer[_mark];
 }
 
 bool RingStream::commit() {
-  _flashInsert=NULL; // prepared for first read
   if (_overflow) {
-        //DIAG(F("RingStream(%d) commit(%d) OVERFLOW"),_len, _count);
+        DIAG(F("RingStream(%d) commit(%d) OVERFLOW"),_len, _count);
         // just throw it away 
         _pos_write=_mark;
         _overflow=false;
         return false; // commit failed
   }
   if (_count==0) {
-    //DIAG(F("RS commit count=0 rewind back to %d core %d"), _mark, xPortGetCoreID());
-    // ignore empty response
+    // ignore empty response 
     _pos_write=_mark;
-    _ringClient = NO_CLIENT;         //XXX make else clause later
     return true; // true=commit ok
   }
   // Go back to the _mark and inject the count 1 byte later
@@ -189,19 +101,5 @@ bool RingStream::commit() {
   _mark++;
   if (_mark==_len) _mark=0;
   _buffer[_mark]=lowByte(_count);
-  { char s[_count+2];
-    strncpy(s, (const char*)&(_buffer[_mark+1]), _count);
-    s[_count]=0;
-    //DIAG(F("RS commit count=%d core %d \"%s\""), _count, xPortGetCoreID(), s);
-  }
-  _ringClient = NO_CLIENT;
   return true; // commit worked
 }
-void RingStream::flush() {
-  _pos_write=0;
-  _pos_read=0;
-  _buffer[0]=0;
-  _flashInsert=NULL; // prepared for first read
-  _ringClient = NO_CLIENT;
-}
-  

RingStream.h

@@ -1,8 +1,7 @@
 #ifndef RingStream_h
 #define RingStream_h
 /*
- *  © 2020-2021 Chris Harlow
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
  *  
  *  This file is part of DCC-EX CommandStation-EX
  *
@@ -21,38 +20,21 @@
  */
 
 #include <Arduino.h>
-#include "FSH.h"
   
 class RingStream : public Print {
 
   public:
     RingStream( const uint16_t len);
-    static const int THIS_IS_A_RINGSTREAM=77;
+  
     virtual size_t write(uint8_t b);
-
-    // This availableForWrite function is subverted from its original intention so that a caller 
-    // can destinguish between a normal stream and a RingStream. 
-    // The Arduino compiler does not support runtime dynamic cast to perform
-    // an instranceOf check. 
-    // This is necessary since the Print functions are mostly not virtual so 
-    // we cant override the print(__FlashStringHelper *) function.
-   virtual int availableForWrite() override;
     using Print::write;
-    size_t printFlash(const FSH * flashBuffer);
     int read();
     int count();
     int freeSpace();
     void mark(uint8_t b);
     bool commit();
     uint8_t peekTargetMark();
-    void flush();
-    void info();
-    byte readRawByte();
-    inline int peek() {
-      if ((_pos_read==_pos_write) && !_overflow) return -1;  // empty
-      return _buffer[_pos_read];
-    };
-    static const byte NO_CLIENT=255;
+    
  private:
    int _len;
    int _pos_write;
@@ -61,8 +43,6 @@ class RingStream : public Print {
    int _mark;
    int _count;
    byte * _buffer;
-   char * _flashInsert;
-   byte _ringClient = NO_CLIENT;
 };
 
 #endif

SSD1306Ascii.cpp

@@ -89,93 +89,31 @@ const uint8_t FLASH SSD1306AsciiWire::blankPixels[30] =
   {0x40,        // First byte specifies data mode
   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};  
 
-
-//==============================================================================
-// this section is based on https://github.com/adafruit/Adafruit_SSD1306
-
-/** Initialization commands for a 128x32 or 128x64 SSD1306 oled display. */
-const uint8_t FLASH SSD1306AsciiWire::Adafruit128xXXinit[] = {
-    // Init sequence for Adafruit 128x32/64 OLED module
-    0x00,                              // Set to command mode
-    SSD1306_DISPLAYOFF,
-    SSD1306_SETDISPLAYCLOCKDIV, 0x80,  // the suggested ratio 0x80 
-    SSD1306_SETMULTIPLEX, 0x3F,        // ratio 64 (initially)
-    SSD1306_SETDISPLAYOFFSET, 0x0,     // no offset
-    SSD1306_SETSTARTLINE | 0x0,        // line #0
-    SSD1306_CHARGEPUMP, 0x14,          // internal vcc
-    SSD1306_MEMORYMODE, 0x02,          // page mode
-    SSD1306_SEGREMAP | 0x1,            // column 127 mapped to SEG0
-    SSD1306_COMSCANDEC,                // column scan direction reversed
-    SSD1306_SETCOMPINS, 0X12,          // set COM pins
-    SSD1306_SETCONTRAST, 0x7F,         // contrast level 127
-    SSD1306_SETPRECHARGE, 0xF1,        // pre-charge period (1, 15)
-    SSD1306_SETVCOMDETECT, 0x40,       // vcomh regulator level
-    SSD1306_DISPLAYALLON_RESUME,
-    SSD1306_NORMALDISPLAY,
-    SSD1306_DISPLAYON
-};
-
-//------------------------------------------------------------------------------
-// This section is based on https://github.com/stanleyhuangyc/MultiLCD
-
-/** Initialization commands for a 128x64 SH1106 oled display. */
-const uint8_t FLASH SSD1306AsciiWire::SH1106_132x64init[] = {
-  0x00,                                  // Set to command mode
-  SSD1306_DISPLAYOFF,
-  SSD1306_SETDISPLAYCLOCKDIV, 0X80,      // set osc division
-  SSD1306_SETMULTIPLEX, 0x3F,            // ratio 64
-  SSD1306_SETDISPLAYOFFSET, 0X00,        // set display offset
-  SSD1306_SETSTARTPAGE | 0X0,            // set page address
-  SSD1306_SETSTARTLINE | 0x0,            // set start line
-  SH1106_SET_PUMP_MODE, SH1106_PUMP_ON,  // set charge pump enable
-  SSD1306_SEGREMAP | 0X1,                // set segment remap
-  SSD1306_COMSCANDEC,                    // Com scan direction
-  SSD1306_SETCOMPINS, 0X12,              // set COM pins
-  SSD1306_SETCONTRAST, 0x80,             // 128
-  SSD1306_SETPRECHARGE, 0X1F,            // set pre-charge period
-  SSD1306_SETVCOMDETECT,  0x40,          // set vcomh
-  SH1106_SET_PUMP_VOLTAGE | 0X2,         // 8.0 volts
-  SSD1306_NORMALDISPLAY,                 // normal / reverse
-  SSD1306_DISPLAYON
-};
-
 //==============================================================================
 // SSD1306AsciiWire Method Definitions
 //------------------------------------------------------------------------------
  
 // Constructor
 SSD1306AsciiWire::SSD1306AsciiWire(int width, int height) {
-  m_displayWidth = width;
-  m_displayHeight = height;
   // Set size in characters in base class
   lcdRows = height / 8;
   lcdCols = width / 6;
-  m_col = 0;
-  m_row = 0;
-  m_colOffset = 0;
+
+  // Initialise request block for I2C
+  requestBlock.init();
 
   I2CManager.begin();
   I2CManager.setClock(400000L);  // Set max supported I2C speed
   for (byte address = 0x3c; address <= 0x3d; address++) {
     if (I2CManager.exists(address)) {
-      m_i2cAddr = address;
-      if (m_displayWidth==132 && m_displayHeight==64) {
-        // SH1106 display.  This uses 128x64 centered within a 132x64 OLED.
-        m_colOffset = 2;
-        I2CManager.write_P(address, SH1106_132x64init, sizeof(SH1106_132x64init));
-      } else if (m_displayWidth==128 && (m_displayHeight==64 || m_displayHeight==32)) {
-        // SSD1306 128x64 or 128x32
-        I2CManager.write_P(address, Adafruit128xXXinit, sizeof(Adafruit128xXXinit));
-        if (m_displayHeight == 32) 
-          I2CManager.write(address, 5, 0, // Set command mode
-            SSD1306_SETMULTIPLEX, 0x1F,     // ratio 32
-            SSD1306_SETCOMPINS, 0x02);      // sequential COM pins, disable remap
-      } else {
-        DIAG(F("OLED configuration option not recognised"));
-        return;
-      }
       // Device found
       DIAG(F("%dx%d OLED display configured on I2C:x%x"), width, height, address);
+      if (width == 132)
+        begin(&SH1106_132x64, address);
+      else if (height == 32)
+        begin(&Adafruit128x32, address);
+      else
+        begin(&Adafruit128x64, address);
       // Set singleton address
       lcdDisplay = this;
       clear();
@@ -197,6 +135,23 @@ void SSD1306AsciiWire::clearNative() {
   }
 }
 
+// Initialise device
+void SSD1306AsciiWire::begin(const DevType* dev, uint8_t i2cAddr) {
+  m_i2cAddr = i2cAddr;
+  m_col = 0;
+  m_row = 0;
+  const uint8_t* table = (const uint8_t*)GETFLASHW(&dev->initcmds);
+  uint8_t size = GETFLASH(&dev->initSize);
+  m_displayWidth = GETFLASH(&dev->lcdWidth);
+  m_displayHeight = GETFLASH(&dev->lcdHeight);
+  m_colOffset = GETFLASH(&dev->colOffset);
+  I2CManager.write_P(m_i2cAddr, table, size);
+  if (m_displayHeight == 32) 
+    I2CManager.write(m_i2cAddr, 5, 0, // Set command mode
+      SSD1306_SETMULTIPLEX, 0x1F,     // ratio 32
+      SSD1306_SETCOMPINS, 0x02);      // sequential COM pins, disable remap
+}
+
 //------------------------------------------------------------------------------
 
 // Set cursor position (by text line)
@@ -257,6 +212,82 @@ size_t SSD1306AsciiWire::writeNative(uint8_t ch) {
   return 1;
 }
 
+//==============================================================================
+// this section is based on https://github.com/adafruit/Adafruit_SSD1306
+
+/** Initialization commands for a 128x32 or 128x64 SSD1306 oled display. */
+const uint8_t FLASH SSD1306AsciiWire::Adafruit128xXXinit[] = {
+    // Init sequence for Adafruit 128x32/64 OLED module
+    0x00,                              // Set to command mode
+    SSD1306_DISPLAYOFF,
+    SSD1306_SETDISPLAYCLOCKDIV, 0x80,  // the suggested ratio 0x80 
+    SSD1306_SETMULTIPLEX, 0x3F,        // ratio 64 (initially)
+    SSD1306_SETDISPLAYOFFSET, 0x0,     // no offset
+    SSD1306_SETSTARTLINE | 0x0,        // line #0
+    SSD1306_CHARGEPUMP, 0x14,          // internal vcc
+    SSD1306_MEMORYMODE, 0x02,          // page mode
+    SSD1306_SEGREMAP | 0x1,            // column 127 mapped to SEG0
+    SSD1306_COMSCANDEC,                // column scan direction reversed
+    SSD1306_SETCOMPINS, 0X12,          // set COM pins
+    SSD1306_SETCONTRAST, 0x7F,         // contrast level 127
+    SSD1306_SETPRECHARGE, 0xF1,        // pre-charge period (1, 15)
+    SSD1306_SETVCOMDETECT, 0x40,       // vcomh regulator level
+    SSD1306_DISPLAYALLON_RESUME,
+    SSD1306_NORMALDISPLAY,
+    SSD1306_DISPLAYON
+};
+
+/** Initialize a 128x32 SSD1306 oled display. */
+const DevType FLASH SSD1306AsciiWire::Adafruit128x32 = {
+  Adafruit128xXXinit,
+  sizeof(Adafruit128xXXinit),
+  128,
+  32,
+  0
+};
+
+/** Initialize a 128x64 oled display. */
+const DevType FLASH SSD1306AsciiWire::Adafruit128x64 = {
+  Adafruit128xXXinit,
+  sizeof(Adafruit128xXXinit),
+  128,
+  64,
+  0
+};
+//------------------------------------------------------------------------------
+// This section is based on https://github.com/stanleyhuangyc/MultiLCD
+
+/** Initialization commands for a 128x64 SH1106 oled display. */
+const uint8_t FLASH SSD1306AsciiWire::SH1106_132x64init[] = {
+  0x00,                                  // Set to command mode
+  SSD1306_DISPLAYOFF,
+  SSD1306_SETDISPLAYCLOCKDIV, 0X80,      // set osc division
+  SSD1306_SETMULTIPLEX, 0x3F,            // ratio 64
+  SSD1306_SETDISPLAYOFFSET, 0X00,        // set display offset
+  SSD1306_SETSTARTPAGE | 0X0,            // set page address
+  SSD1306_SETSTARTLINE | 0x0,            // set start line
+  SH1106_SET_PUMP_MODE, SH1106_PUMP_ON,  // set charge pump enable
+  SSD1306_SEGREMAP | 0X1,                // set segment remap
+  SSD1306_COMSCANDEC,                    // Com scan direction
+  SSD1306_SETCOMPINS, 0X12,              // set COM pins
+  SSD1306_SETCONTRAST, 0x80,             // 128
+  SSD1306_SETPRECHARGE, 0X1F,            // set pre-charge period
+  SSD1306_SETVCOMDETECT,  0x40,          // set vcomh
+  SH1106_SET_PUMP_VOLTAGE | 0X2,         // 8.0 volts
+  SSD1306_NORMALDISPLAY,                 // normal / reverse
+  SSD1306_DISPLAYON
+};
+
+/** Initialize a 132x64 oled SH1106 display. */
+const DevType FLASH SSD1306AsciiWire::SH1106_132x64 =  {
+  SH1106_132x64init,
+  sizeof(SH1106_132x64init),
+  128,
+  64,
+  2    // SH1106 is a 132x64 controller but most OLEDs are only attached
+       // to columns 2-129.
+};
+
 
 //------------------------------------------------------------------------------
 

SSD1306Ascii.h

@@ -32,6 +32,21 @@
 //#define NOLOWERCASE
 
 //------------------------------------------------------------------------------
+// Device initialization structure.
+
+struct DevType {
+  /* Pointer to initialization command bytes. */
+  const uint8_t* initcmds;
+  /* Number of initialization bytes */
+  const uint8_t initSize;
+  /* Width of the display in pixels */
+  const uint8_t lcdWidth;
+  /** Height of the display in pixels. */
+  const uint8_t lcdHeight;
+  /* Column offset RAM to display.  Used to pick start column of SH1106. */
+  const uint8_t colOffset;
+};
+
 // Constructor
 class SSD1306AsciiWire : public LCDDisplay {
  public:
@@ -40,17 +55,25 @@ class SSD1306AsciiWire : public LCDDisplay {
   SSD1306AsciiWire(int width, int height);
 
   // Initialize the display controller.
-  void begin(uint8_t i2cAddr);
+  void begin(const DevType* dev, uint8_t i2cAddr);
 
   // Clear the display and set the cursor to (0, 0).
   void clearNative() override;
 
   // Set cursor to start of specified text line
   void setRowNative(byte line) override;
+
+  // Initialize the display controller.
+  void init(const DevType* dev);
   
   // Write one character to OLED
   size_t writeNative(uint8_t c) override;
 
+  // Display characteristics / initialisation
+  static const DevType FLASH Adafruit128x32;
+  static const DevType FLASH Adafruit128x64;
+  static const DevType FLASH SH1106_132x64;
+
   bool isBusy() override { return requestBlock.isBusy(); }
 
  private:

Sensors.cpp

@@ -1,10 +1,8 @@
 /*
- *  © 2021 Neil McKechnie
- *  © 2020-2021 Harald Barth
- *  © 2020-2021 Chris Harlow
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2021, modified by Neil McKechnie. All rights reserved.
  *  
- *  This file is part of CommandStation-EX
+ *  This file is part of Asbelos DCC API
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -69,11 +67,8 @@ decide to ignore the <q ID> return and only react to <Q ID> triggers.
 **********************************************************************/
 
 #include "StringFormatter.h"
-#include "CommandDistributor.h"
 #include "Sensors.h"
-#ifndef DISABLE_EEPROM
 #include "EEStore.h"
-#endif
 #include "IODevice.h"
 
 
@@ -90,7 +85,7 @@ decide to ignore the <q ID> return and only react to <Q ID> triggers.
 // second part of the list is determined from by the 'firstPollSensor' pointer.
 ///////////////////////////////////////////////////////////////////////////////
 
-void Sensor::checkAll(){
+void Sensor::checkAll(Print *stream){
   uint16_t sensorCount = 0;
 
 #ifdef USE_NOTIFY
@@ -108,6 +103,12 @@ void Sensor::checkAll(){
       // Required time elapsed since last read cycle started,
       // so initiate new scan through the sensor list
       readingSensor = firstSensor;
+#ifdef USE_NOTIFY
+      if (firstSensor == firstPollSensor) 
+        pollSignalPhase = true;
+      else
+        pollSignalPhase = false;
+#endif
       lastReadCycle = thisTime;
     }
   }
@@ -116,6 +117,12 @@ void Sensor::checkAll(){
   bool pause = false;
   while (readingSensor != NULL && !pause) {
 
+#ifdef USE_NOTIFY
+    // Check if we have reached the start of the polled portion of the sensor list.
+    if (readingSensor == firstPollSensor)
+      pollSignalPhase = true;
+#endif
+
     // Where the sensor is attached to a pin, read pin status.  For sources such as LCN,
     // which don't have an input pin to read, the LCN class calls setState() to update inputState when
     // a message is received.  The IODevice::read() call returns 1 for active pins (0v) and 0 for inactive (5v).
@@ -123,8 +130,10 @@ void Sensor::checkAll(){
     // routine when an input signal change is detected, and this updates the inputState directly,
     // so these inputs don't need to be polled here.
     VPIN pin = readingSensor->data.pin;
-    if (readingSensor->pollingRequired && pin != VPIN_NONE)
-      readingSensor->inputState = IODevice::read(pin);
+#ifdef USE_NOTIFY
+    if (pollSignalPhase)
+#endif
+      if (pin!=VPIN_NONE) readingSensor->inputState = IODevice::read(pin);
 
     // Check if changed since last time, and process changes.
     if (readingSensor->inputState == readingSensor->active) {
@@ -138,19 +147,31 @@ void Sensor::checkAll(){
       readingSensor->active = readingSensor->inputState;
       readingSensor->latchDelay = minReadCount;  // Reset counter
       
-      CommandDistributor::broadcastSensor(readingSensor->data.snum,readingSensor->active);
-      pause = true;  // Don't check any more sensors on this entry
+      if (stream != NULL) {
+        StringFormatter::send(stream, F("<%c %d>\n"), readingSensor->active ? 'Q' : 'q', readingSensor->data.snum);
+        pause = true;  // Don't check any more sensors on this entry
+      }
     }
 
     // Move to next sensor in list.
     readingSensor = readingSensor->nextSensor;
 
-    // Currently process max of 16 sensors per entry.
-    // Performance measurements taken during development indicate that, with 128 sensors configured
-    // on 8x 16-pin MCP23017 GPIO expanders with polling (no change notification), all inputs can be read from the devices
-    // within 1.4ms (400Mhz I2C bus speed), and a full cycle of checking 128 sensors for changes takes under a millisecond.
+    // Currently process max of 16 sensors per entry for polled sensors, and
+    //  16 per entry for sensors notified by callback.
+    // Performance measurements taken during development indicate that, with 64 sensors configured
+    // on 8x 8-pin PCF8574 GPIO expanders, all inputs can be read within 1.4ms (400Mhz I2C bus speed), and a
+    // full cycle of scanning 64 sensors for changes takes between 1.9 and 3.2 milliseconds.
     sensorCount++;
-    if (sensorCount >= 16) pause = true;
+#ifdef USE_NOTIFY
+    if (pollSignalPhase) {
+#endif
+      if (sensorCount >= 16) pause = true;
+#ifdef USE_NOTIFY
+    } else 
+    {
+      if (sensorCount >= 16) pause = true;
+    }
+#endif
   }
 
 } // Sensor::checkAll
@@ -202,18 +223,23 @@ Sensor *Sensor::create(int snum, VPIN pin, int pullUp){
   tt = (Sensor *)calloc(1,sizeof(Sensor));
   if (!tt) return tt;     // memory allocation failure
 
-  if (pin == VPIN_NONE) 
-    tt->pollingRequired = false;
-  #ifdef USE_NOTIFY
-  else if (IODevice::hasCallback(pin)) 
-    tt->pollingRequired = false;
-  #endif
-  else 
-    tt->pollingRequired = true;
-
-  // Add to the start of the list
+#ifdef USE_NOTIFY
+  if (pin == VPIN_NONE || IODevice::hasCallback(pin)) {
+    // Callback available, or no pin to read, so link sensor on to the start of the list
+    tt->nextSensor = firstSensor;
+    firstSensor = tt;
+    if (lastSensor == NULL) lastSensor = tt;  // This is only item in list.
+  } else {
+    // No callback, so add to end of list so it's polled.
+    if (lastSensor != NULL) lastSensor->nextSensor = tt;
+    lastSensor = tt;
+    if (!firstSensor) firstSensor = tt;
+    if (!firstPollSensor) firstPollSensor = tt;
+  }
+#else
   tt->nextSensor = firstSensor;
   firstSensor = tt;
+#endif
 
   tt->data.snum = snum;
   tt->data.pin = pin;
@@ -222,8 +248,9 @@ Sensor *Sensor::create(int snum, VPIN pin, int pullUp){
   tt->inputState = 0;
   tt->latchDelay = minReadCount;
 
+  int params[] = {pullUp};
   if (pin != VPIN_NONE) 
-    IODevice::configureInput(pin, pullUp);   
+    IODevice::configure(pin, IODevice::CONFIGURE_INPUT, 1, params);   
     // Generally, internal pull-up resistors are not, on their own, sufficient 
     // for external infrared sensors --- each sensor must have its own 1K external pull-up resistor
 
@@ -278,13 +305,12 @@ bool Sensor::remove(int n){
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-#ifndef DISABLE_EEPROM
+
 void Sensor::load(){
   struct SensorData data;
   Sensor *tt;
 
-  uint16_t i=EEStore::eeStore->data.nSensors;
-  while(i--){
+  for(uint16_t i=0;i<EEStore::eeStore->data.nSensors;i++){
     EEPROM.get(EEStore::pointer(),data);
     tt=create(data.snum, data.pin, data.pullUp);
     EEStore::advance(sizeof(tt->data));
@@ -306,7 +332,7 @@ void Sensor::store(){
     EEStore::eeStore->data.nSensors++;
   }
 }
-#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 
 Sensor *Sensor::firstSensor=NULL;
@@ -316,5 +342,6 @@ unsigned long Sensor::lastReadCycle=0;
 #ifdef USE_NOTIFY
 Sensor *Sensor::firstPollSensor = NULL;
 Sensor *Sensor::lastSensor = NULL;
+bool Sensor::pollSignalPhase = false;
 bool Sensor::inputChangeCallbackRegistered = false;
-#endif
+#endif

Sensors.h

@@ -1,8 +1,5 @@
 /*
- *  © 2021 Neil McKechnie
- *  © 2020-2021 Harald Barth
- *  © 2020-2021 Chris Harlow
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
  *  
  *  This file is part of Asbelos DCC API
  *
@@ -48,6 +45,14 @@ struct SensorData {
 class Sensor{
   // The sensor list is a linked list where each sensor's 'nextSensor' field points to the next.
   //   The pointer is null in the last on the list.
+  //   To partition the sensor into those sensors which require polling through cyclic calls
+  //   to 'IODevice::read(vpin)', and those which support callback on change, 'firstSensor' 
+  //   points to the start of the overall list, and 'lastSensor' points to the end of the list
+  //   (the last sensor object). This structure allows sensors to be added to the start or the
+  //   end of the list easily.  So if an input pin supports change notification, it is placed at the 
+  //   end of the list.  If not, it is placed at the beginning.  And the pointer 'firstPollSensor' 
+  //   is set to the first of the sensor objects that requires scanning.  Thus, we can iterate
+  //   through the whole list, or just through the part that requires scanning.
 
 public:
   SensorData data;
@@ -69,16 +74,13 @@ public:
   // Constructor
   Sensor(); 
   Sensor *nextSensor;
-
   void setState(int state);
-#ifndef DISABLE_EEPROM
   static void load();
   static void store();
-#endif
   static Sensor *create(int id, VPIN vpin, int pullUp);
   static Sensor* get(int id);  
   static bool remove(int id);  
-  static void checkAll();
+  static void checkAll(Print *stream);
   static void printAll(Print *stream);
   static unsigned long lastReadCycle; // value of micros at start of last read cycle
   static const unsigned int cycleInterval = 10000; // min time between consecutive reads of each sensor in microsecs.
@@ -86,9 +88,9 @@ public:
   static const unsigned int minReadCount = 1; // number of additional scans before acting on change
                                         // E.g. 1 means that a change is ignored for one scan and actioned on the next.
                                         // Max value is 63
-  bool pollingRequired = true;
 
 #ifdef USE_NOTIFY
+  static bool pollSignalPhase;
   static void inputChangeCallback(VPIN vpin, int state);
   static bool inputChangeCallbackRegistered;
 #endif

SerialManager.cpp

@@ -1,110 +0,0 @@
- /*
- *  © 2022 Paul M Antoine
- *  © 2021 Chris Harlow
- *  © 2022 Harald Barth
- *  All rights reserved.
- *  
- *  This file is part of DCC++EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "SerialManager.h"
-#include "DCCEXParser.h"
-#include "StringFormatter.h"
-
-#ifdef ARDUINO_ARCH_ESP32
-#ifdef SERIAL_BT_COMMANDS
-#include <BluetoothSerial.h>
-//#include <BleSerial.h>
-#if !defined(CONFIG_BT_ENABLED) || !defined(CONFIG_BLUEDROID_ENABLED)
-#error No Bluetooth library available
-#endif //ENABLED
-BluetoothSerial SerialBT;
-//BleSerial SerialBT;
-#endif //COMMANDS
-#endif //ESP32
-
-SerialManager * SerialManager::first=NULL;
-
-SerialManager::SerialManager(Stream * myserial) {
-  serial=myserial;
-  next=first;
-  first=this;
-  bufferLength=0;
-  inCommandPayload=false; 
-} 
-
-void SerialManager::init() {
-  USB_SERIAL.begin(115200);
-  while (!USB_SERIAL && millis() < 5000); // wait max 5s for Serial to start
-  new SerialManager(&USB_SERIAL);
-  
-#ifdef SERIAL3_COMMANDS
-  Serial3.begin(115200);
-  new SerialManager(&Serial3);
-#endif
-#ifdef SERIAL2_COMMANDS
-  Serial2.begin(115200);
-  new SerialManager(&Serial2);
-#endif
-#ifdef SERIAL1_COMMANDS
-  Serial1.begin(115200);
-  new SerialManager(&Serial1);
-#endif
-#ifdef SERIAL_BT_COMMANDS
-  {
-    //SerialBT.setPin("6666"); // choose other pin
-    uint64_t chipid = ESP.getEfuseMac();
-    char idstr[16] = {0};
-    snprintf(idstr, 15, "DCCEX-%08X",
-	     __builtin_bswap32((uint32_t)(chipid>>16)));
-    SerialBT.begin(idstr);
-    new SerialManager(&SerialBT);
-    delay(1000);
-  }
-#endif
-}
-
-void SerialManager::broadcast(char * stringBuffer) {
-    for (SerialManager * s=first;s;s=s->next) s->broadcast2(stringBuffer);
-}
-void SerialManager::broadcast2(char * stringBuffer) {
-    serial->print(stringBuffer);
-}
-
-void SerialManager::loop() {
-    for (SerialManager * s=first;s;s=s->next) s->loop2();
-}
-
-void SerialManager::loop2() {
-    while (serial->available()) {
-        char ch = serial->read();
-        if (ch == '<') {
-            inCommandPayload = true;
-            bufferLength = 0;
-            buffer[0] = '\0';
-        }
-        else if (ch == '>') {
-            buffer[bufferLength] = '\0';
-            DCCEXParser::parse(serial, buffer, NULL); 
-            inCommandPayload = false;
-            break;
-        }
-        else if (inCommandPayload) {
-            if (bufferLength <  (COMMAND_BUFFER_SIZE-1)) buffer[bufferLength++] = ch;
-        }
-    }
-    
-}

SerialManager.h

@@ -1,49 +0,0 @@
- /*
- *  © 2021 Chris Harlow
- *  All rights reserved.
- *  
- *  This file is part of DCC++EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef SerialManager_h
-#define SerialManager_h
-
-#include "Arduino.h"
-#include "defines.h"
-
-
-#ifndef COMMAND_BUFFER_SIZE
- #define COMMAND_BUFFER_SIZE 100
-#endif
-
-class SerialManager {
-public:
-  static void init();
-  static void loop();
-  static void broadcast(char * stringBuffer);
-  
-private:  
-  static SerialManager * first;
-  SerialManager(Stream * myserial);
-  void loop2();
-  void broadcast2(char * stringBuffer);
-  Stream * serial;
-  SerialManager * next;
-  byte bufferLength;
-  byte buffer[COMMAND_BUFFER_SIZE]; 
-  bool inCommandPayload;
-};
-#endif

StringBuffer.cpp

@@ -1,45 +0,0 @@
-/*
- *  © 2022 Chris Harlow
- *  All rights reserved.
- *  
- *  This file is part of DCC-EX CommandStation-EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "StringBuffer.h"
-#include "DIAG.h"
-
-StringBuffer::StringBuffer() {
-    flush();
-};
-
-char * StringBuffer::getString() { 
-   return _buffer;
-}
-
-void StringBuffer::flush() {
-    _pos_write=0;
-    _buffer[0]='\0';
-}
-
-size_t StringBuffer::write(uint8_t b) {
-  if (_pos_write>=buffer_max) return 0;
-  _buffer[_pos_write] = b;
-  ++_pos_write;
-  _buffer[_pos_write]='\0';
-  return 1;
-}
-
-

StringBuffer.h

@@ -1,38 +0,0 @@
- /*
- *  © 2022 Chris Harlow
- *  All rights reserved.
- *  
- *  This file is part of DCC++EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef StringBuffer_h
-#define StringBuffer_h
-#include <Arduino.h>
-
-class StringBuffer : public Print {
-  public:
-    StringBuffer(); 
-    // Override Print default
-    virtual size_t write(uint8_t b);
-    void flush();
-    char * getString();
-  private:
-    static const int  buffer_max=64; // enough for long text msgs to throttles  
-    int16_t _pos_write;
-    char _buffer[buffer_max+1];
-};
-
-#endif

StringFormatter.cpp

@@ -18,6 +18,15 @@
  */
 #include "StringFormatter.h"
 #include <stdarg.h>
+
+#if defined(ARDUINO_ARCH_SAMD)
+   // Some processors use a gcc compiler that renames va_list!!!
+  #include <cstdarg>
+  Print * StringFormatter::diagSerial= &SerialUSB; 
+#else
+  Print * StringFormatter::diagSerial=&Serial;
+#endif
+
 #include "LCDDisplay.h"
 
 bool Diag::ACK=false;
@@ -29,21 +38,22 @@ bool Diag::LCN=false;
 
  
 void StringFormatter::diag( const FSH* input...) {
- USB_SERIAL.print(F("<* "));   
+  if (!diagSerial) return; 
+  diagSerial->print(F("<* "));   
   va_list args;
   va_start(args, input);
-  send2(&USB_SERIAL,input,args);
-  USB_SERIAL.print(F(" *>\n"));
+  send2(diagSerial,input,args);
+  diagSerial->print(F(" *>\n"));
 }
 
 void StringFormatter::lcd(byte row, const FSH* input...) {
   va_list args;
 
   // Issue the LCD as a diag first
-  send(&USB_SERIAL,F("<* LCD%d:"),row);
+  send(diagSerial,F("<* LCD%d:"),row);
   va_start(args, input);
-  send2(&USB_SERIAL,input,args);
-  send(&USB_SERIAL,F(" *>\n"));
+  send2(diagSerial,input,args);
+  send(diagSerial,F(" *>\n"));
   
   if (!LCDDisplay::lcdDisplay) return;
   LCDDisplay::lcdDisplay->setRow(row);    
@@ -87,32 +97,13 @@ void StringFormatter::send2(Print * stream,const FSH* format, va_list args) {
       case 's': stream->print(va_arg(args, char*)); break;
       case 'e': printEscapes(stream,va_arg(args, char*)); break;
       case 'E': printEscapes(stream,(const FSH*)va_arg(args, char*)); break;
-      case 'S':
-      { 
-        const FSH*  flash= (const FSH*)va_arg(args, char*);
-
-#ifndef ARDUINO_ARCH_ESP32
-	// On ESP32 the reading flashstring from rinstream code
-	// crashes, so don't use the flashstream hack on ESP32
-#if WIFI_ON | ETHERNET_ON
-        // RingStream has special logic to handle flash strings
-        // but is not implemented unless wifi or ethernet are enabled.
-        // The define prevents RingStream code being added unnecessariliy.        
-        if (stream->availableForWrite()==RingStream::THIS_IS_A_RINGSTREAM)
-              ((RingStream *)stream)->printFlash(flash);
-              else 
-#endif
-#endif
-        stream->print(flash);
-        break;
-             }
+      case 'S': stream->print((const FSH*)va_arg(args, char*)); break;
       case 'd': printPadded(stream,va_arg(args, int), formatWidth, formatLeft); break;
-      case 'u': printPadded(stream,va_arg(args, unsigned int), formatWidth, formatLeft); break;
       case 'l': printPadded(stream,va_arg(args, long), formatWidth, formatLeft); break;
       case 'b': stream->print(va_arg(args, int), BIN); break;
       case 'o': stream->print(va_arg(args, int), OCT); break;
       case 'x': stream->print(va_arg(args, int), HEX); break;
-      //case 'f': stream->print(va_arg(args, double), 2); break;
+      case 'f': stream->print(va_arg(args, double), 2); break;
       //format width prefix
       case '-': 
             formatLeft=true;
@@ -158,7 +149,7 @@ void StringFormatter::printEscapes(Print * stream, const FSH * input) {
 }
 
 void StringFormatter::printEscape( char c) {
-  printEscape(&USB_SERIAL,c);
+  printEscape(diagSerial,c);
 }
 
 void StringFormatter::printEscape(Print * stream, char c) {

StringFormatter.h

@@ -20,7 +20,11 @@
 #define StringFormatter_h
 #include <Arduino.h>
 #include "FSH.h"
-#include "RingStream.h"
+#if defined(ARDUINO_ARCH_SAMD)
+   // Some processors use a gcc compiler that renames va_list!!!
+  #include <cstdarg>  
+#endif
+
 #include "LCDDisplay.h"
 class Diag {
   public:
@@ -44,6 +48,7 @@ class StringFormatter
     static void printEscape(Print * serial, char c);
 
     // DIAG support
+    static Print * diagSerial;
     static void diag( const FSH* input...);
     static void lcd(byte row, const FSH* input...);
     static void printEscapes(char * input);

TrackManager.cpp

@@ -1,411 +0,0 @@
-/*
- *  © 2022 Chris Harlow
- *  © 2022 Harald Barth
- *  All rights reserved.
- *  
- *  This file is part of DCC++EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-#include "TrackManager.h"
-#include "FSH.h"
-#include "DCCWaveform.h"
-#include "DCC.h"
-#include "MotorDriver.h"
-#include "DCCTimer.h"
-#include "DIAG.h"
-// Virtualised Motor shield multi-track hardware Interface
-#define FOR_EACH_TRACK(t) for (byte t=0;t<=lastTrack;t++)
-    
-#define APPLY_BY_MODE(findmode,function) \
-        FOR_EACH_TRACK(t) \
-            if (trackMode[t]==findmode) \
-                track[t]->function;
-
-const int16_t HASH_KEYWORD_PROG = -29718;
-const int16_t HASH_KEYWORD_MAIN = 11339;
-const int16_t HASH_KEYWORD_OFF = 22479;  
-const int16_t HASH_KEYWORD_DC = 2183;  
-const int16_t HASH_KEYWORD_DCX = 6463; // DC reversed polarity 
-const int16_t HASH_KEYWORD_EXT = 8201; // External DCC signal
-const int16_t HASH_KEYWORD_A = 65; // parser makes single chars the ascii.   
-
-MotorDriver * TrackManager::track[MAX_TRACKS];
-TRACK_MODE TrackManager::trackMode[MAX_TRACKS];
-int16_t TrackManager::trackDCAddr[MAX_TRACKS];
-
-POWERMODE TrackManager::mainPowerGuess=POWERMODE::OFF;
-byte TrackManager::lastTrack=0;
-bool TrackManager::progTrackSyncMain=false; 
-bool TrackManager::progTrackBoosted=false; 
-int16_t TrackManager::joinRelay=UNUSED_PIN;
-#ifdef ARDUINO_ARCH_ESP32
-byte TrackManager::tempProgTrack=MAX_TRACKS+1;
-#endif
-
-
-// The setup call is done this way so that the tracks can be in a list 
-// from the config... the tracks default to NULL in the declaration                 
-void TrackManager::Setup(const FSH * shieldname,
-        MotorDriver * track0, MotorDriver * track1, MotorDriver * track2,
-        MotorDriver * track3, MotorDriver * track4,  MotorDriver * track5,
-        MotorDriver * track6, MotorDriver * track7 ) {       
-    addTrack(0,track0);
-    addTrack(1,track1);
-    addTrack(2,track2);
-    addTrack(3,track3);
-    addTrack(4,track4);
-    addTrack(5,track5);
-    addTrack(6,track6);
-    addTrack(7,track7);
-    
-    // Default the first 2 tracks (which may be null) and perform HA waveform check.
-    setTrackMode(0,TRACK_MODE_MAIN);
-    setTrackMode(1,TRACK_MODE_PROG);
-  
-  // TODO Fault pin config for odd motor boards (example pololu)
-  // MotorDriver::commonFaultPin = ((mainDriver->getFaultPin() == progDriver->getFaultPin())
-  //				 && (mainDriver->getFaultPin() != UNUSED_PIN));
-  DCC::begin(shieldname);   
-}
-
-void TrackManager::addTrack(byte t, MotorDriver* driver) {
-     trackMode[t]=TRACK_MODE_OFF;
-     track[t]=driver;
-     if (driver) {
-         track[t]->setPower(POWERMODE::OFF);
-         lastTrack=t;
-     } 
-}
-
-// setDCCSignal(), called from interrupt context
-// does assume ports are shadowed if they can be
-void TrackManager::setDCCSignal( bool on) {
-  HAVE_PORTA(shadowPORTA=PORTA);
-  HAVE_PORTB(shadowPORTB=PORTB);
-  HAVE_PORTC(shadowPORTC=PORTC);
-  APPLY_BY_MODE(TRACK_MODE_MAIN,setSignal(on));
-  HAVE_PORTA(PORTA=shadowPORTA);
-  HAVE_PORTB(PORTB=shadowPORTB);
-  HAVE_PORTC(PORTC=shadowPORTC);
-}
-
-void TrackManager::setCutout( bool on) {
-    (void) on;
-    // TODO Cutout needs fake ports as well
-    // TODO      APPLY_BY_MODE(TRACK_MODE_MAIN,setCutout(on));
-}
-
-// setPROGSignal(), called from interrupt context
-// does assume ports are shadowed if they can be
-void TrackManager::setPROGSignal( bool on) {
-  HAVE_PORTA(shadowPORTA=PORTA);
-  HAVE_PORTB(shadowPORTB=PORTB);
-  HAVE_PORTC(shadowPORTC=PORTC);
-  APPLY_BY_MODE(TRACK_MODE_PROG,setSignal(on));
-  HAVE_PORTA(PORTA=shadowPORTA);
-  HAVE_PORTB(PORTB=shadowPORTB);
-  HAVE_PORTC(PORTC=shadowPORTC);
-}
-
-// setDCSignal(), called from normal context
-// MotorDriver::setDCSignal handles shadowed IO port changes.
-// with interrupts turned off around the critical section
-void TrackManager::setDCSignal(int16_t cab, byte speedbyte) {
-  FOR_EACH_TRACK(t) {
-    if (trackDCAddr[t]!=cab) continue;
-    if (trackMode[t]==TRACK_MODE_DC) track[t]->setDCSignal(speedbyte);
-    else if (trackMode[t]==TRACK_MODE_DCX) track[t]->setDCSignal(speedbyte ^ 128);
-  }
-}    
-
-bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr) {
-    if (trackToSet>lastTrack || track[trackToSet]==NULL) return false;
-
-    //DIAG(F("Track=%c"),trackToSet+'A');
-    // DC tracks require a motorDriver that can set brake!
-    if ((mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX)
-         && !track[trackToSet]->brakeCanPWM()) {
-             DIAG(F("Brake pin can't PWM: No DC"));
-             return false; 
-         }
-
-#ifdef ARDUINO_ARCH_ESP32
-    // remove pin from MUX matrix and turn it off
-    pinpair p = track[trackToSet]->getSignalPin();
-    //DIAG(F("Track=%c remove  pin %d"),trackToSet+'A', p.pin);
-    gpio_reset_pin((gpio_num_t)p.pin);
-    pinMode(p.pin, OUTPUT); // gpio_reset_pin may reset to input
-    if (p.invpin != UNUSED_PIN) {
-      //DIAG(F("Track=%c remove ^pin %d"),trackToSet+'A', p.invpin);
-      gpio_reset_pin((gpio_num_t)p.invpin);
-      pinMode(p.invpin, OUTPUT); // gpio_reset_pin may reset to input
-    }
-#endif
-    if (mode==TRACK_MODE_PROG) {
-      // only allow 1 track to be prog
-      FOR_EACH_TRACK(t)
-	if (trackMode[t]==TRACK_MODE_PROG && t != trackToSet) {
-	  track[t]->setPower(POWERMODE::OFF);
-	  trackMode[t]=TRACK_MODE_OFF;
-	  track[t]->makeProgTrack(false);     // revoke prog track special handling
-	}
-      track[trackToSet]->makeProgTrack(true); // set for prog track special handling
-    } else {
-      track[trackToSet]->makeProgTrack(false); // only the prog track knows it's type
-    }
-    trackMode[trackToSet]=mode;
-    trackDCAddr[trackToSet]=dcAddr;
-    
-    // When a track is switched, we must clear any side effects of its previous 
-    // state, otherwise trains run away or just dont move.
-
-    // This can be done BEFORE the PWM-Timer evaluation (methinks)
-    if (!(mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX)) {
-      // DCC tracks need to have set the PWM to zero or they will not work.
-      track[trackToSet]->detachDCSignal();
-      track[trackToSet]->setBrake(false);
-    }
-
-    // EXT is a special case where the signal pin is
-    // turned off. So unless that is set, the signal
-    // pin should be turned on
-    track[trackToSet]->enableSignal(mode != TRACK_MODE_EXT);
-
-#ifndef ARDUINO_ARCH_ESP32
-    // re-evaluate HighAccuracy mode
-    // We can only do this is all main and prog tracks agree
-    bool canDo=true;
-    FOR_EACH_TRACK(t) {
-      // DC tracks must not have the DCC PWM switched on
-      // so we globally turn it off if one of the PWM
-      // capable tracks is now DC or DCX.
-      if (trackMode[t]==TRACK_MODE_DC || trackMode[t]==TRACK_MODE_DCX) {
-	if (track[t]->isPWMCapable()) {
-	  canDo=false;    // this track is capable but can not run PWM
-	  break;          // in this mode, so abort and prevent globally below
-	} else {
-	  track[t]->trackPWM=false; // this track sure can not run with PWM
-	  //DIAG(F("Track %c trackPWM 0 (not capable)"), t+'A');
-	}
-      } else if (trackMode[t]==TRACK_MODE_MAIN || trackMode[t]==TRACK_MODE_PROG) {
-	track[t]->trackPWM = track[t]->isPWMCapable(); // trackPWM is still a guess here
-	//DIAG(F("Track %c trackPWM %d"), t+'A', track[t]->trackPWM);
-	canDo &= track[t]->trackPWM;
-      }
-    }
-    if (!canDo) {
-      // if we discover that HA mode was globally impossible
-      // we must adjust the trackPWM capabilities
-      FOR_EACH_TRACK(t) {
-	track[t]->trackPWM=false;
-	//DIAG(F("Track %c trackPWM 0 (global override)"), t+'A');
-      }
-      DCCTimer::clearPWM(); // has to be AFTER trackPWM changes because if trackPWM==true this is undone for  that track
-    }
-#else
-    // For ESP32 we just reinitialize the DCC Waveform
-    DCCWaveform::begin();
-#endif
-
-    // This block must be AFTER the PWM-Timer modifications
-    if (mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX) {
-        // DC tracks need to be given speed of the throttle for that cab address
-        // otherwise will not match other tracks on same cab.
-        // This also needs to allow for inverted DCX
-        applyDCSpeed(trackToSet);
-    }
-
-    // Normal running tracks are set to the global power state 
-    track[trackToSet]->setPower(
-        (mode==TRACK_MODE_MAIN || mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX || mode==TRACK_MODE_EXT) ?
-        mainPowerGuess : POWERMODE::OFF);
-    //DIAG(F("TrackMode=%d"),mode);
-    return true; 
-}
-
-void TrackManager::applyDCSpeed(byte t) {
-  uint8_t speedByte=DCC::getThrottleSpeedByte(trackDCAddr[t]);
-  if (trackMode[t]==TRACK_MODE_DCX)
-    speedByte = speedByte ^ 128; // reverse direction bit
-  track[t]->setDCSignal(speedByte);
-}
-
-bool TrackManager::parseJ(Print *stream, int16_t params, int16_t p[])
-{
-    
-    if (params==0) { // <=>  List track assignments
-        FOR_EACH_TRACK(t)
-            if (track[t]!=NULL) {
-                StringFormatter::send(stream,F("<= %c "),'A'+t);
-                switch(trackMode[t]) {
-                    case TRACK_MODE_MAIN:
-                        StringFormatter::send(stream,F("MAIN"));
-			if (track[t]->trackPWM)
-			  StringFormatter::send(stream,F("+"));
-                        break;
-                    case TRACK_MODE_PROG:
-                        StringFormatter::send(stream,F("PROG"));
-			if (track[t]->trackPWM)
-			  StringFormatter::send(stream,F("+"));
-                        break;
-                    case TRACK_MODE_OFF:
-                        StringFormatter::send(stream,F("OFF"));
-                        break;
-                    case TRACK_MODE_EXT:
-                        StringFormatter::send(stream,F("EXT"));
-                        break;
-                    case TRACK_MODE_DC:
-                        StringFormatter::send(stream,F("DC %d"),trackDCAddr[t]);
-                        break;
-                    case TRACK_MODE_DCX:
-                        StringFormatter::send(stream,F("DCX %d"),trackDCAddr[t]);
-                        break;
-                    default:
-                        break; // unknown, dont care    
-                    }
-                StringFormatter::send(stream,F(">\n"));
-                }
-        return true;
-    }
-    
-    p[0]-=HASH_KEYWORD_A;  // convert A... to 0.... 
-
-    if (params>1 && (p[0]<0 || p[0]>=MAX_TRACKS)) 
-        return false;
-    
-    if (params==2  && p[1]==HASH_KEYWORD_MAIN) // <= id MAIN>
-        return setTrackMode(p[0],TRACK_MODE_MAIN);
-    
-    if (params==2  && p[1]==HASH_KEYWORD_PROG) // <= id PROG>
-        return setTrackMode(p[0],TRACK_MODE_PROG);
-    
-    if (params==2  && p[1]==HASH_KEYWORD_OFF) // <= id OFF>
-        return setTrackMode(p[0],TRACK_MODE_OFF);
-
-    if (params==2  && p[1]==HASH_KEYWORD_EXT) // <= id EXT>
-        return setTrackMode(p[0],TRACK_MODE_EXT);
-
-    if (params==3  && p[1]==HASH_KEYWORD_DC && p[2]>0) // <= id DC cab>
-        return setTrackMode(p[0],TRACK_MODE_DC,p[2]);
-    
-    if (params==3  && p[1]==HASH_KEYWORD_DCX && p[2]>0) // <= id DCX cab>
-        return setTrackMode(p[0],TRACK_MODE_DCX,p[2]);
-
-    return false;
-}
-
-byte TrackManager::nextCycleTrack=MAX_TRACKS;
-
-void TrackManager::loop() {
-    DCCWaveform::loop(); 
-    DCCACK::loop(); 
-    bool dontLimitProg=DCCACK::isActive() || progTrackSyncMain || progTrackBoosted;
-    nextCycleTrack++;
-    if (nextCycleTrack>lastTrack) nextCycleTrack=0;
-    if (track[nextCycleTrack]==NULL) return;
-    MotorDriver * motorDriver=track[nextCycleTrack];
-    bool useProgLimit=dontLimitProg? false: trackMode[nextCycleTrack]==TRACK_MODE_PROG;
-    motorDriver->checkPowerOverload(useProgLimit, nextCycleTrack);   
-}
-
-MotorDriver * TrackManager::getProgDriver() {
-    FOR_EACH_TRACK(t)
-        if (trackMode[t]==TRACK_MODE_PROG) return track[t];
-    return NULL;
-} 
-
-#ifdef ARDUINO_ARCH_ESP32
-std::vector<MotorDriver *>TrackManager::getMainDrivers() {
-  std::vector<MotorDriver *>  v;
-  FOR_EACH_TRACK(t)
-    if (trackMode[t]==TRACK_MODE_MAIN) v.push_back(track[t]);
-  return v;
-}
-#endif
-
-void TrackManager::setPower2(bool setProg,POWERMODE mode) {
-    if (!setProg) mainPowerGuess=mode; 
-    FOR_EACH_TRACK(t) {
-        MotorDriver * driver=track[t]; 
-        if (!driver) continue; 
-        switch (trackMode[t]) {
-            case TRACK_MODE_MAIN:
-                if (setProg) break; 
-                // toggle brake before turning power on - resets overcurrent error
-                // on the Pololu board if brake is wired to ^D2.
-		// XXX see if we can make this conditional
-                driver->setBrake(true);
-                driver->setBrake(false); // DCC runs with brake off
-                driver->setPower(mode);  
-                break; 
-            case TRACK_MODE_DC:
-            case TRACK_MODE_DCX:
-                if (setProg) break; 
-                driver->setBrake(true); // DC starts with brake on
-                applyDCSpeed(t);        // speed match DCC throttles
-                driver->setPower(mode);
-                break;  
-            case TRACK_MODE_PROG:
-                if (!setProg) break; 
-                driver->setBrake(true);
-                driver->setBrake(false);
-                driver->setPower(mode);
-                break;  
-            case TRACK_MODE_EXT:
-	        driver->setBrake(true);
-	        driver->setBrake(false);
-		driver->setPower(mode);
-	        break;
-            case TRACK_MODE_OFF:
-                break;
-        }
-    }
-}
-  
-POWERMODE TrackManager::getProgPower() {
-    FOR_EACH_TRACK(t)
-        if (trackMode[t]==TRACK_MODE_PROG) 
-                return track[t]->getPower();
-    return POWERMODE::OFF;   
-  }
-   
-void TrackManager::setJoinRelayPin(byte joinRelayPin) {
-  joinRelay=joinRelayPin;
-  if (joinRelay!=UNUSED_PIN) {
-    pinMode(joinRelay,OUTPUT);
-    digitalWrite(joinRelay,LOW);  // LOW is relay disengaged
-  }
-}
-
-void TrackManager::setJoin(bool joined) {
-#ifdef ARDUINO_ARCH_ESP32
-  if (joined) {
-    FOR_EACH_TRACK(t) {
-      if (trackMode[t]==TRACK_MODE_PROG) {
-	tempProgTrack = t;
-	setTrackMode(t, TRACK_MODE_MAIN);
-	break;
-      }
-    }
-  } else {
-    if (tempProgTrack != MAX_TRACKS+1) {
-      setTrackMode(tempProgTrack, TRACK_MODE_PROG);
-      tempProgTrack = MAX_TRACKS+1;
-    }
-  }
-#endif
-  progTrackSyncMain=joined;
-  if (joinRelay!=UNUSED_PIN) digitalWrite(joinRelay,joined?HIGH:LOW);
-}

TrackManager.h

@@ -1,98 +0,0 @@
-/*
- *  © 2022 Chris Harlow
- *  © 2022 Harald Barth
- *  All rights reserved.
- *  
- *  This file is part of CommandStation-EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-#ifdef ARDUINO_ARCH_ESP32
-#include <vector>
-#endif
-#ifndef TrackManager_h
-#define TrackManager_h
-#include "FSH.h"
-#include "MotorDriver.h"
-// Virtualised Motor shield multi-track hardware Interface
-
-enum TRACK_MODE : byte {TRACK_MODE_OFF, TRACK_MODE_MAIN, TRACK_MODE_PROG,
-                        TRACK_MODE_DC, TRACK_MODE_DCX, TRACK_MODE_EXT};
-
-// These constants help EXRAIL macros say SET_TRACK(2,mode) OR SET_TRACK(C,mode) etc.
-const byte TRACK_NUMBER_0=0, TRACK_NUMBER_A=0;    
-const byte TRACK_NUMBER_1=1, TRACK_NUMBER_B=1;    
-const byte TRACK_NUMBER_2=2, TRACK_NUMBER_C=2;    
-const byte TRACK_NUMBER_3=3, TRACK_NUMBER_D=3;    
-const byte TRACK_NUMBER_4=4, TRACK_NUMBER_E=4;    
-const byte TRACK_NUMBER_5=5, TRACK_NUMBER_F=5;    
-const byte TRACK_NUMBER_6=6, TRACK_NUMBER_G=6;    
-const byte TRACK_NUMBER_7=7, TRACK_NUMBER_H=7;    
-
-class TrackManager {
-  public:
-    static void Setup(const FSH * shieldName,
-                MotorDriver * track0,
-                 MotorDriver * track1=NULL,
-                 MotorDriver * track2=NULL,
-                 MotorDriver * track3=NULL,
-                 MotorDriver * track4=NULL,
-                 MotorDriver * track5=NULL,
-                 MotorDriver * track6=NULL,
-                 MotorDriver * track7=NULL
-                 );
-    
-    static void setDCCSignal( bool on);
-    static void setCutout( bool on);
-    static void setPROGSignal( bool on);
-    static void setDCSignal(int16_t cab, byte speedbyte);
-    static MotorDriver * getProgDriver();
-#ifdef ARDUINO_ARCH_ESP32
-  static std::vector<MotorDriver *>getMainDrivers();
-#endif
-    static void setPower2(bool progTrack,POWERMODE mode);
-    static void setPower(POWERMODE mode) {setMainPower(mode); setProgPower(mode);}
-    static void setMainPower(POWERMODE mode) {setPower2(false,mode);}
-    static void setProgPower(POWERMODE mode) {setPower2(true,mode);}
-
-    static const int16_t MAX_TRACKS=8;
-    static bool setTrackMode(byte track, TRACK_MODE mode, int16_t DCaddr=0);
-    static bool parseJ(Print * stream,  int16_t params, int16_t p[]);
-    static void loop();
-    static POWERMODE getMainPower() {return mainPowerGuess;}
-    static POWERMODE getProgPower();
-    static void setJoin(bool join);
-    static bool isJoined() { return progTrackSyncMain;}
-    static void setJoinRelayPin(byte joinRelayPin);
-    static int16_t joinRelay;
-    static bool progTrackSyncMain;  // true when prog track is a siding switched to main
-     static bool progTrackBoosted;   // true when prog track is not current limited
-   
-    
-  private:
-    static void addTrack(byte t, MotorDriver* driver);
-    static byte lastTrack;
-    static byte nextCycleTrack;
-    static POWERMODE mainPowerGuess;
-    static void applyDCSpeed(byte t);
-
-    static MotorDriver* track[MAX_TRACKS];
-    static TRACK_MODE trackMode[MAX_TRACKS]; 
-    static int16_t trackDCAddr[MAX_TRACKS];  // dc address if TRACK_MODE_DC or TRACK_MODE_DCX
-#ifdef ARDUINO_ARCH_ESP32
-    static byte tempProgTrack; // holds the prog track number during join
-#endif
-    };
-
-#endif

Turnouts.cpp

@@ -1,13 +1,9 @@
 /*
- *  © 2021 Neil McKechnie
- *  © 2021 M Steve Todd
- *  © 2021 Fred Decker
- *  © 2020-2021 Harald Barth
- *  © 2020-2021 Chris Harlow
  *  © 2013-2016 Gregg E. Berman
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2020, Harald Barth.
  *  
- *  This file is part of CommandStation-EX
+ *  This file is part of Asbelos DCC API
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,517 +19,390 @@
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+// >>>>>> ATTENTION: This class requires major cleaning.
+// The public interface has been narrowed to avoid the ambuguity of "activated".
 
-#include "defines.h"  // includes config.h
-#ifndef DISABLE_EEPROM
-#include "EEStore.h"
-#endif
-#include "StringFormatter.h"
-#include "CommandDistributor.h"
-#include "EXRAIL2.h"
+
+ 
+//#define EESTOREDEBUG 
+#include "defines.h"
 #include "Turnouts.h"
-#include "DCC.h"
-#include "LCN.h"
+#include "EEStore.h"
+#include "StringFormatter.h"
+#include "RMFT2.h"
 #ifdef EESTOREDEBUG
 #include "DIAG.h"
 #endif
 
-  /* 
-   * Protected static data
-   */ 
+// Keywords used for turnout configuration.
+const int16_t HASH_KEYWORD_SERVO=27709;
+const int16_t HASH_KEYWORD_DCC=6436;
+const int16_t HASH_KEYWORD_VPIN=-415;
 
-  /* static */ Turnout *Turnout::_firstTurnout = 0;
+enum unit8_t {
+  TURNOUT_DCC = 1,
+  TURNOUT_SERVO = 2,
+  TURNOUT_VPIN = 3,
+  TURNOUT_LCN = 4,
+};
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Static function to print all Turnout states to stream in form "<H id state>"
+
+void Turnout::printAll(Print *stream){
+  for (Turnout *tt = Turnout::firstTurnout; tt != NULL; tt = tt->nextTurnout)
+    StringFormatter::send(stream, F("<H %d %d>\n"), tt->data.id, tt->data.active);
+} // Turnout::printAll
+
+///////////////////////////////////////////////////////////////////////////////
+// Object method to print configuration of one Turnout to stream, in one of the following forms:
+//  <H id SERVO vpin activePos inactivePos profile state>
+//  <H id LCN state>
+//  <H id VPIN vpin state>
+//  <H id DCC address subAddress state>
+
+void Turnout::print(Print *stream){
+  uint8_t state = ((data.active) != 0);
+  uint8_t type = data.type;
+  switch (type) {
+    case TURNOUT_LCN:
+      // LCN Turnout
+      StringFormatter::send(stream, F("<H %d LCN %d>\n"), data.id, state);
+      break;
+    case TURNOUT_DCC:
+      // DCC Turnout
+      StringFormatter::send(stream, F("<H %d DCC %d %d %d>\n"), data.id, 
+        (((data.dccAccessoryData.address-1) >> 2)+1), ((data.dccAccessoryData.address-1) & 3), state);
+      break;
+    case TURNOUT_VPIN:
+      // VPIN Digital output
+      StringFormatter::send(stream, F("<H %d VPIN %d %d>\n"), data.id, data.vpinData.vpin, state);
+      break;
+    case TURNOUT_SERVO:
+      // Servo Turnout
+      StringFormatter::send(stream, F("<H %d SERVO %d %d %d %d %d>\n"), data.id, data.servoData.vpin, 
+        data.servoData.activePosition, data.servoData.inactivePosition, data.servoData.profile, state);
+      break;
+    default:
+      break;
+  }
+}
+
+
+// Public interface to turnout throw/close
+bool Turnout::setClosed(int id, bool closed) {
+   // hides the internal activate argument to a single place
+   return activate(id, closed? false: true );  /// Needs cleaning up 
+}
+bool Turnout::isClosed(int id) {
+   // hides the internal activate argument to a single place
+   return !isActive(id);  /// Needs cleaning up 
+}
+int Turnout::getId() {
+  return data.id;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Static function to activate/deactivate Turnout with ID 'n'.
+//   Returns false if turnout not found.
 
-  /* 
-   * Public static data
-   */
-  /* static */ int Turnout::turnoutlistHash = 0;
  
-  /*
-   * Protected static functions
-   */
+bool Turnout::activate(int n, bool state){
+  Turnout * tt=get(n);
+  if (!tt) return false;
+  tt->activate(state);
+  turnoutlistHash++;
+  return true;
+}
 
-  /* static */ Turnout *Turnout::get(uint16_t id) {
-    // Find turnout object from list.
-    for (Turnout *tt = _firstTurnout; tt != NULL; tt = tt->_nextTurnout)
-      if (tt->_turnoutData.id == id) return tt;
-    return NULL;
-  }
+///////////////////////////////////////////////////////////////////////////////
+// Static function to check if the Turnout with ID 'n' is activated or not.
+// Returns false if turnout not found.
 
-  // Add new turnout to end of chain
-  /* static */ void Turnout::add(Turnout *tt) {
-    if (!_firstTurnout) 
-      _firstTurnout = tt;
-    else {
-      // Find last object on chain
-      Turnout *ptr = _firstTurnout;
-      for ( ; ptr->_nextTurnout!=0; ptr=ptr->_nextTurnout) {}
-      // Line new object to last object.
-      ptr->_nextTurnout = tt;
-    }
-    turnoutlistHash++;
-  }
-  
-  
-
-  // Remove nominated turnout from turnout linked list and delete the object.
-  /* static */ bool Turnout::remove(uint16_t id) {
-    Turnout *tt,*pp=NULL;
-
-    for(tt=_firstTurnout; tt!=NULL && tt->_turnoutData.id!=id; pp=tt, tt=tt->_nextTurnout) {}
-    if (tt == NULL) return false;
-    
-    if (tt == _firstTurnout)
-      _firstTurnout = tt->_nextTurnout;
-    else
-      pp->_nextTurnout = tt->_nextTurnout;
-
-    delete (ServoTurnout *)tt;
-
-    turnoutlistHash++;
-    return true; 
-  } 
+bool Turnout::isActive(int n){
+  Turnout * tt=get(n);
+  if (!tt) return false;
+  return tt->isActive();
+}
 
 
-  /*
-   * Public static functions
-   */
+///////////////////////////////////////////////////////////////////////////////
+// Object function to check the status of Turnout is activated or not.
 
-  /* static */ bool Turnout::isClosed(uint16_t id) {
-    Turnout *tt = get(id);
-    if (tt) 
-      return tt->isClosed();
-    else
-      return false;
-  }
+bool Turnout::isActive() {
+  return data.active;
+}
 
-  /* static */ bool Turnout::setClosedStateOnly(uint16_t id, bool closeFlag) {
-    Turnout *tt = get(id);
-    if (!tt) return false;
-    tt->_turnoutData.closed = closeFlag;
+///////////////////////////////////////////////////////////////////////////////
+// Object method to activate or deactivate the Turnout.  
 
-    // I know it says setClosedStateOnly, but we need to tell others
-    //  that the state has changed too.
-    #if defined(EXRAIL_ACTIVE)
-      RMFT2::turnoutEvent(id, closeFlag);
-    #endif
-
-    CommandDistributor::broadcastTurnout(id, closeFlag);
-    return true;
-  }
-
-
-  // Static setClosed function is invoked from close(), throw() etc. to perform the 
-  //  common parts of the turnout operation.  Code which is specific to a turnout
-  //  type should be placed in the virtual function setClosedInternal(bool) which is
-  //  called from here.
-  /* static */ bool Turnout::setClosed(uint16_t id, bool closeFlag) { 
-  #if defined(DIAG_IO)
-    if (closeFlag) 
-      DIAG(F("Turnout::close(%d)"), id);
-    else
-      DIAG(F("Turnout::throw(%d)"), id);
-  #endif
-    Turnout *tt = Turnout::get(id);
-    if (!tt) return false;
-    bool ok = tt->setClosedInternal(closeFlag);
-
-    if (ok) {
-      
-#ifndef DISABLE_EEPROM
-      // Write byte containing new closed/thrown state to EEPROM if required.  Note that eepromAddress
-      // is always zero for LCN turnouts.
-      if (EEStore::eeStore->data.nTurnouts > 0 && tt->_eepromAddress > 0) 
-        EEPROM.put(tt->_eepromAddress, tt->_turnoutData.flags);
+// activate is virtual here so that it can be overridden by a non-DCC turnout mechanism
+void Turnout::activate(bool state) {
+#ifdef EESTOREDEBUG
+  DIAG(F("Turnout::activate(%d)"),state);
 #endif
-
-    #if defined(EXRAIL_ACTIVE)
-      RMFT2::turnoutEvent(id, closeFlag);
-    #endif
-
-      // Send message to JMRI etc.
-      CommandDistributor::broadcastTurnout(id, closeFlag);
-    }
-    return ok;
+  if (data.type == TURNOUT_LCN) {
+      // A LCN turnout is transmitted to the LCN master.
+      LCN::send('T', data.id, state);
+      return;   // The tStatus will be updated by a message from the LCN master, later.
   }
-
-#ifndef DISABLE_EEPROM
-  // Load all turnout objects
-  /* static */ void Turnout::load() {
-    for (uint16_t i=0; i<EEStore::eeStore->data.nTurnouts; i++) {
-      Turnout::loadTurnout();
-    }
-  }
-
-  // Save all turnout objects
-  /* static */ void Turnout::store() {
-    EEStore::eeStore->data.nTurnouts=0;
-    for (Turnout *tt = _firstTurnout; tt != 0; tt = tt->_nextTurnout) {
-      tt->save();
-      EEStore::eeStore->data.nTurnouts++;
-    }
-  }
-
-  // Load one turnout from EEPROM
-  /* static */ Turnout *Turnout::loadTurnout () {
-    Turnout *tt = 0;
-    // Read turnout type from EEPROM
-    struct TurnoutData turnoutData;
-    int eepromAddress = EEStore::pointer() + offsetof(struct TurnoutData, flags); // Address of byte containing the closed flag.
-    EEPROM.get(EEStore::pointer(), turnoutData);
-    EEStore::advance(sizeof(turnoutData));
-
-    switch (turnoutData.turnoutType) {
-      case TURNOUT_SERVO:
-        // Servo turnout
-        tt = ServoTurnout::load(&turnoutData);
-        break;
+    data.active = state;
+    switch (data.type) {
       case TURNOUT_DCC:
-        // DCC Accessory turnout
-        tt = DCCTurnout::load(&turnoutData);
+        DCC::setAccessory((((data.dccAccessoryData.address-1) >> 2) + 1), 
+          ((data.dccAccessoryData.address-1) & 3), state);
+        break;
+      case TURNOUT_SERVO:
+#ifndef IO_NO_HAL
+        IODevice::write(data.servoData.vpin, state);
+#endif
         break;
       case TURNOUT_VPIN:
-        // VPIN turnout
-        tt = VpinTurnout::load(&turnoutData);
+        IODevice::write(data.vpinData.vpin, state);
         break;
+    }
+    // Save state if stored in EEPROM
+    if (EEStore::eeStore->data.nTurnouts > 0 && num > 0) 
+      EEPROM.put(num, data.tStatus);
+
+#if defined(RMFT_ACTIVE)
+  RMFT2::turnoutEvent(data.id, !state);
+#endif  
+
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Static function to find Turnout object specified by ID 'n'.  Return NULL if not found.
+
+Turnout* Turnout::get(int n){
+  Turnout *tt;
+  for(tt=firstTurnout;tt!=NULL && tt->data.id!=n;tt=tt->nextTurnout);
+  return(tt);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Static function to delete Turnout object specified by ID 'n'.  Return false if not found.
+
+bool Turnout::remove(int n){
+  Turnout *tt,*pp=NULL;
+
+  for(tt=firstTurnout;tt!=NULL && tt->data.id!=n;pp=tt,tt=tt->nextTurnout);
+
+  if(tt==NULL) return false;
+  
+  if(tt==firstTurnout)
+    firstTurnout=tt->nextTurnout;
+  else
+    pp->nextTurnout=tt->nextTurnout;
+
+  free(tt);
+  turnoutlistHash++;
+  return true; 
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Static function to load all Turnout definitions from EEPROM
+// TODO: Consider transmitting the initial state of the DCC/LCN turnout here.
+//  (already done for servo turnouts and VPIN turnouts).
+
+void Turnout::load(){
+  struct TurnoutData data;
+  Turnout *tt=NULL;
+
+  for(uint16_t i=0;i<EEStore::eeStore->data.nTurnouts;i++){
+    // Retrieve data
+    EEPROM.get(EEStore::pointer(), data);
+    
+    int lastKnownState = data.active;
+    switch (data.type) {
+      case TURNOUT_DCC:
+        tt=createDCC(data.id, ((data.dccAccessoryData.address-1)>>2)+1, (data.dccAccessoryData.address-1)&3); // DCC-based turnout
+        break;
+      case TURNOUT_LCN:
+        // LCN turnouts are created when the remote device sends a message.
+        break;
+      case TURNOUT_SERVO:
+        tt=createServo(data.id, data.servoData.vpin, 
+          data.servoData.activePosition, data.servoData.inactivePosition, data.servoData.profile, lastKnownState);
+        break;
+      case TURNOUT_VPIN:
+        tt=createVpin(data.id, data.vpinData.vpin, lastKnownState);  // VPIN-based turnout
+        break;
+       
       default:
-        // If we find anything else, then we don't know what it is or how long it is, 
-        // so we can't go any further through the EEPROM!
-        return NULL;
+       tt=NULL;
     }
-    if (tt) {
-      // Save EEPROM address in object.  Note that LCN turnouts always have eepromAddress of zero.
-      tt->_eepromAddress = eepromAddress + offsetof(struct TurnoutData, flags);
-    }
-
+    if (tt) tt->num = EEStore::pointer() + offsetof(TurnoutData, tStatus);  // Save pointer to tStatus byte within EEPROM
+    // Advance by the actual size of the individual turnout struct.
+    EEStore::advance(data.size);
 #ifdef EESTOREDEBUG
-    printAll(&Serial);
+    if (tt) print(tt);
 #endif
-    return tt;
   }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Static function to store all Turnout definitions to EEPROM
+
+void Turnout::store(){
+  Turnout *tt;
+
+  tt=firstTurnout;
+  EEStore::eeStore->data.nTurnouts=0;
+
+  while(tt!=NULL){
+    // LCN turnouts aren't saved to EEPROM
+    if (tt->data.type != TURNOUT_LCN) {  
+#ifdef EESTOREDEBUG
+      print(tt);
 #endif
-
-/*************************************************************************************
- * ServoTurnout - Turnout controlled by servo device.
- * 
- *************************************************************************************/
-
-  // Private Constructor
-  ServoTurnout::ServoTurnout(uint16_t id, VPIN vpin, uint16_t thrownPosition, uint16_t closedPosition, uint8_t profile, bool closed) :
-    Turnout(id, TURNOUT_SERVO, closed) 
-  {
-    _servoTurnoutData.vpin = vpin;
-    _servoTurnoutData.thrownPosition = thrownPosition; 
-    _servoTurnoutData.closedPosition = closedPosition;
-    _servoTurnoutData.profile = profile;
+      tt->num = EEStore::pointer() + offsetof(TurnoutData, tStatus); // Save pointer to tstatus byte within EEPROM
+      EEPROM.put(EEStore::pointer(),tt->data);
+      EEStore::advance(tt->data.size);
+      EEStore::eeStore->data.nTurnouts++;
+    }
+    tt=tt->nextTurnout;
   }
+}
 
-  // Create function
-  /* static */ Turnout *ServoTurnout::create(uint16_t id, VPIN vpin, uint16_t thrownPosition, uint16_t closedPosition, uint8_t profile, bool closed) {
+///////////////////////////////////////////////////////////////////////////////
+// Static function for creating a DCC-controlled Turnout.
+
+Turnout *Turnout::createDCC(int id, uint16_t add, uint8_t subAdd){
+  if (add > 511 || subAdd > 3) return NULL;
+  Turnout *tt=create(id);
+  if (!tt) return(tt);
+  tt->data.type = TURNOUT_DCC;
+  tt->data.size = sizeof(tt->data.header) + sizeof(tt->data.dccAccessoryData);
+  tt->data.active = 0;
+  tt->data.dccAccessoryData.address = ((add-1) << 2) + subAdd + 1;
+  return(tt);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Static function for creating a LCN-controlled Turnout.
+
+Turnout *Turnout::createLCN(int id, uint8_t state) {
+  Turnout *tt=create(id);
+  if (!tt) return(tt);
+  tt->data.type = TURNOUT_LCN;
+  tt->data.size = sizeof(tt->data.header) + sizeof(tt->data.lcnData);
+  tt->data.active = (state != 0);
+  return(tt);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Static function for associating a Turnout id with a virtual pin in IODevice space.
+// The actual creation and configuration of the pin must be done elsewhere,
+// e.g. in mySetup.cpp during startup of the CS.
+
+Turnout *Turnout::createVpin(int id, VPIN vpin, uint8_t state){
+  if (vpin > VPIN_MAX) return NULL;
+  Turnout *tt=create(id);
+  if(!tt) return(tt);
+  tt->data.type = TURNOUT_VPIN;;
+  tt->data.size = sizeof(tt->data.header) + sizeof(tt->data.vpinData);
+  tt->data.active = (state != 0);
+  tt->data.vpinData.vpin = vpin;
+  IODevice::write(vpin, state);   // Set initial state of output.
+  return(tt);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Method for creating a Servo Turnout, e.g. connected to PCA9685 PWM device.
+
+Turnout *Turnout::createServo(int id, VPIN vpin, uint16_t activePosition, uint16_t inactivePosition, uint8_t profile, uint8_t state){
 #ifndef IO_NO_HAL
-    Turnout *tt = get(id);
-    if (tt) { 
-      // Object already exists, check if it is usable
-      if (tt->isType(TURNOUT_SERVO)) {
-        // Yes, so set parameters
-        ServoTurnout *st = (ServoTurnout *)tt;
-        st->_servoTurnoutData.vpin = vpin;
-        st->_servoTurnoutData.thrownPosition = thrownPosition;
-        st->_servoTurnoutData.closedPosition = closedPosition;
-        st->_servoTurnoutData.profile = profile;
-        // Don't touch the _closed parameter, retain the original value.
+  if (activePosition > 511 || inactivePosition > 511 || profile > 4) return NULL;
 
-        // We don't really need to do the following, since a call to IODevice::_writeAnalogue 
-        //  will provide all the data that is required!  However, if someone has configured 
-        //  a Turnout, we should ensure that the SET() RESET() and other commands that use write() 
-        //  behave consistently with the turnout commands.
-        IODevice::configureServo(vpin, thrownPosition, closedPosition, profile, 0, closed);
-
-        // Set position directly to specified position - we don't know where it is moving from.
-        IODevice::writeAnalogue(vpin, closed ? closedPosition : thrownPosition, PCA9685::Instant);
-
-        return tt;
-      } else {
-        // Incompatible object, delete and recreate
-        remove(id);
-      }
-    }
-    tt = (Turnout *)new ServoTurnout(id, vpin, thrownPosition, closedPosition, profile, closed);
-    IODevice::writeAnalogue(vpin, closed ? closedPosition : thrownPosition, PCA9685::Instant);
-    return tt;
-#else
-    (void)id; (void)vpin; (void)thrownPosition; (void)closedPosition;
-    (void)profile; (void)closed;          // avoid compiler warnings.
+  Turnout *tt=create(id);
+  if (!tt) return(tt);
+  if (tt->data.type != TURNOUT_SERVO) tt->data.active = (state != 0);  // Retain current state if it's an existing servo turnout.
+  tt->data.type = TURNOUT_SERVO;
+  tt->data.size = sizeof(tt->data.header) + sizeof(tt->data.servoData);
+  tt->data.servoData.vpin = vpin;
+  tt->data.servoData.activePosition = activePosition;
+  tt->data.servoData.inactivePosition = inactivePosition;
+  tt->data.servoData.profile = profile;
+  // Configure PWM interface device
+  int deviceParams[] = {(int)activePosition, (int)inactivePosition, profile, tt->data.active};
+  if (!IODevice::configure(vpin, IODevice::CONFIGURE_SERVO, 4, deviceParams)) {
+    remove(id);
     return NULL;
-#endif
   }
-
-  // Load a Servo turnout definition from EEPROM.  The common Turnout data has already been read at this point.
-  Turnout *ServoTurnout::load(struct TurnoutData *turnoutData) {
-#ifndef DISABLE_EEPROM
-    ServoTurnoutData servoTurnoutData;
-    // Read class-specific data from EEPROM
-    EEPROM.get(EEStore::pointer(), servoTurnoutData);
-    EEStore::advance(sizeof(servoTurnoutData));
-    
-    // Create new object
-    Turnout *tt = ServoTurnout::create(turnoutData->id, servoTurnoutData.vpin, servoTurnoutData.thrownPosition,
-      servoTurnoutData.closedPosition, servoTurnoutData.profile, turnoutData->closed);
-    return tt;
+  return(tt);
 #else
-    (void)turnoutData;
-    return NULL;
+  (void)id; (void)vpin; (void)activePosition; (void)inactivePosition; (void)profile; (void)state;  // avoid compiler warnings
+  return NULL;
 #endif
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Support for <T id SERVO pin activepos inactive pos profile>
+// and <T id DCC address subaddress>
+// and <T id VPIN pin>
+
+Turnout *Turnout::create(int id, int params, int16_t p[]) {
+  if (p[0] == HASH_KEYWORD_SERVO) { // <T id SERVO n n n n>
+    if (params == 5)
+      return createServo(id, (VPIN)p[1], (uint16_t)p[2], (uint16_t)p[3], (uint8_t)p[4]);
+    else  
+      return NULL;
+  } else 
+  if (p[0] == HASH_KEYWORD_VPIN) { // <T id VPIN n>
+    if (params==2)
+      return createVpin(id, p[1]);
+    else
+      return NULL;
+  } else
+  if (p[0]==HASH_KEYWORD_DCC) {
+    if (params==3 && p[1]>0 && p[1]<=512 && p[2]>=0 && p[2]<4)  // <T id DCC n n>
+      return createDCC(id, p[1], p[2]);
+    else if (params==2 && p[1]>0 && p[1]<=512*4)  // <T id DCC nn>
+      return createDCC(id, (p[1]-1)/4+1, (p[1]-1)%4);
+    else
+      return NULL;
+  } else if (params==2) { // <T id n n> for DCC or LCN
+    return createDCC(id, p[0], p[1]);
+  } 
+  else if (params==3) { // legacy <T id n n n> for Servo
+    return createServo(id, (VPIN)p[0], (uint16_t)p[1], (uint16_t)p[2]);
   }
 
-  // For DCC++ classic compatibility, state reported to JMRI is 1 for thrown and 0 for closed
-  void ServoTurnout::print(Print *stream) {
-    StringFormatter::send(stream, F("<H %d SERVO %d %d %d %d %d>\n"), _turnoutData.id, _servoTurnoutData.vpin, 
-      _servoTurnoutData.thrownPosition, _servoTurnoutData.closedPosition, _servoTurnoutData.profile, 
-      !_turnoutData.closed);
+  return NULL;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Create basic Turnout object.  The details of what sort of object it is 
+//  controlling are not set here.
+
+Turnout *Turnout::create(int id){
+  Turnout *tt=get(id);
+  if (tt==NULL) { 
+     tt=(Turnout *)calloc(1,sizeof(Turnout));
+     if (!tt) return (tt);
+     tt->nextTurnout=firstTurnout;
+     firstTurnout=tt;
+     tt->data.id=id;
   }
+  turnoutlistHash++;
+  return tt;
+}
 
-  // ServoTurnout-specific code for throwing or closing a servo turnout.
-  bool ServoTurnout::setClosedInternal(bool close) {
-#ifndef IO_NO_HAL
-    IODevice::writeAnalogue(_servoTurnoutData.vpin, 
-      close ? _servoTurnoutData.closedPosition : _servoTurnoutData.thrownPosition, _servoTurnoutData.profile);
-    _turnoutData.closed = close;
-#else
-    (void)close;  // avoid compiler warnings
-#endif
-    return true;
-  }
-
-  void ServoTurnout::save() {
-#ifndef DISABLE_EEPROM
-    // Write turnout definition and current position to EEPROM
-    // First write common servo data, then
-    // write the servo-specific data
-    EEPROM.put(EEStore::pointer(), _turnoutData);
-    EEStore::advance(sizeof(_turnoutData));
-    EEPROM.put(EEStore::pointer(), _servoTurnoutData);
-    EEStore::advance(sizeof(_servoTurnoutData));
-#endif
-  }
-
-/*************************************************************************************
- * DCCTurnout - Turnout controlled by DCC Accessory Controller.
- * 
- *************************************************************************************/
-
-#if defined(DCC_TURNOUTS_RCN_213)
-  const bool DCCTurnout::rcn213Compliant = true;
-#else
-  const bool DCCTurnout::rcn213Compliant = false;
+///////////////////////////////////////////////////////////////////////////////
+//
+// Object method to print debug info about the state of a Turnout object
+//
+#ifdef EESTOREDEBUG
+void Turnout::print(Turnout *tt) {
+  tt->print(StringFormatter::diagSerial);
+}
 #endif
 
-  // DCCTurnoutData contains data specific to this subclass that is 
-  // written to EEPROM when the turnout is saved.
-  struct DCCTurnoutData {
-    // DCC address (Address in bits 15-2, subaddress in bits 1-0
-    uint16_t address; // CS currently supports linear address 1-2048
-      // That's DCC accessory address 1-512 and subaddress 0-3.
-  } _dccTurnoutData; // 2 bytes
-
-  // Constructor
-  DCCTurnout::DCCTurnout(uint16_t id, uint16_t address, uint8_t subAdd) :
-    Turnout(id, TURNOUT_DCC, false)
-  {
-    _dccTurnoutData.address = address;
-    _dccTurnoutData.subAddress = subAdd;
-  }
-
-  // Create function
-  /* static */ Turnout *DCCTurnout::create(uint16_t id, uint16_t add, uint8_t subAdd) {
-    Turnout *tt = get(id);
-    if (tt) { 
-      // Object already exists, check if it is usable
-      if (tt->isType(TURNOUT_DCC)) {
-        // Yes, so set parameters<T>
-        DCCTurnout *dt = (DCCTurnout *)tt;
-        dt->_dccTurnoutData.address = add;
-        dt->_dccTurnoutData.subAddress = subAdd;
-        // Don't touch the _closed parameter, retain the original value.
-        return tt;
-      } else {
-        // Incompatible object, delete and recreate
-        remove(id);
-      }
-    }
-    tt = (Turnout *)new DCCTurnout(id, add, subAdd);
-    return tt;
-  }
-
-  // Load a DCC turnout definition from EEPROM.  The common Turnout data has already been read at this point.
-  /* static */ Turnout *DCCTurnout::load(struct TurnoutData *turnoutData) {
-#ifndef DISABLE_EEPROM
-    DCCTurnoutData dccTurnoutData;
-    // Read class-specific data from EEPROM
-    EEPROM.get(EEStore::pointer(), dccTurnoutData);
-    EEStore::advance(sizeof(dccTurnoutData));
-    
-    // Create new object
-    DCCTurnout *tt = new DCCTurnout(turnoutData->id, dccTurnoutData.address, dccTurnoutData.subAddress);
-
-    return tt;
-#else
-    (void)turnoutData;
-    return NULL;
-#endif
-  }
-
-  void DCCTurnout::print(Print *stream) {
-    StringFormatter::send(stream, F("<H %d DCC %d %d %d>\n"), _turnoutData.id, 
-      _dccTurnoutData.address, _dccTurnoutData.subAddress, !_turnoutData.closed); 
-    // Also report using classic DCC++ syntax for DCC accessory turnouts, since JMRI expects this.
-    StringFormatter::send(stream, F("<H %d %d %d %d>\n"), _turnoutData.id, 
-      _dccTurnoutData.address, _dccTurnoutData.subAddress, !_turnoutData.closed); 
-  }
-
-  bool DCCTurnout::setClosedInternal(bool close) {
-    // DCC++ Classic behaviour is that Throw writes a 1 in the packet,
-    // and Close writes a 0.  
-    // RCN-213 specifies that Throw is 0 and Close is 1.
-    DCC::setAccessory(_dccTurnoutData.address, _dccTurnoutData.subAddress, close ^ !rcn213Compliant);
-    _turnoutData.closed = close;
-    return true;
-  }
-
-  void DCCTurnout::save() {
-#ifndef DISABLE_EEPROM
-    // Write turnout definition and current position to EEPROM
-    // First write common servo data, then
-    // write the servo-specific data
-    EEPROM.put(EEStore::pointer(), _turnoutData);
-    EEStore::advance(sizeof(_turnoutData));
-    EEPROM.put(EEStore::pointer(), _dccTurnoutData);
-    EEStore::advance(sizeof(_dccTurnoutData));
-#endif
-  }
-
-
-
-/*************************************************************************************
- * VpinTurnout - Turnout controlled through a HAL vpin.
- * 
- *************************************************************************************/
-
-  // Constructor
-  VpinTurnout::VpinTurnout(uint16_t id, VPIN vpin, bool closed) :
-    Turnout(id, TURNOUT_VPIN, closed)
-  {
-    _vpinTurnoutData.vpin = vpin;
-  }
-
-  // Create function
-  /* static */ Turnout *VpinTurnout::create(uint16_t id, VPIN vpin, bool closed) {
-    Turnout *tt = get(id);
-    if (tt) { 
-      // Object already exists, check if it is usable
-      if (tt->isType(TURNOUT_VPIN)) {
-        // Yes, so set parameters
-        VpinTurnout *vt = (VpinTurnout *)tt;
-        vt->_vpinTurnoutData.vpin = vpin;
-        // Don't touch the _closed parameter, retain the original value.
-        return tt;
-      } else {
-        // Incompatible object, delete and recreate
-        remove(id);
-      }
-    }
-    tt = (Turnout *)new VpinTurnout(id, vpin, closed);
-    return tt;
-  }
-
-  // Load a VPIN turnout definition from EEPROM.  The common Turnout data has already been read at this point.
-  /* static */ Turnout *VpinTurnout::load(struct TurnoutData *turnoutData) {
-#ifndef DISABLE_EEPROM
-    VpinTurnoutData vpinTurnoutData;
-    // Read class-specific data from EEPROM
-    EEPROM.get(EEStore::pointer(), vpinTurnoutData);
-    EEStore::advance(sizeof(vpinTurnoutData));
-    
-    // Create new object
-    VpinTurnout *tt = new VpinTurnout(turnoutData->id, vpinTurnoutData.vpin, turnoutData->closed);
-
-    return tt;
-#else
-    (void)turnoutData;
-    return NULL;
-#endif
-  }
-
-  // Report 1 for thrown, 0 for closed.
-  void VpinTurnout::print(Print *stream) {
-    StringFormatter::send(stream, F("<H %d VPIN %d %d>\n"), _turnoutData.id, _vpinTurnoutData.vpin, 
-      !_turnoutData.closed); 
-  }
-
-  bool VpinTurnout::setClosedInternal(bool close) {
-    IODevice::write(_vpinTurnoutData.vpin, close);
-    _turnoutData.closed = close;
-    return true;
-  }
-
-  void VpinTurnout::save() {
-#ifndef DISABLE_EEPROM
-    // Write turnout definition and current position to EEPROM
-    // First write common servo data, then
-    // write the servo-specific data
-    EEPROM.put(EEStore::pointer(), _turnoutData);
-    EEStore::advance(sizeof(_turnoutData));
-    EEPROM.put(EEStore::pointer(), _vpinTurnoutData);
-    EEStore::advance(sizeof(_vpinTurnoutData));
-#endif
-  }
-
-
-/*************************************************************************************
- * LCNTurnout - Turnout controlled by Loconet
- * 
- *************************************************************************************/
-
-  // LCNTurnout has no specific data, and in any case is not written to EEPROM!
-  // struct LCNTurnoutData {
-  // } _lcnTurnoutData; // 0 bytes
-
-  // Constructor
-  LCNTurnout::LCNTurnout(uint16_t id, bool closed) :
-    Turnout(id, TURNOUT_LCN, closed)
-  { }
-
-  // Create function
-  /* static */ Turnout *LCNTurnout::create(uint16_t id, bool closed) {
-    Turnout *tt = get(id);
-    if (tt) { 
-      // Object already exists, check if it is usable
-      if (tt->isType(TURNOUT_LCN)) {
-        // Yes, so return this object
-        return tt;
-      } else {
-        // Incompatible object, delete and recreate
-        remove(id);
-      }
-    }
-    tt = (Turnout *)new LCNTurnout(id, closed);
-    return tt;
-  }
-
-  bool LCNTurnout::setClosedInternal(bool close) {
-    // Assume that the LCN command still uses 1 for throw and 0 for close...
-    LCN::send('T', _turnoutData.id, !close);
-    // The _turnoutData.closed flag should be updated by a message from the LCN master, later.
-    return true;
-  }
-
-  // LCN turnouts not saved to EEPROM.
-  //void save() override {  }
-  //static Turnout *load(struct TurnoutData *turnoutData) {
-
-  // Report 1 for thrown, 0 for closed.
-  void LCNTurnout::print(Print *stream) {
-    StringFormatter::send(stream, F("<H %d LCN %d>\n"), _turnoutData.id, 
-    !_turnoutData.closed); 
-  }
-
+///////////////////////////////////////////////////////////////////////////////
+Turnout *Turnout::firstTurnout=NULL;
+int Turnout::turnoutlistHash=0; //bump on every change so clients know when to refresh their lists

Turnouts.h

@@ -1,13 +1,7 @@
 /*
- *  © 2021 Neil McKechnie
- *  © 2021 M Steve Todd
- *  © 2021 Fred Decker
- *  © 2020-2021 Harald Barth
- *  © 2020-2022 Chris Harlow
- *  © 2013-2016 Gregg E. Berman
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
  *  
- *  This file is part of CommandStation-EX
+ *  This file is part of Asbelos DCC API
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,287 +17,109 @@
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef TURNOUTS_H
-#define TURNOUTS_H
+/* 
+ * Turnout data is stored in a structure whose length depends on the
+ * type of turnout.  There is a common header of 3 bytes, followed by
+ * 2 bytes for DCC turnout, 5 bytes for servo turnout, 2 bytes for a
+ * VPIN turnout, or zero bytes for an LCN turnout.
+ * The variable length allows the limited space in EEPROM to be used effectively.
+ */
 
-//#define EESTOREDEBUG 
-#include "Arduino.h"
+#ifndef Turnouts_h
+#define Turnouts_h
+
+#include <Arduino.h>
+#include "DCC.h"
+#include "LCN.h"
 #include "IODevice.h"
-#include "StringFormatter.h"
 
-// Turnout type definitions
-enum {
-  TURNOUT_DCC = 1,
-  TURNOUT_SERVO = 2,
-  TURNOUT_VPIN = 3,
-  TURNOUT_LCN = 4,
+
+const byte STATUS_ACTIVE=0x80; // Flag as activated in tStatus field
+const byte STATUS_TYPE = 0x7f;  // Mask for turnout type in tStatus field
+
+//  The struct 'header' is used to determine the length of the
+//  overlaid data so must be at least as long as the anonymous fields it
+//  is overlaid with.
+struct TurnoutData {
+  // Header common to all turnouts
+  union {
+    struct {
+      int id;
+      uint8_t tStatus;
+      uint8_t size;
+    } header;
+
+    struct {
+      int id;
+      union {
+        uint8_t tStatus;
+        struct {
+          uint8_t active: 1;
+          uint8_t type: 5;
+          uint8_t :2;
+        };
+      };
+      uint8_t size;  // set to actual total length of used structure
+    };
+  };
+  // Turnout-type-specific structure elements, different length depending
+  //  on turnout type.  This allows the data to be packed efficiently 
+  //  in the EEPROM.
+  union {
+    struct {
+      // DCC address (Address in bits 15-2, subaddress in bits 1-0
+      uint16_t address; // CS currently supports linear address 1-2048
+        // That's DCC accessory address 1-512 and subaddress 0-3.
+    } dccAccessoryData;
+
+    struct {
+      VPIN vpin;
+      uint16_t activePosition : 12;  // 0-4095
+      uint16_t inactivePosition : 12; // 0-4095
+      uint8_t profile;
+    } servoData;
+
+    struct {
+    } lcnData;
+
+    struct {
+      VPIN vpin;
+    } vpinData;
+  };
 };
 
-/*************************************************************************************
- * Turnout - Base class for turnouts.
- * 
- *************************************************************************************/
-
 class Turnout {
-protected:
-  /* 
-   * Object data
-   */
-
-  // The TurnoutData struct contains data common to all turnout types, that 
-  // is written to EEPROM when the turnout is saved.
-  // The first byte of this struct contains the 'closed' flag which is
-  // updated whenever the turnout changes from thrown to closed and
-  // vice versa.  If the turnout has been saved, then this byte is rewritten
-  // when changed in RAM.  The 'closed' flag must be located in the first byte.
-  struct TurnoutData {
-    union {
-      struct {
-        bool closed : 1;
-        bool hidden : 1;
-        bool _rfu : 1;
-        uint8_t turnoutType : 5;
-      };
-      uint8_t flags;
-    };
-    uint16_t id;
-  } _turnoutData;  // 3 bytes
-
-  // Address in eeprom of first byte of the _turnoutData struct (containing the closed flag).
-  // Set to zero if the object has not been saved in EEPROM, e.g. for newly created Turnouts, and 
-  // for all LCN turnouts.
-  uint16_t _eepromAddress = 0;
-
-  // Pointer to next turnout on linked list.
-  Turnout *_nextTurnout = 0;
-
-  /*
-   * Constructor
-   */
-  Turnout(uint16_t id, uint8_t turnoutType, bool closed) {
-    _turnoutData.id = id;
-    _turnoutData.turnoutType = turnoutType;
-    _turnoutData.closed = closed;
-    _turnoutData.hidden=false;
-    add(this);
-  }
-
-  /* 
-   * Static data
-   */ 
-
-  static Turnout *_firstTurnout;
-  static int _turnoutlistHash;
-
-  /* 
-   * Virtual functions
-   */
-
-  virtual bool setClosedInternal(bool close) = 0;  // Mandatory in subclass
-  virtual void save() {}
-  
-  /*
-   * Static functions
-   */
-
-
-  static void add(Turnout *tt);
-  
 public:
-  static Turnout *get(uint16_t id);
-  /* 
-   * Static data
-   */
+  static Turnout *firstTurnout;
   static int turnoutlistHash;
-  static const bool useClassicTurnoutCommands;
-  
-  /*
-   * Public base class functions
-   */
-  inline bool isClosed() { return _turnoutData.closed; };
-  inline bool isThrown() { return !_turnoutData.closed; }
-  inline bool isHidden() { return _turnoutData.hidden; }
-  inline void setHidden(bool h) { _turnoutData.hidden=h; }
-  inline bool isType(uint8_t type) { return _turnoutData.turnoutType == type; }
-  inline uint16_t getId() { return _turnoutData.id; }
-  inline Turnout *next() { return _nextTurnout; }
-  void printState(Print *stream);
-  /* 
-   * Virtual functions
-   */
-  virtual void print(Print *stream) {
-    (void)stream;  // avoid compiler warnings.
-  }
-  virtual ~Turnout() {}   // Destructor
-
-  /*
-   * Public static functions
-   */
-  inline static bool exists(uint16_t id) { return get(id) != 0; }
-
-  static bool remove(uint16_t id);
-
-  static bool isClosed(uint16_t id);
-
-  inline static bool isThrown(uint16_t id) {
-    return !isClosed(id);
-  }
-
-  static bool setClosed(uint16_t id, bool closeFlag);
-
-  inline static bool setClosed(uint16_t id) {
-    return setClosed(id, true);
-  }
-
-  inline static bool setThrown(uint16_t id) {
-    return setClosed(id, false);
-  }
-
-  static bool setClosedStateOnly(uint16_t id, bool close);
-
-  inline static Turnout *first() { return _firstTurnout; }
-
-#ifndef DISABLE_EEPROM
-  // Load all turnout definitions.
+  Turnout *nextTurnout;
+  static Turnout* get(int);
+  static bool remove(int);
+  static bool isClosed(int);
+  static bool setClosed(int n, bool closed);  // return false if not found. 
+  static void setClosedStateOnly(int n, bool closed);
+  int getId();
   static void load();
-  // Load one turnout definition
-  static Turnout *loadTurnout();
-  // Save all turnout definitions
   static void store();
+  static Turnout *createServo(int id , VPIN vpin , uint16_t activeAngle, uint16_t inactiveAngle, uint8_t profile=1, uint8_t initialState=0);
+  static Turnout *createVpin(int id, VPIN vpin, uint8_t initialState=0);
+  static Turnout *createDCC(int id, uint16_t address, uint8_t subAddress);
+  static Turnout *createLCN(int id, uint8_t initialState=0);
+  static Turnout *create(int id, int params, int16_t p[]);
+  static Turnout *create(int id);
+  static void printAll(Print *);
+  void print(Print *stream);
+#ifdef EESTOREDEBUG
+  static void print(Turnout *tt);
 #endif
-  static void printAll(Print *stream) {
-    for (Turnout *tt = _firstTurnout; tt != 0; tt = tt->_nextTurnout)
-      if (!tt->isHidden()) StringFormatter::send(stream, F("<H %d %d>\n"),tt->getId(), tt->isThrown());
-  }
-
-
-};
-
-
-/*************************************************************************************
- * ServoTurnout - Turnout controlled by servo device.
- * 
- *************************************************************************************/
-class ServoTurnout : public Turnout {
 private:
-  // ServoTurnoutData contains data specific to this subclass that is 
-  // written to EEPROM when the turnout is saved.
-  struct ServoTurnoutData {
-    VPIN vpin;
-    uint16_t closedPosition : 12;
-    uint16_t thrownPosition : 12;
-    uint8_t profile;
-  } _servoTurnoutData; // 6 bytes
-
-  // Constructor
-  ServoTurnout(uint16_t id, VPIN vpin, uint16_t thrownPosition, uint16_t closedPosition, uint8_t profile, bool closed);
-
-public:
-  // Create function
-  static Turnout *create(uint16_t id, VPIN vpin, uint16_t thrownPosition, uint16_t closedPosition, uint8_t profile, bool closed=true);
-
-  // Load a Servo turnout definition from EEPROM.  The common Turnout data has already been read at this point.
-  static Turnout *load(struct TurnoutData *turnoutData);
-  void print(Print *stream) override;
-
-protected:
-  // ServoTurnout-specific code for throwing or closing a servo turnout.
-  bool setClosedInternal(bool close) override;
-  void save() override;
-
-};
-
-/*************************************************************************************
- * DCCTurnout - Turnout controlled by DCC Accessory Controller.
- * 
- *************************************************************************************/
-class DCCTurnout : public Turnout {
-private:
-  // DCCTurnoutData contains data specific to this subclass that is 
-  // written to EEPROM when the turnout is saved.
-  struct DCCTurnoutData {
-    // DCC address (Address in bits 15-2, subaddress in bits 1-0)
-    struct {
-      uint16_t address : 14;
-      uint8_t subAddress : 2;
-    };
-  } _dccTurnoutData; // 2 bytes
-
-  // Constructor
-  DCCTurnout(uint16_t id, uint16_t address, uint8_t subAdd);
-
-public:
-  // Create function
-  static Turnout *create(uint16_t id, uint16_t add, uint8_t subAdd);
-  // Load a VPIN turnout definition from EEPROM.  The common Turnout data has already been read at this point.
-  static Turnout *load(struct TurnoutData *turnoutData);
-  void print(Print *stream) override;
-  // Flag whether DCC Accessory packets are to contain 1=close/0=throw(RCN-213) or 1=throw/0-close (DCC++ Classic)
-  static const bool rcn213Compliant;
-
-protected:
-  bool setClosedInternal(bool close) override;
-  void save() override;
-
-};
-
-
-/*************************************************************************************
- * VpinTurnout - Turnout controlled through a HAL vpin.
- * 
- *************************************************************************************/
-class VpinTurnout : public Turnout {
-private:
-  // VpinTurnoutData contains data specific to this subclass that is 
-  // written to EEPROM when the turnout is saved.
-  struct VpinTurnoutData {
-    VPIN vpin;
-  } _vpinTurnoutData; // 2 bytes
-
-  // Constructor
- VpinTurnout(uint16_t id, VPIN vpin, bool closed);
-
-public:
-  // Create function
-  static Turnout *create(uint16_t id, VPIN vpin, bool closed=true);
-
-  // Load a VPIN turnout definition from EEPROM.  The common Turnout data has already been read at this point.
-  static Turnout *load(struct TurnoutData *turnoutData);
-  void print(Print *stream) override;
-
-protected:
-  bool setClosedInternal(bool close) override;
-  void save() override;
-
-};
-
-
-/*************************************************************************************
- * LCNTurnout - Turnout controlled by Loconet
- * 
- *************************************************************************************/
-class LCNTurnout : public Turnout {
-private:
-  // LCNTurnout has no specific data, and in any case is not written to EEPROM!
-  // struct LCNTurnoutData {
-  // } _lcnTurnoutData; // 0 bytes
-
-  // Constructor 
-  LCNTurnout(uint16_t id, bool closed);
-
-public:
-  // Create function
-  static Turnout *create(uint16_t id, bool closed=true);
-
-
-  bool setClosedInternal(bool close) override;
-
-  // LCN turnouts not saved to EEPROM.
-  //void save() override {  }
-  //static Turnout *load(struct TurnoutData *turnoutData) {
-
-  void print(Print *stream) override;
-
-};
-
+  int num;  // EEPROM address of tStatus in TurnoutData struct, or zero if not stored.
+  TurnoutData data;
+   static bool activate(int n, bool  thrown);
+   static bool isActive(int);
+   bool isActive();
+   void activate(bool state);
+   void setActive(bool state);
+  }; // Turnout
+  
 #endif

WiThrottle.cpp

@@ -1,12 +1,8 @@
 /*
- *  © 2021 Neil McKechnie
- *  © 2021 Mike S
- *  © 2020-2022 Harald Barth
- *  © 2020-2021 M Steve Todd
- *  © 2020-2021 Chris Harlow
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
+ *  © 2020, Harald Barth
  *  
- *  This file is part of CommandStation-EX
+ *  This file is part of Asbelos DCC API
  *
  *  This is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -53,82 +49,20 @@
 #include "DIAG.h"
 #include "GITHUB_SHA.h"
 #include "version.h"
-#include "EXRAIL2.h"
-#include "CommandDistributor.h"
-#include "TrackManager.h"
-#include "DCCTimer.h"
+#include "RMFT2.h"
+
 
 #define LOOPLOCOS(THROTTLECHAR, CAB)  for (int loco=0;loco<MAX_MY_LOCO;loco++) \
       if ((myLocos[loco].throttle==THROTTLECHAR || '*'==THROTTLECHAR) && (CAB<0 || myLocos[loco].cab==CAB))
 
 WiThrottle * WiThrottle::firstThrottle=NULL;
 
-static uint8_t xstrcmp(const char *s1, const char *s2) {
-  while(*s1 != '\0' && *s2 != '\0') {
-    if (*s1 != *s2) return 1;
-    s1++;
-    s2++;
-  }
-  if (*s1 == '\0' && *s2 == '\0')
-    return 0;
-  return 1;
-}
-
-void WiThrottle::findUniqThrottle(int id, char *u) {
-  WiThrottle *wtmyid = NULL;
-  WiThrottle *wtmyuniq = NULL;
-  u[16] = '\0';
-  for (WiThrottle* wt=firstThrottle; wt!=NULL ; wt=wt->nextThrottle){
-    //DIAG(F("looking at %d as %s"),wt->clientid, wt->uniq);
-    if (wtmyid == NULL && wt->clientid == id)
-      wtmyid = wt;
-    if (wtmyuniq == NULL && xstrcmp(u, wt->uniq) == 0)
-      wtmyuniq = wt;
-  }
-  if (wtmyid == NULL) {  // should not happen
-    DIAG(F("Did not find my own wiThrottle handle"));
-    return;
-  }
-  if (wtmyid == wtmyuniq) { // all well, just return;
-    return;
-  }
-  if (wtmyuniq == NULL) { // register uniq in the found id
-    strncpy(wtmyid->uniq, u, 16);
-    wtmyid->uniq[16] = '\0';
-    if (Diag::WITHROTTLE) DIAG(F("Client %d registered as %s"),wtmyid->clientid, wtmyid->uniq);
-    return;
-  }
-  // do the copy (all other options above)
-  for(int n=0; n < MAX_MY_LOCO; n++)
-    wtmyid->myLocos[n] = wtmyuniq->myLocos[n];
-  wtmyid->heartBeatEnable = wtmyuniq->heartBeatEnable;
-  wtmyid->heartBeat       = wtmyuniq->heartBeat;
-  wtmyid->initSent        = wtmyuniq->initSent;
-  wtmyid->exRailSent      = wtmyuniq->exRailSent;
-  wtmyid->mostRecentCab   = wtmyuniq->mostRecentCab;
-  wtmyid->turnoutListHash = wtmyuniq->turnoutListHash;
-  wtmyid->lastPowerState  = wtmyuniq->lastPowerState;
-  strncpy(wtmyid->uniq, u, 16);
-  wtmyid->uniq[16] = '\0';
-  if (Diag::WITHROTTLE)
-    DIAG(F("New client %d replaces old client %d as %s"), wtmyid->clientid, wtmyuniq->clientid, wtmyid->uniq);
-  forget(wtmyuniq->clientid); // do not use wtmyid after this
-}
-
 WiThrottle* WiThrottle::getThrottle( int wifiClient) {
   for (WiThrottle* wt=firstThrottle; wt!=NULL ; wt=wt->nextThrottle)  
      if (wt->clientid==wifiClient) return wt; 
   return new WiThrottle( wifiClient);
 }
 
-void WiThrottle::forget( byte clientId) {
-  for (WiThrottle* wt=firstThrottle; wt!=NULL ; wt=wt->nextThrottle)  
-     if (wt->clientid==clientId) {
-      delete wt;
-      break; 
-     }
-}
-
 bool WiThrottle::isThrottleInUse(int cab) {
   for (WiThrottle* wt=firstThrottle; wt!=NULL ; wt=wt->nextThrottle)  
      if (wt->areYouUsingThrottle(cab)) return true;
@@ -157,7 +91,6 @@ WiThrottle::WiThrottle( int wificlientid) {
 }
 
 WiThrottle::~WiThrottle() {
-  if (Diag::WITHROTTLE) DIAG(F("Deleting WiThrottle client %d"),this->clientid);
   if (firstThrottle== this) {
     firstThrottle=this->nextThrottle;
     return;
@@ -178,154 +111,122 @@ void WiThrottle::parse(RingStream * stream, byte * cmdx) {
   if (Diag::WITHROTTLE) DIAG(F("%l WiThrottle(%d)<-[%e]"),millis(),clientid,cmd);
 
   if (initSent) {
+    // Send power state if different than last sent
+    bool currentPowerState = (DCCWaveform::mainTrack.getPowerMode()==POWERMODE::ON);
+    if (lastPowerState != currentPowerState) {
+      StringFormatter::send(stream,F("PPA%x\n"),currentPowerState);
+      lastPowerState = currentPowerState;  
+    }
     // Send turnout list if changed since last sent (will replace list on client)
     if (turnoutListHash != Turnout::turnoutlistHash) {
       StringFormatter::send(stream,F("PTL"));
-      for(Turnout *tt=Turnout::first();tt!=NULL;tt=tt->next()){
-          if (tt->isHidden()) continue;
+      for(Turnout *tt=Turnout::firstTurnout;tt!=NULL;tt=tt->nextTurnout){
           int id=tt->getId();
-          const FSH * tdesc=NULL;
-          #ifdef EXRAIL_ACTIVE
-          tdesc=RMFT2::getTurnoutDescription(id);
-          #endif
-          char tchar=Turnout::isClosed(id)?'2':'4';
-          if (tdesc==NULL) // turnout with no description
-              StringFormatter::send(stream,F("]\\[%d}|{T%d}|{T%c"), id,id,tchar);
-	        else 
-              StringFormatter::send(stream,F("]\\[%d}|{%S}|{%c"), id,tdesc,tchar);
+          StringFormatter::send(stream,F("]\\[%d}|{%d}|{%c"), id, id, Turnout::isClosed(id)?'2':'4');
       }
       StringFormatter::send(stream,F("\n"));
       turnoutListHash = Turnout::turnoutlistHash; // keep a copy of hash for later comparison
     }
 
     else if (!exRailSent) {
-      // Send EX-RAIL routes list if not already sent (but not at same time as turnouts above)
+      // Send ExRail routes list if not already sent (but not at same time as turnouts above)
       exRailSent=true;
-#ifdef EXRAIL_ACTIVE
-   StringFormatter::send(stream,F("PRT]\\[Routes}|{Route]\\[Set}|{2]\\[Handoff}|{4\nPRL"));
-   for (byte pass=0;pass<2;pass++) {
-      // first pass automations, second pass routes.
-    for (int ix=0;;ix++) {
-        int16_t id=GETFLASHW((pass?RMFT2::automationIdList:RMFT2::routeIdList)+ix);
-        if (id==0) break;
-        const FSH * desc=RMFT2::getRouteDescription(id);
-        StringFormatter::send(stream,F("]\\[%c%d}|{%S}|{%c"),
-                      pass?'A':'R',id,desc, pass?'4':'2');
-    }
-   }
-   StringFormatter::send(stream,F("\n"));
-#endif
-      // allow heartbeat to slow down once all metadata sent     
-      StringFormatter::send(stream,F("*%d\n"),HEARTBEAT_SECONDS);
-    }
-  }
-  
-  while (cmd[0]) {
-    switch (cmd[0]) {
-    case '*':  // heartbeat control
-      if (cmd[1]=='+') heartBeatEnable=true;
-      else if (cmd[1]=='-') heartBeatEnable=false;
-      break;
-    case 'P':  
-      if (cmd[1]=='P' && cmd[2]=='A' )  {  //PPA power mode 
-	TrackManager::setMainPower(cmd[3]=='1'?POWERMODE::ON:POWERMODE::OFF);
-/* TODO 
-	if (MotorDriver::commonFaultPin) // commonFaultPin prevents individual track handling
-	  DCCWaveform::progTrack.setPowerMode(cmd[3]=='1'?POWERMODE::ON:POWERMODE::OFF);
-*/
-
-	CommandDistributor::broadcastPower();
-      }
-#if defined(EXRAIL_ACTIVE)
-      else if (cmd[1]=='R' && cmd[2]=='A' && cmd[3]=='2' ) { // Route activate
-	// exrail routes are RA2Rn , Animations are RA2An 
-	int route=getInt(cmd+5);
-	uint16_t cab=cmd[4]=='A' ? mostRecentCab : 0; 
-	RMFT2::createNewTask(route, cab);
-      }
+#ifdef RMFT_ACTIVE
+      RMFT2::emitWithrottleRouteList(stream);
 #endif    
-      else if (cmd[1]=='T' && cmd[2]=='A') { // PTA accessory toggle 
-	int id=getInt(cmd+4); 
-	if (!Turnout::exists(id)) {
-	  // If turnout does not exist, create it
-	  int addr = ((id - 1) / 4) + 1;
-	  int subaddr = (id - 1) % 4;
-	  DCCTurnout::create(id,addr,subaddr);
-	  StringFormatter::send(stream, F("HmTurnout %d created\n"),id);
-	}
-	switch (cmd[3]) {
-	  // T and C according to RCN-213 where 0 is Stop, Red, Thrown, Diverging.
-	case 'T': 
-	  Turnout::setClosed(id,false);
-	  break;
-	case 'C': 
-	  Turnout::setClosed(id,true);
-	  break;
-	case '2': 
-	  Turnout::setClosed(id,!Turnout::isClosed(id));
-	  break;
-	default :
-	  Turnout::setClosed(id,true);
-	  break;
-	}
-	StringFormatter::send(stream, F("PTA%c%d\n"),Turnout::isClosed(id)?'2':'4',id );
-      }
-      break;
-    case 'N':  // Heartbeat (2), only send if connection completed by 'HU' message
-      StringFormatter::send(stream, F("*%d\n"), initSent ? HEARTBEAT_SECONDS : HEARTBEAT_SECONDS/2); // return timeout value
-      break;
-    case 'M': // multithrottle
-      multithrottle(stream, cmd); 
-      break;
-    case 'H': // send initial connection info after receiving "HU" message
-      if (cmd[1] == 'U') {
-	WiThrottle::findUniqThrottle(clientid, (char *)cmd+2);
-	StringFormatter::send(stream,F("VN2.0\nHTDCC-EX\nRL0\n"));
-	StringFormatter::send(stream,F("HtDCC-EX v%S, %S, %S, %S\n"), F(VERSION), F(ARDUINO_TYPE), DCC::getMotorShieldName(), F(GITHUB_SHA));
-	StringFormatter::send(stream,F("PTT]\\[Turnouts}|{Turnout]\\[THROW}|{2]\\[CLOSE}|{4\n"));
-	StringFormatter::send(stream,F("PPA%x\n"),TrackManager::getMainPower()==POWERMODE::ON);
-#ifdef EXRAIL_ACTIVE
-  StringFormatter::send(stream,F("RL%d"), RMFT2::rosterNameCount);
-  for (int16_t r=0;r<RMFT2::rosterNameCount;r++) {
-      int16_t cabid=GETFLASHW(RMFT2::rosterIdList+r);
-      StringFormatter::send(stream,F("]\\[%S}|{%d}|{%c"),
-      RMFT2::getRosterName(cabid),cabid,cabid<128?'S':'L');
-  }
-  stream->write('\n'); // end roster        
-#endif
-
-       
-	// set heartbeat to 5 seconds because we need to sync the metadata (1 second is too short!)
-  StringFormatter::send(stream,F("*%d\n"), HEARTBEAT_SECONDS/2);
-	initSent = true;
-      }
-      break;           
-    case 'Q': // 
-      LOOPLOCOS('*', -1) { // tell client to drop any locos still assigned to this WiThrottle
-	if (myLocos[loco].throttle!='\0') {
-	  StringFormatter::send(stream, F("M%c-%c%d<;>\n"), myLocos[loco].throttle, LorS(myLocos[loco].cab), myLocos[loco].cab);
-	}
-      }
-      if (Diag::WITHROTTLE) DIAG(F("%l WiThrottle(%d) Quit"),millis(),clientid);
-      delete this; 
-      break;           
     }
-    // skip over cmd until 0 or past \r or \n
-    while(*cmd !='\0' && *cmd != '\r' && *cmd !='\n') cmd++;
-    if (*cmd!='\0') cmd++; // skip \r or \n  
-  }           
-}
-
-int WiThrottle::getInt(byte * cmd) {
-  int i=0;
-  bool negate=cmd[0]=='-';
-  if (negate) cmd++;
-  while (cmd[0]>='0' && cmd[0]<='9') {
-    i=i*10 + (cmd[0]-'0');
-    cmd++;
   }
-  if (negate) i=0-i;
-  return i ;    
+
+   while (cmd[0]) {
+   switch (cmd[0]) {
+       case '*':  // heartbeat control
+            if (cmd[1]=='+') heartBeatEnable=true;
+            else if (cmd[1]=='-') heartBeatEnable=false;
+            break;
+       case 'P':  
+            if (cmd[1]=='P' && cmd[2]=='A' )  {  //PPA power mode 
+              DCCWaveform::mainTrack.setPowerMode(cmd[3]=='1'?POWERMODE::ON:POWERMODE::OFF);
+	      if (MotorDriver::commonFaultPin) // commonFaultPin prevents individual track handling
+		DCCWaveform::progTrack.setPowerMode(cmd[3]=='1'?POWERMODE::ON:POWERMODE::OFF);
+              StringFormatter::send(stream,F("PPA%x\n"),DCCWaveform::mainTrack.getPowerMode()==POWERMODE::ON);
+              lastPowerState = (DCCWaveform::mainTrack.getPowerMode()==POWERMODE::ON); //remember power state sent for comparison later
+            }
+#if defined(RMFT_ACTIVE)
+            else if (cmd[1]=='R' && cmd[2]=='A' && cmd[3]=='2' ) { // Route activate
+              // exrail routes are RA2Rn , Animations are RA2An 
+              int route=getInt(cmd+5);
+              uint16_t cab=cmd[4]=='A' ? mostRecentCab : 0; 
+              RMFT2::createNewTask(route, cab);
+            }
+#endif    
+            else if (cmd[1]=='T' && cmd[2]=='A') { // PTA accessory toggle 
+                int id=getInt(cmd+4); 
+                Turnout * tt=Turnout::get(id);
+                if (!tt) {
+                  // If turnout does not exist, create it
+                  int addr = ((id - 1) / 4) + 1;
+                  int subaddr = (id - 1) % 4;
+                  Turnout::createDCC(id,addr,subaddr);
+                  StringFormatter::send(stream, F("HmTurnout %d created\n"),id);
+                }
+                switch (cmd[3]) {
+		case 'T':
+		  Turnout::setClosed(id,false);
+		  break;
+		case 'C':
+		  Turnout::setClosed(id,true);
+		  break;
+		case '2':
+		  Turnout::setClosed(id,!Turnout::isClosed(id));
+		  break;
+		default :
+		  Turnout::setClosed(id,true);
+		  break;
+                }
+		            StringFormatter::send(stream, F("PTA%c%d\n"),Turnout::isClosed(id)?'2':'4',id );
+		        }
+            break;
+       case 'N':  // Heartbeat (2), only send if connection completed by 'HU' message
+            if (initSent) { 
+              StringFormatter::send(stream, F("*%d\n"),HEARTBEAT_SECONDS); // return timeout value
+            }
+            break;
+       case 'M': // multithrottle
+            multithrottle(stream, cmd); 
+            break;
+       case 'H': // send initial connection info after receiving "HU" message
+            if (cmd[1] == 'U') {
+              StringFormatter::send(stream,F("VN2.0\nHTDCC-EX\nRL0\n"));
+              StringFormatter::send(stream,F("HtDCC-EX v%S, %S, %S, %S\n"), F(VERSION), F(ARDUINO_TYPE), DCC::getMotorShieldName(), F(GITHUB_SHA));
+              StringFormatter::send(stream,F("PTT]\\[Turnouts}|{Turnout]\\[THROW}|{2]\\[CLOSE}|{4\n"));
+              StringFormatter::send(stream,F("PPA%x\n"),DCCWaveform::mainTrack.getPowerMode()==POWERMODE::ON);
+              lastPowerState = (DCCWaveform::mainTrack.getPowerMode()==POWERMODE::ON); //remember power state sent for comparison later
+              StringFormatter::send(stream,F("*%d\n"),HEARTBEAT_SECONDS);
+              initSent = true;
+            }
+            break;           
+      case 'Q': // 
+            LOOPLOCOS('*', -1) { // tell client to drop any locos still assigned to this WiThrottle
+              if (myLocos[loco].throttle!='\0') {
+                StringFormatter::send(stream, F("M%c-%c%d<;>\n"), myLocos[loco].throttle, LorS(myLocos[loco].cab), myLocos[loco].cab);
+              }
+            }
+            if (Diag::WITHROTTLE) DIAG(F("%l WiThrottle(%d) Quit"),millis(),clientid);
+            delete this; 
+            break;           
+   }
+   // skip over cmd until 0 or past \r or \n
+   while(*cmd !='\0' && *cmd != '\r' && *cmd !='\n') cmd++;
+   if (*cmd!='\0') cmd++; // skip \r or \n  
+   }           
+}
+int WiThrottle::getInt(byte * cmd) {
+    int i=0;
+    while (cmd[0]>='0' && cmd[0]<='9') {
+      i=i*10 + (cmd[0]-'0');
+      cmd++;
+    }
+    return i;    
 }
 
 int WiThrottle::getLocoId(byte * cmd) {
@@ -335,190 +236,143 @@ int WiThrottle::getLocoId(byte * cmd) {
 }
 
 void WiThrottle::multithrottle(RingStream * stream, byte * cmd){ 
-  char throttleChar=cmd[1];
-  int locoid=getLocoId(cmd+3); // -1 for *
-  byte * aval=cmd;
-  while(*aval !=';' && *aval !='\0') aval++;
-  if (*aval) aval+=2;  // skip ;>
-  
-  //       DIAG(F("Multithrottle aval=%c cab=%d"), aval[0],locoid);    
-  switch(cmd[2]) {
-  case '+':  // add loco request
-    if (cmd[3]=='*') { 
-      // M+* means get loco from prog track, then join tracks ready to drive away
-      // Stash the things the callback will need later
-      stashStream= stream;
-      stashClient=stream->peekTargetMark();
-      stashThrottleChar=throttleChar;
-      stashInstance=this;
-      // ask DCC to call us back when the loco id has been read
-      DCC::getLocoId(getLocoCallback); // will remove any previous join                    
-      return; // return nothing in stream as response is sent later in the callback 
-    }
-    //return error if address zero requested
-    if (locoid==0) { 
-      StringFormatter::send(stream, F("HMAddress '0' not supported!\n"), cmd[3] ,locoid);                    
-      return;
-    }
-    //return error if L or S from request doesn't match DCC++ assumptions
-    if (cmd[3] != LorS(locoid)) { 
-      StringFormatter::send(stream, F("HMLength '%c' not valid for %d!\n"), cmd[3] ,locoid);                    
-      return;
-    }
-    //use first empty "slot" on this client's list, will be added to DCC registration list
-    for (int loco=0;loco<MAX_MY_LOCO;loco++) {
-      if (myLocos[loco].throttle=='\0') { 
-	myLocos[loco].throttle=throttleChar;
-	myLocos[loco].cab=locoid; 
-	myLocos[loco].functionMap=DCC::getFunctionMap(locoid); 
-	myLocos[loco].broadcastPending=true; // means speed/dir will be sent later
-	mostRecentCab=locoid;
-	StringFormatter::send(stream, F("M%c+%c%d<;>\n"), throttleChar, cmd[3] ,locoid); //tell client to add loco
-	int fkeys=29;
-	myLocos[loco].functionToggles=1<<2; // F2 (HORN)  is a non-toggle
-        
-#ifdef EXRAIL_ACTIVE
-	const char * functionNames=(char *) RMFT2::getRosterFunctions(locoid);
-	if (!functionNames) {
-	  // no roster, use presets as above 
-	}
-	else if (GETFLASH(functionNames)=='\0') {
-	  // "" = Roster but no functions given
-	  fkeys=0;
-	}  
-	else {
-	  // we have function names... 
-	  // scan names list emitting names, counting functions and 
-	  // flagging non-toggling things like horn.
-	  myLocos[loco].functionToggles =0;
-	  StringFormatter::send(stream, F("M%cL%c%d<;>]\\["), throttleChar,cmd[3],locoid);   
-	  fkeys=0;
-	  bool firstchar=true;
-	  for (int fx=0;;fx++) {
-	    char c=GETFLASH(functionNames+fx);
-	    if (c=='\0') {
-	      fkeys++;
-	      break;
-	    }
-	    if (c=='/') {
-	      fkeys++;
-	      StringFormatter::send(stream,F("]\\["));
-	      firstchar=true;
-	    }
-	    else if (firstchar && c=='*') {
-	      myLocos[loco].functionToggles |= 1UL<<fkeys;
-	      firstchar=false;
-	    } 
-	    else {
-	      firstchar=false;
-	      stream->write(c);
-	    }
-	  }
-	  StringFormatter::send(stream,F("\n"));
-	}
-        
-#endif
-	
-	for(int fKey=0; fKey<fkeys; fKey++) { 
+          char throttleChar=cmd[1];
+          int locoid=getLocoId(cmd+3); // -1 for *
+          byte * aval=cmd;
+          while(*aval !=';' && *aval !='\0') aval++;
+          if (*aval) aval+=2;  // skip ;>
+
+//       DIAG(F("Multithrottle aval=%c cab=%d"), aval[0],locoid);    
+       switch(cmd[2]) {
+          case '+':  // add loco request
+                if (cmd[3]=='*') { 
+                  // M+* means get loco from prog track, then join tracks ready to drive away
+                  // Stash the things the callback will need later
+                  stashStream= stream;
+                  stashClient=stream->peekTargetMark();
+                  stashThrottleChar=throttleChar;
+                  stashInstance=this;
+                  // ask DCC to call us back when the loco id has been read
+                  DCC::getLocoId(getLocoCallback); // will remove any previous join                    
+                  return; // return nothing in stream as response is sent later in the callback 
+                }
+                //return error if address zero requested
+                if (locoid==0) { 
+                  StringFormatter::send(stream, F("HMAddress '0' not supported!\n"), cmd[3] ,locoid);                    
+                  return;
+                }
+                //return error if L or S from request doesn't match DCC++ assumptions
+                if (cmd[3] != LorS(locoid)) { 
+                  StringFormatter::send(stream, F("HMLength '%c' not valid for %d!\n"), cmd[3] ,locoid);                    
+                  return;
+                }
+                //use first empty "slot" on this client's list, will be added to DCC registration list
+                for (int loco=0;loco<MAX_MY_LOCO;loco++) {
+                  if (myLocos[loco].throttle=='\0') { 
+                    myLocos[loco].throttle=throttleChar;
+                    myLocos[loco].cab=locoid;
+                    mostRecentCab=locoid;
+                    StringFormatter::send(stream, F("M%c+%c%d<;>\n"), throttleChar, cmd[3] ,locoid); //tell client to add loco
+                    //Get known Fn states from DCC 
+                    for(int fKey=0; fKey<=28; fKey++) { 
                       int fstate=DCC::getFn(locoid,fKey);
-                      if (fstate>=0) StringFormatter::send(stream,F("M%cA%c%d<;>F%d%d\n"),throttleChar,cmd[3],locoid,fstate,fKey);                     
-	}
-	//speed and direction will be published at next broadcast cycle
-	StringFormatter::send(stream, F("M%cA%c%d<;>s1\n"), throttleChar, cmd[3], locoid); //default speed step 128
-	return;
-      }
-    }
-    StringFormatter::send(stream, F("HMMax locos (%d) exceeded, %d not added!\n"), MAX_MY_LOCO ,locoid);                    
-    break;
-  case '-': // remove loco(s) from this client (leave in DCC registration)
-    LOOPLOCOS(throttleChar, locoid) {
-      myLocos[loco].throttle='\0';
-      StringFormatter::send(stream, F("M%c-%c%d<;>\n"), throttleChar, LorS(myLocos[loco].cab), myLocos[loco].cab);
-    }
-    
-    break;
-  case 'A':
-    locoAction(stream,aval, throttleChar, locoid);
-  }
+                        if (fstate>=0) StringFormatter::send(stream,F("M%cA%c%d<;>F%d%d\n"),throttleChar,cmd[3],locoid,fstate,fKey);                     
+                    }
+                    StringFormatter::send(stream, F("M%cA%c%d<;>V%d\n"), throttleChar, cmd[3], locoid, DCCToWiTSpeed(DCC::getThrottleSpeed(locoid)));
+                    StringFormatter::send(stream, F("M%cA%c%d<;>R%d\n"), throttleChar, cmd[3], locoid, DCC::getThrottleDirection(locoid));
+                    StringFormatter::send(stream, F("M%cA%c%d<;>s1\n"), throttleChar, cmd[3], locoid); //default speed step 128
+                    return;
+                  }
+               }
+               StringFormatter::send(stream, F("HMMax locos (%d) exceeded, %d not added!\n"), MAX_MY_LOCO ,locoid);                    
+               break;
+          case '-': // remove loco(s) from this client (leave in DCC registration)
+                 LOOPLOCOS(throttleChar, locoid) {
+                     myLocos[loco].throttle='\0';
+                     StringFormatter::send(stream, F("M%c-%c%d<;>\n"), throttleChar, LorS(myLocos[loco].cab), myLocos[loco].cab);
+                  }
+            
+            break;
+          case 'A':
+              locoAction(stream,aval, throttleChar, locoid);
+            }
 }
 
 void WiThrottle::locoAction(RingStream * stream, byte* aval, char throttleChar, int cab){
-  // Note cab=-1 for all cabs in the consist called throttleChar.  
-  //    DIAG(F("Loco Action aval=%c%c throttleChar=%c, cab=%d"), aval[0],aval[1],throttleChar, cab);
-  (void) stream;
-  switch (aval[0]) {
-  case 'V':  // Vspeed
-    { 
-      int witSpeed=getInt(aval+1);
-      LOOPLOCOS(throttleChar, cab) {
-	mostRecentCab=myLocos[loco].cab;
-	DCC::setThrottle(myLocos[loco].cab, WiTToDCCSpeed(witSpeed), DCC::getThrottleDirection(myLocos[loco].cab));
-	// SetThrottle will cause speed change broadcast
-      }
-    } 
-    break;
-  case 'F': // Function key pressed/released
-    {  
-      bool pressed=aval[1]=='1';
-      int fKey = getInt(aval+2);
-      LOOPLOCOS(throttleChar, cab) {
-	bool unsetOnRelease = myLocos[loco].functionToggles & (1L<<fKey);
-	if (unsetOnRelease) DCC::setFn(myLocos[loco].cab,fKey, pressed);
-	else if (pressed)  DCC::changeFn(myLocos[loco].cab, fKey);
-      }
-      break;  
-    }
-  case 'q':
-    if (aval[1]=='V' || aval[1]=='R' ) {   //qV or qR
-      // just flag the loco for broadcast and it will happen.
-      bool foundone = false;
-      LOOPLOCOS(throttleChar, cab) {
-	foundone = true;
-	myLocos[loco].broadcastPending=true;
-      }
-      if (!foundone)
-	StringFormatter::send(stream,F("HMCS loco list empty\n"));
-    }     
-    break;    
-  case 'R':
-    { 
-      bool forward=aval[1]!='0';
-      LOOPLOCOS(throttleChar, cab) {
-	mostRecentCab=myLocos[loco].cab;
-	int8_t speed = DCC::getThrottleSpeed(myLocos[loco].cab);
-	if (speed < 0) //can not find any speed for this cab
-	  speed = 0;
-	DCC::setThrottle(myLocos[loco].cab, speed, forward);
-	// setThrottle will cause a broadcast so notification will be sent
-      }
-    }        
-    break;      
-  case 'X':
-    //Emergency Stop  (speed code 1)
-    LOOPLOCOS(throttleChar, cab) {
-      DCC::setThrottle(myLocos[loco].cab, 1, DCC::getThrottleDirection(myLocos[loco].cab));
-      // setThrottle will cause a broadcast so notification will be sent
-    }
-    break;
-  case 'I': // Idle, set speed to 0
-  case 'Q': // Quit, set speed to 0
-    LOOPLOCOS(throttleChar, cab) {
-      mostRecentCab=myLocos[loco].cab;
-      DCC::setThrottle(myLocos[loco].cab, 0, DCC::getThrottleDirection(myLocos[loco].cab));
-      // setThrottle will cause a broadcast so notification will be sent
-    }
-    break;
-  }               
+    // Note cab=-1 for all cabs in the consist called throttleChar.  
+//    DIAG(F("Loco Action aval=%c%c throttleChar=%c, cab=%d"), aval[0],aval[1],throttleChar, cab);
+     switch (aval[0]) {
+           case 'V':  // Vspeed
+             { 
+              int witSpeed=getInt(aval+1);
+              LOOPLOCOS(throttleChar, cab) {
+                mostRecentCab=myLocos[loco].cab;
+                DCC::setThrottle(myLocos[loco].cab, WiTToDCCSpeed(witSpeed), DCC::getThrottleDirection(myLocos[loco].cab));
+                StringFormatter::send(stream,F("M%cA%c%d<;>V%d\n"), throttleChar, LorS(myLocos[loco].cab), myLocos[loco].cab, witSpeed);
+                }
+             } 
+            break;
+           case 'F': //F onOff function
+              {
+		            bool funcstate;
+                bool pressed=aval[1]=='1';
+                int fKey = getInt(aval+2);
+                LOOPLOCOS(throttleChar, cab) {
+		              funcstate = DCC::changeFn(myLocos[loco].cab, fKey, pressed);
+		              if(funcstate==0 || funcstate==1)
+			              StringFormatter::send(stream,F("M%cA%c%d<;>F%d%d\n"), throttleChar, LorS(myLocos[loco].cab), 
+						          myLocos[loco].cab, funcstate, fKey);
+		              }
+                }
+                break;  
+            case 'q':
+                if (aval[1]=='V') {   //qV
+                  LOOPLOCOS(throttleChar, cab) {              
+                    StringFormatter::send(stream,F("M%cA%c%d<;>V%d\n"), throttleChar, LorS(myLocos[loco].cab), myLocos[loco].cab, DCCToWiTSpeed(DCC::getThrottleSpeed(myLocos[loco].cab)));
+                  }              
+                }
+                else if (aval[1]=='R') { // qR
+                  LOOPLOCOS(throttleChar, cab) {              
+                    StringFormatter::send(stream,F("M%cA%c%d<;>R%d\n"), throttleChar, LorS(myLocos[loco].cab), myLocos[loco].cab, DCC::getThrottleDirection(myLocos[loco].cab));
+                  }             
+                }     
+            break;    
+            case 'R':
+            { 
+              bool forward=aval[1]!='0';
+              LOOPLOCOS(throttleChar, cab) {
+                mostRecentCab=myLocos[loco].cab;
+                DCC::setThrottle(myLocos[loco].cab, DCC::getThrottleSpeed(myLocos[loco].cab), forward);
+                StringFormatter::send(stream,F("M%cA%c%d<;>R%d\n"), throttleChar, LorS(myLocos[loco].cab), myLocos[loco].cab, forward);
+              }
+            }        
+            break;      
+            case 'X':
+              //Emergency Stop  (speed code 1)
+              LOOPLOCOS(throttleChar, cab) {
+                DCC::setThrottle(myLocos[loco].cab, 1, DCC::getThrottleDirection(myLocos[loco].cab));
+                StringFormatter::send(stream,F("M%cA%c%d<;>V%d\n"), throttleChar, LorS(myLocos[loco].cab), myLocos[loco].cab, -1);
+              }
+              break;
+            case 'I': // Idle, set speed to 0
+            case 'Q': // Quit, set speed to 0
+              LOOPLOCOS(throttleChar, cab) {
+                mostRecentCab=myLocos[loco].cab;
+                DCC::setThrottle(myLocos[loco].cab, 0, DCC::getThrottleDirection(myLocos[loco].cab));
+                StringFormatter::send(stream,F("M%cA%c%d<;>V%d\n"), throttleChar, LorS(myLocos[loco].cab), myLocos[loco].cab, 0);
+              }
+              break;
+            }               
 }
 
-// convert between DCC++ speed values and WiThrottle speed values
+  // convert between DCC++ speed values and WiThrottle speed values
 int WiThrottle::DCCToWiTSpeed(int DCCSpeed) {
   if (DCCSpeed == 0) return 0; //stop is stop
   if (DCCSpeed == 1) return -1; //eStop value
   return DCCSpeed - 1; //offset others by 1
 }
 
-// convert between WiThrottle speed values and DCC++ speed values
+  // convert between WiThrottle speed values and DCC++ speed values
 int WiThrottle::WiTToDCCSpeed(int WiTSpeed) {
   if (WiTSpeed == 0) return 0;  //stop is stop
   if (WiTSpeed == -1) return 1; //eStop value
@@ -526,123 +380,54 @@ int WiThrottle::WiTToDCCSpeed(int WiTSpeed) {
 }
 
 void WiThrottle::loop(RingStream * stream) {
-  // for each WiThrottle, check the heartbeat and broadcast needed
+  // for each WiThrottle, check the heartbeat
   for (WiThrottle* wt=firstThrottle; wt!=NULL ; wt=wt->nextThrottle) 
-    wt->checkHeartbeat(stream);
-  
+     wt->checkHeartbeat();
+
+   // TODO... any broadcasts to be done 
+   (void)stream; 
+   /* MUST follow this model in  this loop. 
+    *   stream->mark();
+    *   send 1 digit client id, and any data 
+    *   stream->commit() 
+     */
 
 }
 
-void WiThrottle::checkHeartbeat(RingStream * stream) {
+void WiThrottle::checkHeartbeat() {
   // if eStop time passed... eStop any locos still assigned to this client and then drop the connection
   if(heartBeatEnable && (millis()-heartBeat > ESTOP_SECONDS*1000)) {
-    if (Diag::WITHROTTLE)  DIAG(F("%l WiThrottle(%d) eStop(%ds) timeout, drop connection"), millis(), clientid, ESTOP_SECONDS);
+  if (Diag::WITHROTTLE)  DIAG(F("%l WiThrottle(%d) eStop(%ds) timeout, drop connection"), millis(), clientid, ESTOP_SECONDS);
     LOOPLOCOS('*', -1) { 
       if (myLocos[loco].throttle!='\0') {
         if (Diag::WITHROTTLE) DIAG(F("%l  eStopping cab %d"),millis(),myLocos[loco].cab);
         DCC::setThrottle(myLocos[loco].cab, 1, DCC::getThrottleDirection(myLocos[loco].cab)); // speed 1 is eStop
-	heartBeat=millis(); // We have just stopped everyting, we don't need to do that again at next loop.
       }
     }
-    //haba no, not necessary the only throttle and it may come back
-    //delete this;
-    return;
-  }
-   
-   // send any outstanding speed/direction/function changes for this clients locos
-   // Changes may have been caused by this client, or another non-Withrottle or Exrail
-  bool streamHasBeenMarked=false; 
-  LOOPLOCOS('*', -1) { 
-    if (myLocos[loco].throttle!='\0' && myLocos[loco].broadcastPending) {
-      if (!streamHasBeenMarked) {
-	stream->mark(clientid);
-	streamHasBeenMarked=true;
-      }
-      myLocos[loco].broadcastPending=false;
-      int cab=myLocos[loco].cab;
-      char lors=LorS(cab);
-      char throttle=myLocos[loco].throttle;
-      StringFormatter::send(stream,F("M%cA%c%d<;>V%d\n"),
-			    throttle, lors , cab, DCCToWiTSpeed(DCC::getThrottleSpeed(cab)));
-      StringFormatter::send(stream,F("M%cA%c%d<;>R%d\n"), 
-			    throttle, lors , cab, DCC::getThrottleDirection(cab));
-      
-      // compare the DCC functionmap with the local copy and send changes  
-      uint32_t dccFunctionMap=DCC::getFunctionMap(cab);
-      uint32_t myFunctionMap=myLocos[loco].functionMap;
-      myLocos[loco].functionMap=dccFunctionMap;
-      
-      // loop the maps sending any bit changed
-      // Loop is terminated as soon as no changes are left
-      for (byte fn=0;dccFunctionMap!=myFunctionMap;fn++) {
-	if ((dccFunctionMap&1) != (myFunctionMap&1)) {
-	  StringFormatter::send(stream,F("M%cA%c%d<;>F%c%d\n"),
-				throttle, lors , cab, (dccFunctionMap&1)?'1':'0',fn);
-	} 
-	// shift just checked bit off end of both maps
-	dccFunctionMap>>=1;
-	myFunctionMap>>=1;
-      } 
-    }
-    }
-  if (streamHasBeenMarked)   stream->commit();     
+    delete this;
+   }
 }
 
-void WiThrottle::markForBroadcast(int cab) {
-  for (WiThrottle* wt=firstThrottle; wt!=NULL ; wt=wt->nextThrottle) 
-      wt->markForBroadcast2(cab);
-}
-void WiThrottle::markForBroadcast2(int cab) {
-  LOOPLOCOS('*', cab) { 
-    myLocos[loco].broadcastPending=true;
-  }
-}
-
-
 char WiThrottle::LorS(int cab) {
-  return (cab<=HIGHEST_SHORT_ADDR)?'S':'L';
+    return (cab<127)?'S':'L';
 }
 
 // Drive Away feature. Callback handling
-
+ 
 RingStream * WiThrottle::stashStream;
 WiThrottle * WiThrottle::stashInstance;
 byte         WiThrottle::stashClient;
 char         WiThrottle::stashThrottleChar;
 
 void WiThrottle::getLocoCallback(int16_t locoid) {
-  //DIAG(F("LocoCallback mark client %d"), stashClient);
   stashStream->mark(stashClient);
-  
-  if (locoid<=0) {
-    StringFormatter::send(stashStream,F("HMNo loco found on prog track\n"));
-    //DIAG(F("LocoCallback commit (noloco)"));
-    stashStream->commit();                  // done here, commit and return
-    return;
+  if (locoid<0) StringFormatter::send(stashStream,F("HMNo loco found on prog track\n"));
+  else {
+    char addcmd[20]={'M',stashThrottleChar,'+',LorS(locoid) };
+    itoa(locoid,addcmd+4,10);
+    stashInstance->multithrottle(stashStream, (byte *)addcmd);
+    DCCWaveform::progTrack.setPowerMode(POWERMODE::ON);
+    DCC::setProgTrackSyncMain(true);  // <1 JOIN> so we can drive loco away
   }
-
-  // short or long
-  char addrchar;
-  if (locoid & LONG_ADDR_MARKER) {          // maker bit indicates long addr
-    locoid = locoid ^ LONG_ADDR_MARKER;     // remove marker bit to get real long addr
-    if (locoid <= HIGHEST_SHORT_ADDR ) {    // out of range for long addr
-      StringFormatter::send(stashStream,F("HMLong addr %d <= %d unsupported\n"), locoid, HIGHEST_SHORT_ADDR);
-      //DIAG(F("LocoCallback commit (error)"));
-      stashStream->commit();                // done here, commit and return
-      return;
-    }
-    addrchar = 'L';
-  } else {
-    addrchar = 'S';
-  }
-  
-  char addcmd[20]={'M',stashThrottleChar,'+', addrchar};
-  itoa(locoid,addcmd+4,10);
-  stashInstance->multithrottle(stashStream, (byte *)addcmd);
-  TrackManager::setMainPower(POWERMODE::ON);
-  TrackManager::setJoin(true);          // <1 JOIN> so we can drive loco away
-  //DIAG(F("LocoCallback commit success"));
   stashStream->commit();
-  CommandDistributor::broadcastPower();
-
 }

WiThrottle.h

@@ -1,7 +1,5 @@
 /*
- *  © 2021 Mike S
- *  © 2020-2021 Chris Harlow
- *  All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
  *  
  *  This file is part of Asbelos DCC API
  *
@@ -26,9 +24,6 @@
 struct MYLOCO {
     char throttle; //indicates which throttle letter on client, often '0','1' or '2'
     int cab; //address of this loco
-    bool broadcastPending;
-    uint32_t functionMap;
-    uint32_t functionToggles;
 };
 
 class WiThrottle {
@@ -36,17 +31,14 @@ class WiThrottle {
     static void loop(RingStream * stream);
     void parse(RingStream * stream, byte * cmd);
     static WiThrottle* getThrottle( int wifiClient); 
-    static void markForBroadcast(int cab);
-    static void forget(byte clientId);
-    static void findUniqThrottle(int id, char *u);
-
+    
   private: 
     WiThrottle( int wifiClientId);
     ~WiThrottle();
    
       static const int MAX_MY_LOCO=10;      // maximum number of locos assigned to a single client
-      static const int HEARTBEAT_SECONDS=10; // heartbeat at 4secs to provide messaging transport
-      static const int ESTOP_SECONDS=20;     // eStop if no incoming messages for more than 8secs
+      static const int HEARTBEAT_SECONDS=4; // heartbeat at 4secs to provide messaging transport
+      static const int ESTOP_SECONDS=8;     // eStop if no incoming messages for more than 8secs
       static WiThrottle* firstThrottle;
       static int getInt(byte * cmd);
       static int getLocoId(byte * cmd);
@@ -56,7 +48,6 @@ class WiThrottle {
       bool areYouUsingThrottle(int cab);
       WiThrottle* nextThrottle;
       int clientid;
-      char uniq[17] = "";
        
       MYLOCO myLocos[MAX_MY_LOCO];   
       bool heartBeatEnable;
@@ -66,14 +57,13 @@ class WiThrottle {
       uint16_t mostRecentCab;
       int turnoutListHash;  // used to check for changes to turnout list
       bool lastPowerState;  // last power state sent to this client
-
       int DCCToWiTSpeed(int DCCSpeed);
       int WiTToDCCSpeed(int WiTSpeed);
       void multithrottle(RingStream * stream, byte * cmd);
       void locoAction(RingStream * stream, byte* aval, char throttleChar, int cab);
       void accessory(RingStream *, byte* cmd);
-      void checkHeartbeat(RingStream * stream); 
-      void markForBroadcast2(int cab);
+      void checkHeartbeat(); 
+
        // callback stuff to support prog track acquire
        static RingStream * stashStream;
        static WiThrottle * stashInstance;

WifiESP32.cpp

@@ -1,360 +0,0 @@
-/*
-    © 2021, Harald Barth.
-
-    This file is part of CommandStation-EX
-
-    This is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    It is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#if defined(ARDUINO_ARCH_ESP32)
-#include <vector>
-#include "defines.h"
-#include <WiFi.h>
-#include "esp_wifi.h"
-#include "WifiESP32.h"
-#include "DIAG.h"
-#include "RingStream.h"
-#include "CommandDistributor.h"
-#include "WiThrottle.h"
-/*
-#include "soc/rtc_wdt.h"
-#include "esp_task_wdt.h"
-*/
-
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
-void feedTheDog0(){
-  // feed dog 0
-  TIMERG0.wdt_wprotect=TIMG_WDT_WKEY_VALUE; // write enable
-  TIMERG0.wdt_feed=1;                       // feed dog
-  TIMERG0.wdt_wprotect=0;                   // write protect
-  // feed dog 1
-  //TIMERG1.wdt_wprotect=TIMG_WDT_WKEY_VALUE; // write enable
-  //TIMERG1.wdt_feed=1;                       // feed dog
-  //TIMERG1.wdt_wprotect=0;                   // write protect
-}
-
-/*
-void enableCoreWDT(byte core){
-  TaskHandle_t idle = xTaskGetIdleTaskHandleForCPU(core);
-  if(idle == NULL){
-    DIAG(F("Get idle rask on core %d failed"),core);
-  } else {
-    if(esp_task_wdt_add(idle) != ESP_OK){
-      DIAG(F("Failed to add Core %d IDLE task to WDT"),core);
-    } else {
-      DIAG(F("Added Core %d IDLE task to WDT"),core);
-    }
-  }
-}
-
-void disableCoreWDT(byte core){
-    TaskHandle_t idle = xTaskGetIdleTaskHandleForCPU(core);
-    if(idle == NULL || esp_task_wdt_delete(idle) != ESP_OK){
-      DIAG(F("Failed to remove Core %d IDLE task from WDT"),core);
-    }
-}
-*/
-
-class NetworkClient {
-public:
-  NetworkClient(WiFiClient c) {
-    wifi = c;
-  };
-  bool ok() {
-    return (inUse && wifi.connected());
-  };
-  bool recycle(WiFiClient c) {
-
-    if (inUse == true) return false;
-
-    // return false here until we have
-    // implemented a LRU timer
-    // if (LRU too recent) return false;
-    return false;
-
-    wifi = c;
-    inUse = true;
-    return true;
-  };
-  WiFiClient wifi;
-  bool inUse = true;
-};
-
-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;
-
-#ifdef WIFI_TASK_ON_CORE0
-void wifiLoop(void *){
-  for(;;){
-    WifiESP::loop();
-  }
-}
-#endif
-
-bool WifiESP::setup(const char *SSid,
-                    const char *password,
-                    const char *hostname,
-                    int port,
-                    const byte channel) {
-  bool havePassword = true;
-  bool haveSSID = true;
-  bool wifiUp = false;
-  uint8_t tries = 40;
-
-  //#ifdef SERIAL_BT_COMMANDS
-  //return false;
-  //#endif
-
-  // tests
-  //  enableCoreWDT(1);
-  //  disableCoreWDT(0);
-
-  // clean start
-  WiFi.mode(WIFI_STA);
-  WiFi.disconnect(true);
-  // differnet settings that did not improve for haba
-  // WiFi.useStaticBuffers(true);
-  // WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN);
-  // WiFi.setSortMethod(WIFI_CONNECT_AP_BY_SECURITY);
-
-  const char *yourNetwork = "Your network ";
-  if (strncmp(yourNetwork, SSid, 13) == 0 || strncmp("", SSid, 13) == 0)
-    haveSSID = false;
-  if (strncmp(yourNetwork, password, 13) == 0 || strncmp("", password, 13) == 0)
-    havePassword = false;
-
-  if (haveSSID && havePassword) {
-    WiFi.mode(WIFI_STA);
-#ifdef SERIAL_BT_COMMANDS
-    WiFi.setSleep(true);
-#else
-    WiFi.setSleep(false);
-#endif
-    WiFi.setAutoReconnect(true);
-    WiFi.begin(SSid, password);
-    while (WiFi.status() != WL_CONNECTED && tries) {
-      Serial.print('.');
-      tries--;
-      delay(500);
-    }
-    if (WiFi.status() == WL_CONNECTED) {
-      DIAG(F("Wifi STA IP %s"),WiFi.localIP().toString().c_str());
-      wifiUp = true;
-    } else {
-      DIAG(F("Could not connect to Wifi SSID %s"),SSid);
-      DIAG(F("Forcing one more Wifi restart"));
-      esp_wifi_start();
-      esp_wifi_connect();
-      tries=40;
-      while (WiFi.status() != WL_CONNECTED && tries) {
-	Serial.print('.');
-	tries--;
-	delay(500);
-      }
-      if (WiFi.status() == WL_CONNECTED) {
-	DIAG(F("Wifi STA IP 2nd try %s"),WiFi.localIP().toString().c_str());
-	wifiUp = true;
-      } else {
-	DIAG(F("Wifi STA mode FAIL. Will revert to AP mode"));
-	haveSSID=false;
-      }
-    }
-  }
-  if (!haveSSID) {
-    // prepare all strings
-    String strSSID("DCC_");
-    String strPass("PASS_");
-    String strMac = WiFi.macAddress();
-    strMac.remove(0,9);
-    strMac.replace(":","");
-    strMac.replace(":","");
-    strSSID.concat(strMac);
-    strPass.concat(strMac);
-
-    WiFi.mode(WIFI_AP);
-#ifdef SERIAL_BT_COMMANDS
-    WiFi.setSleep(true);
-#else
-    WiFi.setSleep(false);
-#endif
-    if (WiFi.softAP(strSSID.c_str(),
-		    havePassword ? password : strPass.c_str(),
-		    channel, false, 8)) {
-      DIAG(F("Wifi AP SSID %s PASS %s"),strSSID.c_str(),havePassword ? password : strPass.c_str());
-      DIAG(F("Wifi AP IP %s"),WiFi.softAPIP().toString().c_str());
-      wifiUp = true;
-      APmode = true;
-    } else {
-      DIAG(F("Could not set up AP with Wifi SSID %s"),strSSID.c_str());
-    }
-  }
-
-
-  if (!wifiUp) {
-    DIAG(F("Wifi setup all fail (STA and AP mode)"));
-    // no idea to go on
-    return false;
-  }
-  server = new WiFiServer(port); // start listening on tcp port
-  server->begin();
-  // server started here
-
-#ifdef WIFI_TASK_ON_CORE0
-  //start loop task
-  if (pdPASS != xTaskCreatePinnedToCore(
-	wifiLoop, /* Task function. */
-	"wifiLoop",/* name of task.  */
-	10000,     /* Stack size of task */
-	NULL,      /* parameter of the task */
-	1,         /* priority of the task */
-	NULL,      /* Task handle to keep track of created task */
-	0)) {      /* pin task to core 0 */
-    DIAG(F("Could not create wifiLoop task"));
-    return false;
-  }
-
-  // report server started after wifiLoop creation
-  // when everything looks good
-  DIAG(F("Server starting (core 0) port %d"),port);
-#else
-  DIAG(F("Server will be started on port %d"),port);
-#endif
-  return true;
-}
-
-const char *wlerror[] = {
-			 "WL_IDLE_STATUS",
-			 "WL_NO_SSID_AVAIL",
-			 "WL_SCAN_COMPLETED",
-			 "WL_CONNECTED",
-			 "WL_CONNECT_FAILED",
-			 "WL_CONNECTION_LOST",
-			 "WL_DISCONNECTED"
-};
-
-void WifiESP::loop() {
-  int clientId; //tmp loop var
-
-  // really no good way to check for LISTEN especially in AP mode?
-  wl_status_t wlStatus;
-  if (APmode || (wlStatus = WiFi.status()) == WL_CONNECTED) {
-    // loop over all clients and remove inactive
-    for (clientId=0; clientId<clients.size(); clientId++){
-      // check if client is there and alive
-      if(clients[clientId].inUse && !clients[clientId].wifi.connected()) {
-	DIAG(F("Remove client %d"), clientId);
-	CommandDistributor::forget(clientId);
-	clients[clientId].wifi.stop();
-	clients[clientId].inUse = false;
-	//Do NOT clients.erase(clients.begin()+clientId) as
-	//that would mix up clientIds for later.
-      }
-    }
-    if (server->hasClient()) {
-      WiFiClient client;
-      while (client = server->available()) {
-	for (clientId=0; clientId<clients.size(); clientId++){
-	  if (clients[clientId].recycle(client)) {
-	    DIAG(F("Recycle client %d %s"), clientId, client.remoteIP().toString().c_str());
-	    break;
-	  }
-	}
-	if (clientId>=clients.size()) {
-	  NetworkClient nc(client);
-	  clients.push_back(nc);
-	  DIAG(F("New client %d, %s"), clientId, client.remoteIP().toString().c_str());
-	}
-      }
-    }
-    // loop over all connected clients
-    for (clientId=0; clientId<clients.size(); clientId++){
-      if(clients[clientId].ok()) {
-	int len;
-	if ((len = clients[clientId].wifi.available()) > 0) {
-	  // read data from client
-	  byte cmd[len+1];
-	  for(int i=0; i<len; i++) {
-	    cmd[i]=clients[clientId].wifi.read();
-	  }
-	  cmd[len]=0;
-	  CommandDistributor::parse(clientId,cmd,outboundRing);
-	}
-      }
-    } // all clients
-
-    WiThrottle::loop(outboundRing);
-
-    // something to write out?
-    clientId=outboundRing->read();
-    if (clientId >= 0) {
-      // We have data to send in outboundRing
-      // and we have a valid clientId.
-      // First read it out to buffer
-      // and then look if it can be sent because
-      // we can not leave it in the ring for ever
-      int count=outboundRing->count();
-      {
-	char buffer[count+1]; // one extra for '\0'
-	for(int i=0;i<count;i++) {
-	  int c = outboundRing->read();
-	  if (c >= 0) // Panic check, should never be false
-	    buffer[i] = (char)c;
-	  else {
-	    DIAG(F("Ringread fail at %d"),i);
-	    break;
-	  }
-	}
-	// buffer filled, end with '\0' so we can use it as C string
-	buffer[count]='\0';
-	if((unsigned int)clientId <= clients.size() && clients[clientId].ok()) {
-	  if (Diag::CMD || Diag::WITHROTTLE)
-	    DIAG(F("SEND %d:%s"), clientId, buffer);
-	  clients[clientId].wifi.write(buffer,count);
-	} else {
-	  DIAG(F("Unsent(%d): %s"), clientId, buffer);
-	}
-      }
-    }
-  } else if (!APmode) { // in STA mode but not connected any more
-    // kick it again
-    if (wlStatus <= 6) {
-      DIAG(F("Wifi aborted with error %s. Kicking Wifi!"), wlerror[wlStatus]);
-      esp_wifi_start();
-      esp_wifi_connect();
-      uint8_t tries=40;
-      while (WiFi.status() != WL_CONNECTED && tries) {
-	Serial.print('.');
-	tries--;
-	delay(500);
-      }
-    } else {
-      // all well, probably
-      //DIAG(F("Running BT"));
-    }
-  }
-
-  // when loop() is running on core0 we must
-  // feed the core0 wdt ourselves as yield()
-  // is not necessarily yielding to a low
-  // prio task. On core1 this is not a problem
-  // as there the wdt is disabled by the
-  // arduio IDE startup routines.
-  if (xPortGetCoreID() == 0)
-    feedTheDog0();
-  yield();
-}
-#endif //ESP32