DC via power pin 3rd part

DC via power pin 2nd part
DC via power pin 1st try
2025-07-30 19:03:44 +02:00 · 2023-02-13 20:48:48 +01:00 · 2023-02-13 17:06:33 +01:00 · 2023-02-12 23:31:13 +01:00
101 changed files with 2166 additions and 7232 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,15 @@ Release/*
 .pio/
 .vscode/
 config.h
+.vscode/*
+# mySetup.h
 mySetup.cpp
 myHal.cpp
+# myAutomation.h
 myFilter.cpp
+# myAutomation.h
+# myLayout.h
 my*.h
 !my*.example.h
-compile_commands.json
+.vscode/extensions.json
+.vscode/extensions.json
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -0,0 +1,10 @@
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -0,0 +1,12 @@
+{
+    "files.associations": {
+        "array": "cpp",
+        "deque": "cpp",
+        "string": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "string_view": "cpp",
+        "initializer_list": "cpp",
+        "cstdint": "cpp"
+    }
+}
--- a/CommandDistributor.cpp
+++ b/CommandDistributor.cpp
@@ -2,7 +2,6 @@
 *  © 2022 Harald Barth
 *  © 2020-2021 Chris Harlow
 *  © 2020 Gregor Baues
- *  © 2022 Colin Murdoch
 *  All rights reserved.
 *
 *  This file is part of CommandStation-EX
@@ -49,7 +48,7 @@ template<typename... Targs> void CommandDistributor::broadcastReply(clientType t
 // 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(&USB_SERIAL, msg...);
+  StringFormatter::send(&Serial, msg...);
 }
 #endif 

@@ -168,7 +167,7 @@ void  CommandDistributor::broadcastClockTime(int16_t time, int8_t rate) {
  // be safe for both types.
  broadcastReply(COMMAND_TYPE, F("<jC %d %d>\n"),time, rate);
 #ifdef CD_HANDLE_RING
-  broadcastReply(WITHROTTLE_TYPE, F("PFT%l<;>%d\n"), (int32_t)time*60, rate);
+  broadcastReply(WITHROTTLE_TYPE, F("PFT%d<;>%d\n"), time*60, rate);
 #endif
 }

@@ -180,7 +179,10 @@ void CommandDistributor::setClockTime(int16_t clocktime, int8_t clockrate, byte
  {
    case 1:
      if (clocktime != lastclocktime){
-        // CAH. DIAG removed because LCD does it anyway. 
+        if (Diag::CMD) {                    
+          DIAG(F("Clock Command Received"));
+          DIAG(F("Received Clock Time is: %d at rate: %d"), clocktime, clockrate);
+        }
        LCD(6,F("Clk Time:%d Sp %d"), clocktime, clockrate);
        // look for an event for this time
        RMFT2::clockEvent(clocktime,1);
@@ -205,39 +207,6 @@ int16_t CommandDistributor::retClockTime() {
 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 SABERTOOTH
-  if (Serial2 && sp->loco == SABERTOOTH) {
-    static uint8_t rampingmode = 0;
-    bool direction = (sp->speedCode & 0x80) !=0; // true for forward
-    int32_t speed = sp->speedCode & 0x7f;
-    if (speed == 1) { // emergency stop
-      if (rampingmode != 1) {
-	rampingmode = 1;
-	Serial2.print("R1: 0\r\n");
-	Serial2.print("R2: 0\r\n");
-      }
-      Serial2.print("MD: 0\r\n");
-    } else {
-      if (speed != 0) {
-        // speed is here 2 to 127
-	speed = (speed - 1) * 1625 / 100;
-	speed = speed * (direction ? 1 : -1);
-	// speed is here -2047 to 2047
-      }
-      if (rampingmode != 2) {
-	rampingmode = 2;
-	Serial2.print("R1: 2047\r\n");
-	Serial2.print("R2: 2047\r\n");
-      }
-      Serial2.print("M1: ");
-      Serial2.print(speed);
-      Serial2.print("\r\n");
-      Serial2.print("M2: ");
-      Serial2.print(speed);
-      Serial2.print("\r\n");
-    }
-  }
-#endif
 #ifdef CD_HANDLE_RING
  WiThrottle::markForBroadcast(sp->loco);
 #endif
@@ -261,10 +230,9 @@ void  CommandDistributor::broadcastPower() {
  LCD(2,F("Power %S%S"),state=='1'?F("On"):F("Off"),reason);  
 }

-void CommandDistributor::broadcastRaw(clientType type, char * msg) {
-  broadcastReply(type, F("%s"),msg);
-}
-
-void CommandDistributor::broadcastTrackState(const FSH* format,byte trackLetter,int16_t dcAddr) {
-  broadcastReply(COMMAND_TYPE, format,trackLetter,dcAddr);
+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
 }
--- a/CommandDistributor.h
+++ b/CommandDistributor.h
@@ -2,8 +2,6 @@
 *  © 2022 Harald Barth
 *  © 2020-2021 Chris Harlow
 *  © 2020 Gregor Baues
- *  © 2022 Colin Murdoch
- * 
 *  All rights reserved.
 *
 *  This file is part of CommandStation-EX
@@ -35,9 +33,8 @@
 #endif 

 class CommandDistributor {
-public:
-  enum clientType: byte {NONE_TYPE,COMMAND_TYPE,WITHROTTLE_TYPE};
 private:
+  enum clientType: byte {NONE_TYPE,COMMAND_TYPE,WITHROTTLE_TYPE};
  static void broadcastToClients(clientType type);
  static StringBuffer * broadcastBufferWriter;
  #ifdef CD_HANDLE_RING
@@ -53,8 +50,7 @@ public :
  static void setClockTime(int16_t time, int8_t rate, byte opt);
  static int16_t retClockTime();
  static void broadcastPower();
-  static void broadcastRaw(clientType type,char * msg);
-  static void broadcastTrackState(const FSH* format,byte trackLetter,int16_t dcAddr);
+  static void broadcastText(const FSH * msg);
  template<typename... Targs> static void broadcastReply(clientType type, Targs... msg);
  static void forget(byte clientId);
  
--- a/CommandStation-EX.ino
+++ b/CommandStation-EX.ino
@@ -30,7 +30,6 @@
 *  © 2021 Neil McKechnie
 *  © 2020-2021 Chris Harlow, Harald Barth, David Cutting,
 *  Fred Decker, Gregor Baues, Anthony W - Dayton
- *  © 2023 Nathan Kellenicki
 *  All rights reserved.
 *
 *  This file is part of CommandStation-EX
@@ -50,7 +49,6 @@
 */

 #include "DCCEX.h"
-#include "Display_Implementation.h"

 #ifdef CPU_TYPE_ERROR
 #error CANNOT COMPILE - DCC++ EX ONLY WORKS WITH THE ARCHITECTURES LISTED IN defines.h
@@ -76,39 +74,40 @@ void setup()

  DIAG(F("License GPLv3 fsf.org (c) dcc-ex.com"));

-// Initialise HAL layer before reading EEprom or setting up MotorDrivers 
-  IODevice::begin();
-
-  // As the setup of a motor shield may require a read of the current sense input from the ADC,
-  // let's make sure to initialise the ADCee class!
-  ADCee::begin();
-  // Set up MotorDrivers early to initialize all pins
-  TrackManager::Setup(MOTOR_SHIELD_TYPE);
-
-  DISPLAY_START (
-    // This block is still executed for DIAGS if display not in use
-    LCD(0,F("DCC-EX v%S"),F(VERSION));
+  CONDITIONAL_LCD_START {
+    // 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"));
-  );
+  }

  // 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, WIFI_FORCE_AP);
+  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, WIFI_FORCE_AP);
+  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();
+
+  // As the setup of a motor shield may require a read of the current sense input from the ADC,
+  // let's make sure to initialise the ADCee class!
+  ADCee::begin();
  // Responsibility 3: Start the DCC engine.
-  DCC::begin();
+  // 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)
  RMFT::begin();
@@ -161,8 +160,7 @@ void loop()
  LCN::loop();
  #endif

-  // Display refresh
-  DisplayInterface::loop();
+  LCDDisplay::loop();  // ignored if LCD not in use

  // Handle/update IO devices.
  IODevice::loop();
--- a/DCC.cpp
+++ b/DCC.cpp
@@ -60,7 +60,8 @@ const byte FN_GROUP_5=0x10;
 FSH* DCC::shieldName=NULL;
 byte DCC::globalSpeedsteps=128;

-void DCC::begin() {
+void DCC::begin(const FSH * motorShieldName) {
+  shieldName=(FSH *)motorShieldName;
  StringFormatter::send(&USB_SERIAL,F("<iDCC-EX V-%S / %S / %S G-%S>\n"), F(VERSION), F(ARDUINO_TYPE), shieldName, F(GITHUB_SHA));
 #ifndef DISABLE_EEPROM
  // Load stuff from EEprom
@@ -575,11 +576,9 @@ void DCC::setLocoId(int id,ACK_CALLBACK callback) {

 void DCC::forgetLoco(int cab) {  // removes any speed reminders for this loco
  setThrottle2(cab,1); // ESTOP this loco if still on track
-  int reg=lookupSpeedTable(cab, false);
-  if (reg>=0) {
-    speedTable[reg].loco=0;
-    setThrottle2(cab,1); // ESTOP if this loco still on track
-  }
+  int reg=lookupSpeedTable(cab);
+  if (reg>=0) speedTable[reg].loco=0;
+  setThrottle2(cab,1); // ESTOP if this loco still on track
 }
 void DCC::forgetAllLocos() {  // removes all speed reminders
  setThrottle2(0,1); // ESTOP all locos still on track
@@ -692,7 +691,7 @@ void  DCC::updateLocoReminder(int loco, byte speedCode) {

  if (loco==0) {
     // broadcast stop/estop but dont change direction
-     for (int reg = 0; reg <= highestUsedReg; reg++) {
+     for (int reg = 0; reg < highestUsedReg; reg++) {
       if (speedTable[reg].loco==0) continue;
       byte newspeed=(speedTable[reg].speedCode & 0x80) |  (speedCode & 0x7f);
       if (speedTable[reg].speedCode != newspeed) {
--- a/DCC.h
+++ b/DCC.h
@@ -51,10 +51,7 @@ const byte MAX_LOCOS = 30;
 class DCC
 {
 public:
-  static inline void setShieldName(const FSH * motorShieldName) {
-    shieldName=(FSH *)motorShieldName;
-  };
-  static void begin();
+  static void begin(const FSH * motorShieldName);
  static void loop();

  // Public DCC API functions
--- a/DCCACK.cpp
+++ b/DCCACK.cpp
@@ -152,7 +152,7 @@ byte DCCACK::getAck() {
      return(0);  // pending set off but not detected means no ACK.   
 }

-#ifndef DISABLE_PROG
+
 void DCCACK::loop() {
  while (ackManagerProg) {
    byte opcode=GETFLASH(ackManagerProg);
@@ -414,7 +414,7 @@ void DCCACK::callback(int value) {
          (ackManagerCallback)( value);
    }
 }
-#endif
+

 void DCCACK::checkAck(byte sentResetsSincePacket) {
    if (!ackPending) return; 
--- a/DCCEX.h
+++ b/DCCEX.h
@@ -40,7 +40,7 @@
 #if ETHERNET_ON == true
 #include "EthernetInterface.h"
 #endif
-#include "Display_Implementation.h"
+#include "LCD_Implementation.h"
 #include "LCN.h"
 #include "IODevice.h"
 #include "Turnouts.h"
--- a/DCCEXParser.cpp
+++ b/DCCEXParser.cpp
@@ -3,11 +3,10 @@
 *  © 2021 Neil McKechnie
 *  © 2021 Mike S
 *  © 2021 Herb Morton
- *  © 2020-2023 Harald Barth
+ *  © 2020-2022 Harald Barth
 *  © 2020-2021 M Steve Todd
 *  © 2020-2021 Fred Decker
 *  © 2020-2021 Chris Harlow
- *  © 2022 Colin Murdoch
 *  All rights reserved.
 *  
 *  This file is part of CommandStation-EX
@@ -47,14 +46,16 @@
 #define SENDFLASHLIST(stream,flashList)                 \
    for (int16_t i=0;;i+=sizeof(flashList[0])) {                            \
        int16_t value=GETHIGHFLASHW(flashList,i);       \
-        if (value==INT16_MAX) break;                            \
-        if (value != 0) StringFormatter::send(stream,F(" %d"),value);	\
+        if (value==0) break;                            \
+        StringFormatter::send(stream,F(" %d"),value);   \
    }                                   


 // 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
+const int16_t HASH_KEYWORD_PROG = -29718;
 const int16_t HASH_KEYWORD_MAIN = 11339;
+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;
@@ -62,11 +63,7 @@ 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;
-#ifndef DISABLE_PROG
-const int16_t HASH_KEYWORD_JOIN = -30750;
-const int16_t HASH_KEYWORD_PROG = -29718;
 const int16_t HASH_KEYWORD_PROGBOOST = -6353;
-#endif
 #ifndef DISABLE_EEPROM
 const int16_t HASH_KEYWORD_EEPROM = -7168;
 #endif
@@ -82,8 +79,6 @@ 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_G='G';
-const int16_t HASH_KEYWORD_I='I';
 const int16_t HASH_KEYWORD_R='R';
 const int16_t HASH_KEYWORD_T='T';
 const int16_t HASH_KEYWORD_X='X';
@@ -195,9 +190,9 @@ 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; 
+      int size=strlen_P((char *)cmd)+1; 
      char buffer[size];
-      STRCPY_P(buffer,(char *)cmd);
+      strcpy_P(buffer,(char *)cmd);
      parse(&USB_SERIAL,(byte *)buffer,NULL);
 }

@@ -219,9 +214,6 @@ void DCCEXParser::parse(Print *stream,  byte *com,  RingStream *ringStream) {

 void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
 {
-#ifdef DISABLE_PROG
-    (void)ringStream;
-#endif
 #ifndef DISABLE_EEPROM
    (void)EEPROM; // tell compiler not to warn this is unused
 #endif
@@ -291,8 +283,6 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)

        if (direction < 0 || direction > 1)
            break; // invalid direction code
-	if (cab > 10239 || cab < 0)
-	    break; // beyond DCC range

        DCC::setThrottle(cab, tspeed, direction);
        if (params == 4) // send obsolete format T response
@@ -352,20 +342,6 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
            return;
        break;

-    case 'z':  // direct pin manipulation
-        if (p[0]==0) break; 
-        if (params==1) {  // <z vpin | -vpin> 
-            if (p[0]>0) IODevice::write(p[0],HIGH);
-            else IODevice::write(-p[0],LOW);
-            return;
-        }
-        if (params>=2 && params<=4) { // <z vpin ana;og profile duration> 
-            // unused params default to 0           
-            IODevice::writeAnalogue(p[0],p[1],p[2],p[3]);
-            return;
-        }
-        break; 
-
    case 'Z': // OUTPUT <Z ...>
        if (parseZ(stream, params, p))
            return;
@@ -376,7 +352,6 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
            return;
        break;

-#ifndef DISABLE_PROG
    case 'w': // WRITE CV on MAIN <w CAB CV VALUE>
        DCC::writeCVByteMain(p[0], p[1], p[2]);
        return;
@@ -384,12 +359,9 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
    case 'b': // WRITE CV BIT ON MAIN <b CAB CV BIT VALUE>
        DCC::writeCVBitMain(p[0], p[1], p[2], p[3]);
        return;
-#endif

    case 'M': // WRITE TRANSPARENT DCC PACKET MAIN <M REG X1 ... X9>
-#ifndef DISABLE_PROG
    case 'P': // WRITE TRANSPARENT DCC PACKET PROG <P REG X1 ... X9>
-#endif
        // NOTE: this command was parsed in HEX instead of decimal
        params--; // drop REG
        if (params<1) break;
@@ -404,7 +376,6 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
        }
        return;
        
-#ifndef DISABLE_PROG
    case 'W': // WRITE CV ON PROG <W CV VALUE CALLBACKNUM CALLBACKSUB>
            if (!stashCallback(stream, p, ringStream))
                break;
@@ -462,7 +433,6 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
            return;
        }
        break;
-#endif

    case '1': // POWERON <1   [MAIN|PROG|JOIN]>
        {
@@ -470,29 +440,27 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
        bool prog=false;
        bool join=false;
        if (params > 1) break;
-        if (params==0) { // All
+        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_MAIN) { // <1 MAIN>
-            main=true;
-	  }
-#ifndef DISABLE_PROG
-	  else if (p[0] == HASH_KEYWORD_JOIN) {  // <1 JOIN>
+	  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;
 	  }
-#endif
 	  else break; // will reply <X>
 	}
-        TrackManager::setJoin(join);
        if (main) TrackManager::setMainPower(POWERMODE::ON);
        if (prog) TrackManager::setProgPower(POWERMODE::ON);
+        TrackManager::setJoin(join);

        CommandDistributor::broadcastPower();
        return;
@@ -503,7 +471,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
        bool main=false;
        bool prog=false;
        if (params > 1) break;
-        if (params==0) { // All
+        if (params==0 || MotorDriver::commonFaultPin) { // <0> or tracks can not be handled individually
 	  main=true;
 	  prog=true;
        }
@@ -511,20 +479,18 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
 	  if (p[0]==HASH_KEYWORD_MAIN) { // <0 MAIN>
 	    main=true;
 	  }
-#ifndef DISABLE_PROG
 	  else if (p[0]==HASH_KEYWORD_PROG) { // <0 PROG>
 	    prog=true;
 	  }
-#endif
 	  else break; // will reply <X>
 	}

-        TrackManager::setJoin(false);
        if (main) TrackManager::setMainPower(POWERMODE::OFF);
        if (prog) {
            TrackManager::progTrackBoosted=false;  // Prog track boost mode will not outlive prog track off
            TrackManager::setProgPower(POWERMODE::OFF);
        }
+        TrackManager::setJoin(false);

        CommandDistributor::broadcastPower();
        return;
@@ -535,10 +501,8 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
        return;

    case 'c': // SEND METER RESPONSES <c>
-        // No longer useful because of multiple tracks See <JG> and <JI>
-        if (params>0) break;
-        TrackManager::reportObsoleteCurrent(stream);
-        return;
+        // No longer supported because of multiple tracks                               <c MeterName value C/V unit min max res warn>
+        break;

    case 'Q': // SENSORS <Q>
        Sensor::printAll(stream);
@@ -548,7 +512,9 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
        StringFormatter::send(stream, F("<iDCC-EX V-%S / %S / %S G-%S>\n"), F(VERSION), F(ARDUINO_TYPE), DCC::getMotorShieldName(), F(GITHUB_SHA));
        CommandDistributor::broadcastPower(); // <s> is the only "get power status" command we have
        Turnout::printAll(stream); //send all Turnout states
+        Output::printAll(stream);  //send all Output  states
        Sensor::printAll(stream);  //send all Sensor  states
+        // TODO Send stats of  speed reminders table
        return;       

 #ifndef DISABLE_EEPROM
@@ -617,16 +583,6 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
                    }
                    CommandDistributor::setClockTime(p[1], p[2], 1);
                    return;
-                
-                case HASH_KEYWORD_G: // <JG> current gauge limits
-                    if (params>1) break;
-                    TrackManager::reportGauges(stream);   // <g limit...limit>     
-                    return;
-                
-                case HASH_KEYWORD_I: // <JI> current values
-                    if (params>1) break;
-                    TrackManager::reportCurrent(stream);   // <g limit...limit>     
-                    return;

                case HASH_KEYWORD_A: // <JA> returns automations/routes
                    StringFormatter::send(stream, F("<jA"));
@@ -655,12 +611,8 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
                if (params==1) {
                    SENDFLASHLIST(stream,RMFT2::rosterIdList)
                }
-                else {
-		  const FSH * functionNames= RMFT2::getRosterFunctions(id);
-		  StringFormatter::send(stream,F(" %d \"%S\" \"%S\""), 
-					id, RMFT2::getRosterName(id),
-					functionNames == NULL ? RMFT2::getRosterFunctions(0) : functionNames);
-		}
+                else StringFormatter::send(stream,F(" %d \"%S\" \"%S\""), 
+                    id, RMFT2::getRosterName(id), RMFT2::getRosterFunctions(id));
 #endif          
                StringFormatter::send(stream, F(">\n"));      
                return; 
@@ -914,7 +866,6 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
        StringFormatter::send(stream, F("Free memory=%d\n"), DCCTimer::getMinimumFreeMemory());
        break;

-#ifndef DISABLE_PROG
    case HASH_KEYWORD_ACK: // <D ACK ON/OFF> <D ACK [LIMIT|MIN|MAX|RETRY] Value>
 	if (params >= 3) {
 	    if (p[1] == HASH_KEYWORD_LIMIT) {
@@ -935,7 +886,6 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
 	  Diag::ACK = onOff;
 	}
        return true;
-#endif

    case HASH_KEYWORD_CMD: // <D CMD ON/OFF>
        Diag::CMD = onOff;
@@ -958,11 +908,11 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
        Diag::LCN = onOff;
        return true;
 #endif
-#ifndef DISABLE_PROG
+
    case HASH_KEYWORD_PROGBOOST:
        TrackManager::progTrackBoosted=true;
 	    return true;
-#endif
+
    case HASH_KEYWORD_RESET:
        DCCTimer::reset();
        break; // and <X> if we didnt restart 
@@ -991,15 +941,13 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
        break;

    case HASH_KEYWORD_ANIN:   // <D ANIN vpin>  Display analogue input value
-        DIAG(F("VPIN=%u value=%d"), p[1], IODevice::readAnalogue(p[1]));
+        DIAG(F("VPIN=%d value=%d"), p[1], IODevice::readAnalogue(p[1]));
        break;

-#if !defined(IO_NO_HAL)
+#if !defined(IO_MINIMAL_HAL)
    case HASH_KEYWORD_HAL: 
        if (p[1] == HASH_KEYWORD_SHOW) 
          IODevice::DumpAll();
-        else if (p[1] == HASH_KEYWORD_RESET)
-          IODevice::reset();
        break;
 #endif

--- a/DCCRMT.cpp
+++ b/DCCRMT.cpp
@@ -194,10 +194,8 @@ int RMTChannel::RMTfillData(const byte buffer[], byte byteCount, byte repeatCoun
  setDCCBit1(data + bitcounter-1);     // overwrite previous zero bit with one bit
  setEOT(data + bitcounter++);         // EOT marker
  dataLen = bitcounter;
-  noInterrupts();                      // keep dataReady and dataRepeat consistnet to each other
  dataReady = true;
  dataRepeat = repeatCount+1;         // repeatCount of 0 means send once
-  interrupts();
  return 0;
 }

@@ -214,8 +212,6 @@ void IRAM_ATTR RMTChannel::RMTinterrupt() {
  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)       // all data should go out at least once
-      DIAG(F("Channel %d DCC signal lost data"), channel);
  }
  if (dataRepeat > 0)         // if a repeat count was specified, work on that
    dataRepeat--;
--- a/DCCTimer.h
+++ b/DCCTimer.h
@@ -1,7 +1,7 @@
 /*
 *  © 2022-2023 Paul M. Antoine
 *  © 2021 Mike S
- *  © 2021-2023 Harald Barth
+ *  © 2021-2022 Harald Barth
 *  © 2021 Fred Decker
 *  All rights reserved.
 *  
@@ -62,9 +62,6 @@ class DCCTimer {
  static bool isPWMPin(byte pin);
  static void setPWM(byte pin, bool high);
  static void clearPWM();
-  static void DCCEXanalogWriteFrequency(uint8_t pin, uint32_t frequency);
-  static void DCCEXanalogWrite(uint8_t pin, int value);
-
 // 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.
@@ -127,7 +124,6 @@ private:
  static void scan();
  // bit array of used pins (max 16)
  static uint16_t usedpins;
-  static uint8_t highestPin;
  // cached analog values (malloc:ed to actual number of ADC channels)
  static int *analogvals;
  // friend so that we can call scan() and begin()
--- a/DCCTimerAVR.cpp
+++ b/DCCTimerAVR.cpp
@@ -1,6 +1,6 @@
 /*
 *  © 2021 Mike S
- *  © 2021-2023 Harald Barth
+ *  © 2021-2022 Harald Barth
 *  © 2021 Fred Decker
 *  © 2021 Chris Harlow
 *  © 2021 David Cutting
@@ -29,9 +29,6 @@
 #include <avr/boot.h> 
 #include <avr/wdt.h>
 #include "DCCTimer.h"
-#ifdef DEBUG_ADC
-#include "TrackManager.h"
-#endif
 INTERRUPT_CALLBACK interruptHandler=0;

  // Arduino nano, uno, mega etc
@@ -126,14 +123,13 @@ void DCCTimer::reset() {
 }

 #if defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560)
-#define NUM_ADC_INPUTS 16
+#define NUM_ADC_INPUTS 15
 #else
-#define NUM_ADC_INPUTS 8
+#define NUM_ADC_INPUTS 7
 #endif
 uint16_t ADCee::usedpins = 0;
-uint8_t ADCee::highestPin = 0;
 int * ADCee::analogvals = NULL;
-static bool ADCusesHighPort = false;
+bool ADCusesHighPort = false;

 /*
 * Register a new pin to be scanned
@@ -142,17 +138,16 @@ static bool ADCusesHighPort = false;
 */
 int ADCee::init(uint8_t pin) {
  uint8_t id = pin - A0;
-  if (id >= NUM_ADC_INPUTS)
+  if (id > NUM_ADC_INPUTS)
    return -1023;
  if (id > 7)
    ADCusesHighPort = true;
  pinMode(pin, INPUT);
  int value = analogRead(pin);
  if (analogvals == NULL)
-    analogvals = (int *)calloc(NUM_ADC_INPUTS, sizeof(int));
+    analogvals = (int *)calloc(NUM_ADC_INPUTS+1, sizeof(int));
  analogvals[id] = value;
  usedpins |= (1<<id);
-  if (id > highestPin) highestPin = id;
  return value;
 }
 int16_t ADCee::ADCmax() {
@@ -162,15 +157,13 @@ int16_t ADCee::ADCmax() {
 * Read function ADCee::read(pin) to get value instead of analogRead(pin)
 */
 int ADCee::read(uint8_t pin, bool fromISR) {
+  (void)fromISR; // AVR does ignore this arg
  uint8_t id = pin - A0;
  if ((usedpins & (1<<id) ) == 0)
    return -1023;
  // we do not need to check (analogvals == NULL)
  // because usedpins would still be 0 in that case
-  if (!fromISR) noInterrupts();
-  int a = analogvals[id];
-  if (!fromISR) interrupts();
-  return a;
+  return analogvals[id];
 }
 /*
 * Scan function that is called from interrupt
@@ -178,8 +171,8 @@ int ADCee::read(uint8_t pin, bool fromISR) {
 #pragma GCC push_options
 #pragma GCC optimize ("-O3")
 void ADCee::scan() {
-  static byte id = 0;       // id and mask are the same thing but it is faster to
-  static uint16_t mask = 1; // increment and shift instead to calculate mask from id
+  static byte id = 0;        // id and mask are the same thing but it is faster to 
+  static uint16_t mask = 1;  // increment and shift instead to calculate mask from id
  static bool waiting = false;

  if (waiting) {
@@ -193,13 +186,11 @@ void ADCee::scan() {
    bitSet(ADCSRA, ADIF);
    analogvals[id] = (high << 8) | low;
    // advance at least one track
-#ifdef DEBUG_ADC
-    if (id == 1) TrackManager::track[1]->setBrake(0);
-#endif
+    // for scope debug TrackManager::track[1]->setBrake(0);
    waiting = false;
    id++;
    mask = mask << 1;
-    if (id > highestPin) {
+    if (id == NUM_ADC_INPUTS+1) {
      id = 0;
      mask = 1;
    }
@@ -221,17 +212,15 @@ void ADCee::scan() {
 #endif
 	ADMUX=(1<<REFS0)|(id & 0x07); //select AVCC as reference and set MUX
 	bitSet(ADCSRA,ADSC); // start conversion
-#ifdef DEBUG_ADC
-	if (id == 1) TrackManager::track[1]->setBrake(1);
-#endif
+	// for scope debug TrackManager::track[1]->setBrake(1);
 	waiting = true;
 	return;
      }
      id++;
      mask = mask << 1;
-      if (id > highestPin) {
-      	id = 0;
-	      mask = 1;
+      if (id == NUM_ADC_INPUTS+1) {
+	id = 0;
+	mask = 1;
      }
    }
  }
--- a/DCCTimerESP.cpp
+++ b/DCCTimerESP.cpp
@@ -150,45 +150,6 @@ int DCCTimer::freeMemory() {
 void DCCTimer::reset() {
   ESP.restart();
 }
-
-#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 DCCTimer::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 DCCTimer::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;
-      ledcSetup(cnt_channel, 1000, 8);
-      ledcAttachPin(pin, cnt_channel);
-    } else {
-      ledcAttachPin(pin, pin_to_channel[pin]);
-    }
-    ledcWrite(pin_to_channel[pin], value);
-  }
-}
-
 int ADCee::init(uint8_t pin) {
  pinMode(pin, ANALOG);
  adc1_config_width(ADC_WIDTH_BIT_12);
--- a/DCCTimerSAMD.cpp
+++ b/DCCTimerSAMD.cpp
@@ -162,7 +162,7 @@ uint16_t ADCee::usedpins = 0;
 int * ADCee::analogvals = NULL;

 int ADCee::init(uint8_t pin) {
-  uint8_t id = pin - A0;
+  uint id = pin - A0;
  int value = 0;

  if (id > NUM_ADC_INPUTS)
@@ -210,7 +210,7 @@ int ADCee::read(uint8_t pin, bool fromISR) {
 #pragma GCC push_options
 #pragma GCC optimize ("-O3")
 void ADCee::scan() {
-  static uint8_t id = 0;        // id and mask are the same thing but it is faster to 
+  static uint id = 0;        // id and mask are the same thing but it is faster to 
  static uint16_t mask = 1;  // increment and shift instead to calculate mask from id
  static bool waiting = false;

--- a/DCCTimerSTM32.cpp
+++ b/DCCTimerSTM32.cpp
@@ -1,8 +1,7 @@
 /*
- *  © 2023 Neil McKechnie
- *  © 2022-23 Paul M. Antoine
+ *  © 2022 Paul M. Antoine
 *  © 2021 Mike S
- *  © 2021, 2023 Harald Barth
+ *  © 2021 Harald Barth
 *  © 2021 Fred Decker
 *  © 2021 Chris Harlow
 *  © 2021 David Cutting
@@ -30,129 +29,26 @@
 #ifdef ARDUINO_ARCH_STM32

 #include "DCCTimer.h"
-#ifdef DEBUG_ADC
-#include "TrackManager.h"
-#endif
-#include "DIAG.h"

-#if defined(ARDUINO_NUCLEO_F401RE) || defined(ARDUINO_NUCLEO_F411RE)
-// Nucleo-64 boards don't have additional serial ports defined by default
+#if defined(ARDUINO_NUCLEO_F411RE)
+// Nucleo-64 boards don't have Serial1 defined by default
 HardwareSerial Serial1(PB7, PA15);  // Rx=PB7, Tx=PA15 -- CN7 pins 17 and 21 - F411RE
 // Serial2 is defined to use USART2 by default, but is in fact used as the diag console
 // via the debugger on the Nucleo-64. It is therefore unavailable for other DCC-EX uses like WiFi, DFPlayer, etc.
 // Let's define Serial6 as an additional serial port (the only other option for the Nucleo-64s)
 HardwareSerial Serial6(PA12, PA11);  // Rx=PA12, Tx=PA11 -- CN10 pins 12 and 14 - F411RE
 #elif defined(ARDUINO_NUCLEO_F446RE)
-// Nucleo-64 boards don't have additional serial ports defined by default
-// On the F446RE, Serial1 isn't really useable as it's Rx/Tx pair sit on already used D2/D10 pins
-// HardwareSerial Serial1(PA10, PB6);  // Rx=PA10 (D2), Tx=PB6 (D10) -- CN10 pins 17 and 9 - F446RE 
+// Nucleo-64 boards don't have Serial1 defined by default
+HardwareSerial Serial1(PA10, PB6);  // Rx=PA10, Tx=PB6 -- CN10 pins 33 and 17 - F446RE 
 // Serial2 is defined to use USART2 by default, but is in fact used as the diag console
 // via the debugger on the Nucleo-64. It is therefore unavailable for other DCC-EX uses like WiFi, DFPlayer, etc.
-// On the F446RE, Serial3 and Serial5 are easy to use:
-HardwareSerial Serial3(PC11, PC10);  // Rx=PC11, Tx=PC10 -- USART3 - F446RE
-HardwareSerial Serial5(PD2, PC12);  // Rx=PC7, Tx=PC6 -- UART5 - F446RE
-// On the F446RE, Serial4 and Serial6 also use pins we can't readily map while using the Arduino pins
-#elif defined(ARDUINO_NUCLEO_F413ZH) || defined(ARDUINO_NUCLEO_F429ZI) || defined(ARDUINO_NUCLEO_F446ZE)|| defined(ARDUINO_NUCLEO_F412ZG) 
+#elif defined(ARDUINO_NUCLEO_F412ZG) || defined(ARDUINO_NUCLEO_F429ZI) || defined(ARDUINO_NUCLEO_F446ZE)
 // Nucleo-144 boards don't have Serial1 defined by default
-HardwareSerial Serial6(PG9, PG14);  // Rx=PG9, Tx=PG14 -- USART6
-// Serial3 is defined to use USART3 by default, but is in fact used as the diag console
-// via the debugger on the Nucleo-144. It is therefore unavailable for other DCC-EX uses like WiFi, DFPlayer, etc.
+HardwareSerial Serial1(PG9, PG14);  // Rx=PG9, Tx=PG14 -- D0, D1 - F412ZG/F446ZE
 #else
-#error STM32 board selected is not yet explicitly supported - so Serial1 peripheral is not defined
+#warning Serial1 not defined
 #endif

-///////////////////////////////////////////////////////////////////////////////////////////////
-// Experimental code for High Accuracy (HA) DCC Signal mode
-// Warning - use of TIM2 and TIM3 can affect the use of analogWrite() function on certain pins,
-// which is used by the DC motor types.
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-// INTERRUPT_CALLBACK interruptHandler=0;
-// // Let's use STM32's timer #2 which supports hardware pulse generation on pin D13.
-// // Also, timer #3 will do hardware pulses on pin D12. This gives
-// // accurate timing, independent of the latency of interrupt handling.
-// // We only need to interrupt on one of these (TIM2), the other will just generate
-// // pulses.
-// HardwareTimer timer(TIM2);
-// HardwareTimer timerAux(TIM3);
-// static bool tim2ModeHA = false;
-// static bool tim3ModeHA = false;
-
-// // Timer IRQ handler
-// void Timer_Handler() {
-//   interruptHandler();
-// }
-
-// void DCCTimer::begin(INTERRUPT_CALLBACK callback) {
-//   interruptHandler=callback;
-//   noInterrupts();
-
-//   // adc_set_sample_rate(ADC_SAMPLETIME_480CYCLES);
-//   timer.pause();
-//   timerAux.pause();
-//   timer.setPrescaleFactor(1);
-//   timer.setOverflow(DCC_SIGNAL_TIME, MICROSEC_FORMAT);
-//   timer.attachInterrupt(Timer_Handler);
-//   timer.refresh();
-//   timerAux.setPrescaleFactor(1);
-//   timerAux.setOverflow(DCC_SIGNAL_TIME, MICROSEC_FORMAT);
-//   timerAux.refresh();
-  
-//   timer.resume();
-//   timerAux.resume();
-
-//   interrupts();
-// }
-
-// bool DCCTimer::isPWMPin(byte pin) {
-//   // Timer 2 Channel 1 controls pin D13, and Timer3 Channel 1 controls D12.
-//   //  Enable the appropriate timer channel.
-//   switch (pin) {
-//     case 12:
-//       return true;
-//     case 13:
-//       return true;
-//     default:
-//       return false;
-//   }
-// }
-
-// void DCCTimer::setPWM(byte pin, bool high) {
-//   // Set the timer so that, at the next counter overflow, the requested
-//   // pin state is activated automatically before the interrupt code runs.
-//   // TIM2 is timer, TIM3 is timerAux.
-//   switch (pin) {
-//     case 12:
-//       if (!tim3ModeHA) {
-//         timerAux.setMode(1, TIMER_OUTPUT_COMPARE_INACTIVE, D12);
-//         tim3ModeHA = true;
-//       }
-//       if (high) 
-//         TIM3->CCMR1 = (TIM3->CCMR1 & ~TIM_CCMR1_OC1M_Msk) | TIM_CCMR1_OC1M_0;
-//       else
-//         TIM3->CCMR1 = (TIM3->CCMR1 & ~TIM_CCMR1_OC1M_Msk) | TIM_CCMR1_OC1M_1;
-//       break;
-//     case 13:
-//       if (!tim2ModeHA) {
-//         timer.setMode(1, TIMER_OUTPUT_COMPARE_INACTIVE, D13);
-//         tim2ModeHA = true;
-//       }
-//       if (high) 
-//         TIM2->CCMR1 = (TIM2->CCMR1 & ~TIM_CCMR1_OC1M_Msk) | TIM_CCMR1_OC1M_0;
-//       else
-//         TIM2->CCMR1 = (TIM2->CCMR1 & ~TIM_CCMR1_OC1M_Msk) | TIM_CCMR1_OC1M_1;
-//       break;
-//   }   
-// }
-
-// void DCCTimer::clearPWM() {
-//   timer.setMode(1, TIMER_OUTPUT_COMPARE_INACTIVE, NC);
-//   tim2ModeHA = false;
-//   timerAux.setMode(1, TIMER_OUTPUT_COMPARE_INACTIVE, NC);  
-//   tim3ModeHA = false;
-// }
-///////////////////////////////////////////////////////////////////////////////////////////////
-
 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
@@ -235,16 +131,10 @@ void DCCTimer::reset() {
    while(true) {};
 }

-// TODO: may need to use uint32_t on STMF4xx variants with > 16 analog inputs!
-#if defined(ARDUINO_NUCLEO_F446RE) || defined(ARDUINO_NUCLEO_F429ZI) || defined(ARDUINO_NUCLEO_F446ZE)
-#warning STM32 board selected not fully supported - only use ADC1 inputs 0-15 for current sensing!
-#endif
-// For now, define the max of 16 ports - some variants have more, but this not **yet** supported
-#define NUM_ADC_INPUTS 16
-// #define NUM_ADC_INPUTS NUM_ANALOG_INPUTS
+#define NUM_ADC_INPUTS NUM_ANALOG_INPUTS

+// TODO: may need to use uint32_t on STMF4xx variants with > 16 analog inputs!
 uint16_t ADCee::usedpins = 0;
-uint8_t ADCee::highestPin = 0;
 int * ADCee::analogvals = NULL;
 uint32_t * analogchans = NULL;
 bool adc1configured = false;
@@ -254,13 +144,10 @@ int16_t ADCee::ADCmax() {
 }

 int ADCee::init(uint8_t pin) {
-
+  uint id = pin - A0;
  int value = 0;
-  PinName stmpin = analogInputToPinName(pin);
-  if (stmpin == NC) // do not continue if this is not an analog pin at all
-    return -1024;   // some silly value as error
-
-  uint32_t stmgpio = STM_PORT(stmpin); // converts to the GPIO port (16-bits per port group on STM32)
+  PinName stmpin = digitalPin[analogInputPin[id]];
+  uint32_t stmgpio = stmpin / 16; // 16-bits per GPIO port group on STM32
  uint32_t adcchan =  STM_PIN_CHANNEL(pinmap_function(stmpin, PinMap_ADC)); // find ADC channel (only valid for ADC1!)
  GPIO_TypeDef * gpioBase;

@@ -278,20 +165,12 @@ int ADCee::init(uint8_t pin) {
        RCC->AHB1ENR |= RCC_AHB1ENR_GPIOCEN; //Power up PORTC
        gpioBase = GPIOC;
        break;
-    default:
-      return -1023; // some silly value as error
  }

-  // Set pin mux mode to analog input, the 32 bit port mode register has 2 bits per pin
-  gpioBase->MODER |= (0b011 << (STM_PIN(stmpin) << 1)); // Set pin mux to analog mode (binary 11)
+  // Set pin mux mode to analog input
+  gpioBase->MODER |= (0b011 << (stmpin << 1)); // Set pin mux to analog mode

  // Set the sampling rate for that analog input
-  // This is F411x specific! Different on for example F334
-  // STM32F11xC/E Reference manual
-  // 11.12.4 ADC sample time register 1 (ADC_SMPR1) (channels 10 to 18)
-  // 11.12.5 ADC sample time register 2 (ADC_SMPR2) (channels 0 to 9)
-  if (adcchan > 18)
-    return -1022; // silly value as error
  if (adcchan < 10)
    ADC1->SMPR2 |= (0b111 << (adcchan * 3)); // Channel sampling rate 480 cycles
  else
@@ -303,21 +182,14 @@ int ADCee::init(uint8_t pin) {
  while(!(ADC1->SR & (1 << 1)));  // Wait until conversion is complete
  value = ADC1->DR;               // Read value from register

-  uint8_t id = pin - PNUM_ANALOG_BASE;
-  if (id > 15) { // today we have not enough bits in the mask to support more
-    return -1021;
-  }
-
-  if (analogvals == NULL) {  // allocate analogvals and analogchans if this is the first invocation of init.
+  if (analogvals == NULL)
+  {
    analogvals = (int *)calloc(NUM_ADC_INPUTS+1, sizeof(int));
    analogchans = (uint32_t *)calloc(NUM_ADC_INPUTS+1, sizeof(uint32_t));
  }
  analogvals[id] = value;     // Store sampled value
  analogchans[id] = adcchan;  // Keep track of which ADC channel is used for reading this pin
  usedpins |= (1 << id);      // This pin is now ready
-  if (id > highestPin) highestPin = id; // Store our highest pin in use
-
-  DIAG(F("ADCee::init(): value=%d, channel=%d, id=%d"), value, adcchan, id);

  return value;
 }
@@ -326,7 +198,7 @@ int ADCee::init(uint8_t pin) {
 * Read function ADCee::read(pin) to get value instead of analogRead(pin)
 */
 int ADCee::read(uint8_t pin, bool fromISR) {
-  uint8_t id = pin - PNUM_ANALOG_BASE;
+  uint8_t id = pin - A0;
  // Was this pin initialised yet?
  if ((usedpins & (1<<id) ) == 0)
    return -1023;
@@ -341,7 +213,7 @@ int ADCee::read(uint8_t pin, bool fromISR) {
 #pragma GCC push_options
 #pragma GCC optimize ("-O3")
 void ADCee::scan() {
-  static uint8_t id = 0;     // id and mask are the same thing but it is faster to
+  static uint id = 0;        // id and mask are the same thing but it is faster to 
  static uint16_t mask = 1;  // increment and shift instead to calculate mask from id
  static bool waiting = false;

@@ -352,13 +224,11 @@ void ADCee::scan() {
    // found value
    analogvals[id] = ADC1->DR;
    // advance at least one track
-#ifdef DEBUG_ADC
-    if (id == 1) TrackManager::track[1]->setBrake(0);
-#endif
+    // for scope debug TrackManager::track[1]->setBrake(0);
    waiting = false;
    id++;
    mask = mask << 1;
-    if (id > highestPin) { // the 1 has been shifted out
+    if (id == NUM_ADC_INPUTS+1) {
      id = 0;
      mask = 1;
    }
@@ -369,20 +239,18 @@ void ADCee::scan() {
    // look for a valid track to sample or until we are around
    while (true) {
      if (mask  & usedpins) {
-	// start new ADC aquire on id
+    	  // start new ADC aquire on id
        ADC1->SQR3 = analogchans[id]; //1st conversion in regular sequence
        ADC1->CR2 |= (1 << 30); //Start 1st conversion SWSTART
-#ifdef DEBUG_ADC
-	if (id == 1) TrackManager::track[1]->setBrake(1);
-#endif
-	waiting = true;
-	return;
+	      // for scope debug TrackManager::track[1]->setBrake(1);
+	      waiting = true;
+	      return;
      }
      id++;
      mask = mask << 1;
-      if (id > highestPin) {
-      	id = 0;
-      	mask = 1;
+      if (id == NUM_ADC_INPUTS+1) {
+	      id = 0;
+	      mask = 1;
      }
    }
  }
@@ -407,4 +275,4 @@ void ADCee::begin() {
  ADC1->CR2 |= (1 << 0); // Switch on ADC1
  interrupts();
 }
-#endif
+#endif
--- a/DCCWaveform.cpp
+++ b/DCCWaveform.cpp
@@ -247,9 +247,6 @@ void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repea
  pendingPacket[byteCount] = checksum;
  pendingLength = byteCount + 1;
  pendingRepeats = repeats;
-// DIAG repeated commands (accesories)
-//  if (pendingRepeats > 0)
-//    DIAG(F("Repeats=%d on %s track"), pendingRepeats, isMainTrack ? "MAIN" : "PROG");
  // The resets will be zero not only now but as well repeats packets into the future
  clearResets(repeats+1);
  {
--- a/DIAG.h
+++ b/DIAG.h
@@ -24,5 +24,4 @@
 #include "StringFormatter.h"
 #define DIAG  StringFormatter::diag
 #define LCD   StringFormatter::lcd
-#define SCREEN  StringFormatter::lcd2
 #endif
--- a/Display.cpp
+++ b/Display.cpp
@@ -1,219 +0,0 @@
-/*
- *  © 2021, Chris Harlow, 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/>.
- */
-
-// CAUTION: the device dependent parts of this class are created in the .ini
-// using LCD_Implementation.h
-
-/* The strategy for drawing the screen is as follows.
- *  1) There are up to eight rows of text to be displayed.
- *  2) Blank rows of text are ignored.
- *  3) If there are more non-blank rows than screen lines,
- *     then all of the rows are displayed, with the rest of the
- *     screen being blank.
- *  4) If there are fewer non-blank rows than screen lines,
- *     then a scrolling strategy is adopted so that, on each screen
- *     refresh, a different subset of the rows is presented.
- *  5) On each entry into loop2(), a single operation is sent to the 
- *     screen; this may be a position command or a character for
- *     display.  This spreads the onerous work of updating the screen
- *     and ensures that other loop() functions in the application are
- *     not held up significantly.  The exception to this is when 
- *     the loop2() function is called with force=true, where 
- *     a screen update is executed to completion.  This is normally
- *     only done during start-up.
- *  The scroll mode is selected by defining SCROLLMODE as 0, 1 or 2
- *  in the config.h.
- *  #define SCROLLMODE 0 is scroll continuous (fill screen if poss),
- *  #define SCROLLMODE 1 is by page (alternate between pages),
- *  #define SCROLLMODE 2 is by row (move up 1 row at a time).
-
- */
-
-#include "Display.h"
-
-// Constructor - allocates device driver.
-Display::Display(DisplayDevice *deviceDriver) {
-  _deviceDriver = deviceDriver;
-  // Get device dimensions in characters (e.g. 16x2).
-  numScreenColumns = _deviceDriver->getNumCols();
-  numScreenRows = _deviceDriver->getNumRows();
-  for (uint8_t row = 0; row < MAX_CHARACTER_ROWS; row++) 
-    rowBuffer[row][0] = '\0';
-  
-  addDisplay(0);  // Add this display as display number 0
-};
-
-void Display::begin() {
-  _deviceDriver->begin();
-  _deviceDriver->clearNative();
-}
-
-void Display::_clear() {
-  _deviceDriver->clearNative();
-  for (uint8_t row = 0; row < MAX_CHARACTER_ROWS; row++) 
-    rowBuffer[row][0] = '\0';
-}
-
-void Display::_setRow(uint8_t line) {
-  hotRow = line;
-  hotCol = 0;
-  rowBuffer[hotRow][0] = '\0';  // Clear existing text
-}
-
-size_t Display::_write(uint8_t b) {
-  if (hotRow >= MAX_CHARACTER_ROWS || hotCol >= MAX_CHARACTER_COLS) return -1;
-  rowBuffer[hotRow][hotCol] = b;
-  hotCol++;
-  rowBuffer[hotRow][hotCol] = '\0';
-  return 1;
-}
-
-// Refresh screen completely (will block until complete). Used
-// during start-up.
-void Display::_refresh() {
-  loop2(true);
-}
-
-// On normal loop entries, loop will only make one output request on each
-// entry, to avoid blocking while waiting for the I2C.
-void Display::_displayLoop() {
-  // If output device is busy, don't do anything on this loop
-  // This avoids blocking while waiting for the device to complete.
-  if (!_deviceDriver->isBusy()) loop2(false);
-}
-
-Display *Display::loop2(bool force) {
-  unsigned long currentMillis = millis();
-
-  if (!force) {
-    // See if we're in the time between updates
-    if ((currentMillis - lastScrollTime) < DISPLAY_SCROLL_TIME)
-      return NULL;
-  } else {
-    // force full screen update from the beginning.
-    rowFirst = 0;
-    rowCurrent = 0;
-    bufferPointer = 0;
-    noMoreRowsToDisplay = false;
-    slot = 0;
-  }
-
-  do {
-    if (bufferPointer == 0) {
-      // Search for non-blank row
-      while (!noMoreRowsToDisplay) {
-        if (!isCurrentRowBlank()) break;
-        moveToNextRow();
-        if (rowCurrent == rowFirst) noMoreRowsToDisplay = true;  
-      }
-
-      if (noMoreRowsToDisplay) {
-        // No non-blank lines left, so draw blank line
-        buffer[0] = '\0';
-      } else {
-        // Non-blank line found, so copy it (including terminator)
-        for (uint8_t i = 0; i <= MAX_CHARACTER_COLS; i++)
-          buffer[i] = rowBuffer[rowCurrent][i];
-      }
-      _deviceDriver->setRowNative(slot);  // Set position for display
-      charIndex = 0;
-      bufferPointer = &buffer[0];
-    } else {
-      // Write next character, or a space to erase current position.
-      char ch = *bufferPointer;
-      if (ch) {
-        _deviceDriver->writeNative(ch);
-        bufferPointer++;
-      } else {
-        _deviceDriver->writeNative(' ');
-      }
-
-      if (++charIndex >= MAX_CHARACTER_COLS) {
-        // Screen slot completed, move to next nonblank row
-        bufferPointer = 0;
-        for (;;) {
-          moveToNextRow();
-          if (rowCurrent == rowFirst) {
-            noMoreRowsToDisplay = true;
-            break;
-          }  
-          if (!isCurrentRowBlank()) break;
-        }
-        // Move to next screen slot, if available
-        slot++;
-        if (slot >= numScreenRows) {
-          // Last slot on screen written, so get ready for next screen update.
-#if SCROLLMODE==0
-          // Scrollmode 0 scrolls continuously.  If the rows fit on the screen,
-          // then restart at row 0, but otherwise continue with the row
-          // after the last one displayed.
-          if (countNonBlankRows() <= numScreenRows)
-            rowCurrent = 0;
-          rowFirst = rowCurrent;
-#elif SCROLLMODE==1
-          // Scrollmode 1 scrolls by page, so if the last page has just completed then
-          // next time restart with row 0.
-          if (noMoreRowsToDisplay) 
-            rowFirst = rowCurrent = 0;
-#else
-          // Scrollmode 2 scrolls by row.  If the rows don't fit on the screen,
-          // then start one row further on next time.  If they do fit, then 
-          // show them in order and start next page at row 0.
-          if (countNonBlankRows() <= numScreenRows) {
-            rowFirst = rowCurrent = 0;
-          } else {
-            // Find first non-blank row after the previous first row
-            rowCurrent = rowFirst;
-            do {
-              moveToNextRow();
-            } while (isCurrentRowBlank());
-            rowFirst = rowCurrent;
-          }
-#endif
-          noMoreRowsToDisplay = false;
-          slot = 0;
-          lastScrollTime = currentMillis;
-          return NULL;
-        }
-      }
-    }
-  } while (force);
-
-  return NULL;
-}
-
-bool Display::isCurrentRowBlank() {
-  return (rowBuffer[rowCurrent][0] == '\0');
-}
-
-void Display::moveToNextRow() {
-  // Skip blank rows
-  if (++rowCurrent >= MAX_CHARACTER_ROWS) 
-      rowCurrent = 0;
-}
-
-uint8_t Display::countNonBlankRows() {
-  uint8_t count = 0;
-  for (uint8_t rowNumber=0; rowNumber<MAX_CHARACTER_ROWS; rowNumber++) {
-    if (rowBuffer[rowNumber][0] != '\0')
-      count++;
-  }
-  return count;
-}
-  
--- a/DisplayInterface.cpp
+++ b/DisplayInterface.cpp
@@ -21,7 +21,4 @@

 #include "DisplayInterface.h"

-// Install null display driver initially - will be replaced if required.
-DisplayInterface *DisplayInterface::_displayHandler = new DisplayInterface();
-
-uint8_t DisplayInterface::_selectedDisplayNo = 255;
+DisplayInterface *DisplayInterface::lcdDisplay = 0;
--- a/DisplayInterface.h
+++ b/DisplayInterface.h
@@ -25,75 +25,13 @@

 // Definition of base class for displays.  The base class does nothing.
 class DisplayInterface : public Print {
-protected:
-  static DisplayInterface *_displayHandler;
-  static uint8_t _selectedDisplayNo;  // Nothing selected.
-  DisplayInterface *_nextHandler = NULL;
-  uint8_t _displayNo = 0;
-
 public:
-  // Add display object to list of displays
-  void addDisplay(uint8_t displayNo) {
-    _nextHandler = _displayHandler;
-    _displayHandler = this;
-    _displayNo = displayNo;
-  }
-  static DisplayInterface *getDisplayHandler() {
-    return _displayHandler;
-  }
-  uint8_t getDisplayNo() {
-    return _displayNo;
-  }
+  virtual DisplayInterface* loop2(bool force) { (void)force; return NULL; };
+  virtual void setRow(byte line) { (void)line; };
+  virtual void clear() {};
+  virtual size_t write(uint8_t c) { (void)c; return 0; };

-  // The next functions are to provide compatibility with calls to the LCD function
-  // which does not specify a display number.  These always apply to display '0'.
-  static void refresh() { refresh(0); };
-  static void setRow(uint8_t line) { setRow(0, line); };
-  static void clear() { clear(0); };
-
-  // Additional functions to support multiple displays.  These perform a
-  // multicast to all displays that match the selected displayNo.
-  // Display number zero is the default one.
-  static void setRow(uint8_t displayNo, uint8_t line) { 
-    _selectedDisplayNo = displayNo;
-    for (DisplayInterface *p = _displayHandler; p!=0; p=p->_nextHandler) { 
-      if (displayNo == p->_displayNo) p->_setRow(line);
-    }
-  }
-  size_t write (uint8_t c) override {
-    for (DisplayInterface *p = _displayHandler; p!=0; p=p->_nextHandler) 
-      if (_selectedDisplayNo == p->_displayNo) p->_write(c);
-    return _displayHandler ? 1 : 0;
-  }
-  static void clear(uint8_t displayNo) { 
-    for (DisplayInterface *p = _displayHandler; p!=0; p=p->_nextHandler) 
-      if (displayNo == p->_displayNo) p->_clear();
-  }
-  static void refresh(uint8_t displayNo) {
-    for (DisplayInterface *p = _displayHandler; p!=0; p=p->_nextHandler)
-      if (displayNo == p->_displayNo) p->_refresh();
-  }
-  static void loop() {
-    for (DisplayInterface *p = _displayHandler; p!=0; p=p->_nextHandler) 
-      p->_displayLoop();
-  };
-  // The following are overridden within the specific device class
-  virtual void begin() {};
-  virtual size_t _write(uint8_t c) { (void)c; return 0; };
-  virtual void _setRow(uint8_t line) { (void)line; }
-  virtual void _clear() {}
-  virtual void _refresh() {}
-  virtual void _displayLoop() {}
+  static DisplayInterface *lcdDisplay;
 };

-class DisplayDevice {
-public:
-  virtual bool begin() { return true; }
-  virtual void clearNative() = 0;
-  virtual void setRowNative(uint8_t line) = 0;
-  virtual size_t writeNative(uint8_t c) = 0;
-  virtual bool isBusy() = 0;
-  virtual uint16_t getNumRows() = 0;
-  virtual uint16_t getNumCols() = 0;
-};
 #endif
--- a/ESP32-fixes.cpp
+++ b/ESP32-fixes.cpp
@@ -0,0 +1,61 @@
+/*
+ *  © 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
--- a/ESP32-fixes.h
+++ b/ESP32-fixes.h
@@ -0,0 +1,26 @@
+/*
+ *  © 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
+#pragma once
+#include <Arduino.h>
+void DCCEXanalogWriteFrequency(uint8_t pin, uint32_t frequency);
+void DCCEXanalogWrite(uint8_t pin, int value);
+#endif
+
--- a/EX-CommandStation-installer.exe
+++ b/EX-CommandStation-installer.exe
--- a/EXRAIL2.cpp
+++ b/EXRAIL2.cpp
@@ -1,8 +1,7 @@
 /*
 *  © 2021 Neil McKechnie
 *  © 2021-2023 Harald Barth
- *  © 2020-2023 Chris Harlow
- *  © 2022 Colin Murdoch
+ *  © 2020-2022 Chris Harlow
 *  All rights reserved.
 *  
 *  This file is part of CommandStation-EX
@@ -25,8 +24,8 @@
   F1. [DONE] DCC accessory packet opcodes (short and long form)
   F2. [DONE] ONAccessory catchers 
   F3. [DONE] Turnout descriptions for Withrottle
-   F4. [DONE] Oled announcements (depends on HAL)
-   F5. [DONE] Withrottle roster info
+   F4. Oled announcements (depends on HAL)
+   F5. Withrottle roster info
   F6. Multi-occupancy semaphore
   F7. [DONE see AUTOSTART] Self starting sequences
   F8. Park/unpark
@@ -106,9 +105,12 @@ uint16_t RMFT2::getOperand(byte n) {
 // getOperand static version, must be provided prog counter from loop etc.
 uint16_t RMFT2::getOperand(int progCounter,byte n) {
  int offset=progCounter+1+(n*3);
-  byte lsb=GETHIGHFLASH(RouteCode,offset);
-  byte msb=GETHIGHFLASH(RouteCode,offset+1);
-  return msb<<8|lsb;
+  if (offset&1) {
+       byte lsb=GETHIGHFLASH(RouteCode,offset);
+       byte msb=GETHIGHFLASH(RouteCode,offset+1);
+       return msb<<8|lsb;
+  }
+  return GETHIGHFLASHW(RouteCode,offset);
 }

 LookList::LookList(int16_t size) {
@@ -199,7 +201,7 @@ LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) {
    case OPCODE_IFNOT: {
      int16_t pin = (int16_t)operand;
      if (pin<0) pin = -pin;
-      DIAG(F("EXRAIL input VPIN %u"),pin);
+      DIAG(F("EXRAIL input vpin %d"),pin);
      IODevice::configureInput((VPIN)pin,true);
      break;
    }
@@ -209,7 +211,7 @@ LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) {
    case OPCODE_IFGTE:
    case OPCODE_IFLT:
    case OPCODE_DRIVE: {
-      DIAG(F("EXRAIL analog input VPIN %u"),(VPIN)operand);
+      DIAG(F("EXRAIL analog input vpin %d"),(VPIN)operand);
      IODevice::configureAnalogIn((VPIN)operand);
      break;
    }
@@ -241,9 +243,8 @@ LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) {
        
    case OPCODE_AUTOSTART:
      // automatically create a task from here at startup.
-      // Removed if (progCounter>0) check 4.2.31 because 
-      // default start it top of file is now removed. .   
-      new RMFT2(progCounter);
+      // but we will do one at 0 anyway by default.
+      if (progCounter>0) new RMFT2(progCounter);
      break;
      
    default: // Ignore
@@ -254,7 +255,7 @@ LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) {

  DIAG(F("EXRAIL %db, fl=%d"),progCounter,MAX_FLAGS);

-  // Removed for 4.2.31  new RMFT2(0); // add the startup route
+  new RMFT2(0); // add the startup route
  diag=saved_diag;
 }

@@ -266,17 +267,16 @@ void RMFT2::setTurnoutHiddenState(Turnout * t) {
 char RMFT2::getRouteType(int16_t id) {
  for (int16_t i=0;;i+=2) {
    int16_t rid= GETHIGHFLASHW(routeIdList,i);
-    if (rid==INT16_MAX) break;
    if (rid==id) return 'R';
+    if (rid==0) break;
  }
  for (int16_t i=0;;i+=2) {
    int16_t rid= GETHIGHFLASHW(automationIdList,i);
-    if (rid==INT16_MAX) break;
    if (rid==id) return 'A';
+    if (rid==0) break;
  }
  return 'X';
-}
-
+}   
 // This filter intercepts <> commands to do the following:
 // - Implement RMFT specific commands/diagnostics
 // - Reject/modify JMRI commands that would interfere with RMFT processing
@@ -610,7 +610,6 @@ void RMFT2::loop2() {
      break;
      
  case OPCODE_SPEED:
-    forward=DCC::getThrottleDirection(loco)^invert;
    driveLoco(operand);
    break;
    
@@ -705,11 +704,11 @@ void RMFT2::loop2() {
    DCC::setThrottle(0,1,true);  // pause all locos on the track
    pausingTask=this;
    break;
-
+    
  case OPCODE_POM:
    if (loco) DCC::writeCVByteMain(loco, operand, getOperand(1));
    break;
-
+    
  case OPCODE_POWEROFF:
    TrackManager::setPower(POWERMODE::OFF);
    TrackManager::setJoin(false);
@@ -884,18 +883,23 @@ void RMFT2::loop2() {
    while(loopTask) loopTask->kill(F("KILLALL"));
    return;

-#ifndef DISABLE_PROG
  case OPCODE_JOIN:
    TrackManager::setPower(POWERMODE::ON);
    TrackManager::setJoin(true);
    CommandDistributor::broadcastPower();
    break;
-
+    
+  case OPCODE_POWERON:
+    TrackManager::setMainPower(POWERMODE::ON);
+    TrackManager::setJoin(false);
+    CommandDistributor::broadcastPower();
+    break;
+    
  case OPCODE_UNJOIN:
    TrackManager::setJoin(false);
    CommandDistributor::broadcastPower();
    break;
-
+    
  case OPCODE_READ_LOCO1: // READ_LOCO is implemented as 2 separate opcodes
    progtrackLocoId=LOCO_ID_WAITING;  // Nothing found yet
    DCC::getLocoId(readLocoCallback);
@@ -916,13 +920,6 @@ void RMFT2::loop2() {
    forward=true;
    invert=false;
    break;
-#endif
-
-  case OPCODE_POWERON:
-    TrackManager::setMainPower(POWERMODE::ON);
-    TrackManager::setJoin(false);
-    CommandDistributor::broadcastPower();
-    break;
    
  case OPCODE_START:
    {
@@ -1134,10 +1131,7 @@ void RMFT2::clockEvent(int16_t clocktime, bool change) {
  // Hunt for an ONTIME for this time
  if (Diag::CMD)
   DIAG(F("Looking for clock event at : %d"), clocktime);
-  if (change) {
-    handleEvent(F("CLOCK"),onClockLookup,clocktime);
-    handleEvent(F("CLOCK"),onClockLookup,25*60+clocktime%60);
-  }
+  if (change)  handleEvent(F("CLOCK"),onClockLookup,clocktime);
 } 

 void RMFT2::handleEvent(const FSH* reason,LookList* handlers, int16_t id) {
@@ -1171,11 +1165,11 @@ void RMFT2::thrungeString(uint32_t strfar, thrunger mode, byte id) {
   // Find out where the string is going 
   switch (mode) {
    case thrunge_print:
-         StringFormatter::send(&USB_SERIAL,F("<* EXRAIL(%d) "),loco);
-         stream=&USB_SERIAL;
+         StringFormatter::send(&Serial,F("<* EXRAIL(%d) "),loco);
+         stream=&Serial;
         break;

-    case thrunge_serial: stream=&USB_SERIAL; break;  
+    case thrunge_serial: stream=&Serial; break;  
    case thrunge_serial1: 
         #ifdef SERIAL1_COMMANDS
         stream=&Serial1; 
@@ -1206,6 +1200,7 @@ void RMFT2::thrungeString(uint32_t strfar, thrunger mode, byte id) {
         stream=&Serial6; 
         #endif
         break;
+  // TODO  more serials for SAMx case thrunge_serial4: stream=&Serial4; break;
    case thrunge_lcn: 
      #if defined(LCN_SERIAL) 
      stream=&LCN_SERIAL;
@@ -1214,7 +1209,6 @@ void RMFT2::thrungeString(uint32_t strfar, thrunger mode, byte id) {
    case thrunge_parse:
    case thrunge_broadcast:
    case thrunge_lcd:
-    default:    // thrunge_lcd+1, ...
         if (!buffer) buffer=new StringBuffer();
         buffer->flush();
         stream=buffer;
@@ -1238,24 +1232,19 @@ void RMFT2::thrungeString(uint32_t strfar, thrunger mode, byte id) {
  // and decide what to do next
   switch (mode) {
    case thrunge_print:
-         StringFormatter::send(&USB_SERIAL,F(" *>\n"));
+         StringFormatter::send(&Serial,F(" *>\n"));
         break;
    // TODO  more serials for SAMx case thrunge_serial4: stream=&Serial4; break;
    case thrunge_parse: 
-      DCCEXParser::parseOne(&USB_SERIAL,(byte*)buffer->getString(),NULL);
+      DCCEXParser::parseOne(&Serial,(byte*)buffer->getString(),NULL);
      break;
    case thrunge_broadcast:
-      CommandDistributor::broadcastRaw(CommandDistributor::COMMAND_TYPE,buffer->getString());
-      break;
-    case thrunge_withrottle:
-      CommandDistributor::broadcastRaw(CommandDistributor::WITHROTTLE_TYPE,buffer->getString());
+  // TODO     CommandDistributor::broadcastText(buffer->getString());
      break;
    case thrunge_lcd:
         LCD(id,F("%s"),buffer->getString());
         break;
-    default:  // thrunge_lcd+1, ...
-      if (mode > thrunge_lcd) 
-        SCREEN(mode-thrunge_lcd, id, F("%s"),buffer->getString());  // print to other display
-      break;       
+
+     default: break;       
    }
 }
--- a/EXRAIL2.h
+++ b/EXRAIL2.h
@@ -1,7 +1,6 @@
 /*
 *  © 2021 Neil McKechnie
 *  © 2020-2022 Chris Harlow
- *  © 2022 Colin Murdoch
 *  © 2023 Harald Barth
 *  All rights reserved.
 *  
@@ -45,10 +44,7 @@ enum OPCODE : byte {OPCODE_THROW,OPCODE_CLOSE,
             OPCODE_RED,OPCODE_GREEN,OPCODE_AMBER,OPCODE_DRIVE,
             OPCODE_SERVO,OPCODE_SIGNAL,OPCODE_TURNOUT,OPCODE_WAITFOR,
             OPCODE_PAD,OPCODE_FOLLOW,OPCODE_CALL,OPCODE_RETURN,
-#ifndef DISABLE_PROG
-             OPCODE_JOIN,OPCODE_UNJOIN,OPCODE_READ_LOCO1,OPCODE_READ_LOCO2,
-#endif
-             OPCODE_POM,
+             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,
@@ -77,16 +73,11 @@ enum OPCODE : byte {OPCODE_THROW,OPCODE_CLOSE,
             OPCODE_IFLOCO
             };

-// Ensure thrunge_lcd is put last as there may be more than one display, 
-// sequentially numbered from thrunge_lcd.
 enum thrunger: byte {
-  thrunge_print, thrunge_broadcast, thrunge_withrottle,
-  thrunge_serial,thrunge_parse,
+  thrunge_print, thrunge_broadcast, thrunge_serial,thrunge_parse,
  thrunge_serial1, thrunge_serial2, thrunge_serial3,
  thrunge_serial4, thrunge_serial5, thrunge_serial6,
-  thrunge_lcn, 
-  thrunge_lcd,  // Must be last!!
-  };
+  thrunge_lcd, thrunge_lcn};


 
--- a/EXRAIL2MacroReset.h
+++ b/EXRAIL2MacroReset.h
@@ -1,6 +1,5 @@
 /*
 *  © 2020-2022 Chris Harlow. All rights reserved.
- *  © 2022 Colin Murdoch
 *  © 2023 Harald Barth
 *  
 *  This file is part of CommandStation-EX
@@ -29,7 +28,6 @@
 #undef AFTER
 #undef ALIAS
 #undef AMBER
-#undef ANOUT
 #undef AT
 #undef ATGTE
 #undef ATLT
@@ -81,7 +79,6 @@
 #undef KILLALL
 #undef LATCH 
 #undef LCD 
-#undef SCREEN
 #undef LCN 
 #undef MOVETT
 #undef ONACTIVATE
@@ -92,7 +89,6 @@
 #undef ONCLOSE
 #undef ONTIME
 #undef ONCLOCKTIME
-#undef ONCLOCKMINS
 #undef ONGREEN
 #undef ONRED
 #undef ONTHROW 
@@ -101,9 +97,7 @@
 #undef PAUSE
 #undef PIN_TURNOUT 
 #undef PRINT
-#ifndef DISABLE_PROG
 #undef POM
-#endif
 #undef POWEROFF
 #undef POWERON
 #undef READ_LOCO 
@@ -138,13 +132,11 @@
 #undef STOP 
 #undef THROW  
 #undef TURNOUT 
-#undef TURNOUTL
 #undef UNJOIN
 #undef UNLATCH 
 #undef VIRTUAL_SIGNAL
 #undef VIRTUAL_TURNOUT
 #undef WAITFOR
-#undef WITHROTTLE
 #undef XFOFF
 #undef XFON

@@ -154,7 +146,6 @@
 #define AFTER(sensor_id)
 #define ALIAS(name,value...)
 #define AMBER(signal_id)
-#define ANOUT(vpin,value,param1,param2)
 #define AT(sensor_id)
 #define ATGTE(sensor_id,value) 
 #define ATLT(sensor_id,value) 
@@ -205,8 +196,7 @@
 #define JOIN 
 #define KILLALL
 #define LATCH(sensor_id) 
-#define LCD(row,msg)
-#define SCREEN(display,row,msg)
+#define LCD(row,msg) 
 #define LCN(msg) 
 #define MOVETT(id,steps,activity)
 #define ONACTIVATE(addr,subaddr)
@@ -214,7 +204,6 @@
 #define ONAMBER(signal_id) 
 #define ONTIME(value)
 #define ONCLOCKTIME(hours,mins)
-#define ONCLOCKMINS(mins)
 #define ONDEACTIVATE(addr,subaddr)
 #define ONDEACTIVATEL(linear) 
 #define ONCLOSE(turnout_id)
@@ -226,9 +215,7 @@
 #define PIN_TURNOUT(id,pin,description...) 
 #define PRINT(msg) 
 #define PARSE(msg)
-#ifndef DISABLE_PROG
 #define POM(cv,value)
-#endif
 #define POWEROFF
 #define POWERON
 #define READ_LOCO 
@@ -263,13 +250,11 @@
 #define STOP 
 #define THROW(id)  
 #define TURNOUT(id,addr,subaddr,description...) 
-#define TURNOUTL(id,addr,description...) 
 #define UNJOIN 
 #define UNLATCH(sensor_id) 
 #define VIRTUAL_SIGNAL(id) 
 #define VIRTUAL_TURNOUT(id,description...) 
 #define WAITFOR(pin)
-#define WITHROTTLE(msg)
 #define XFOFF(cab,func)
 #define XFON(cab,func)
 #endif
--- a/EXRAILMacros.h
+++ b/EXRAILMacros.h
@@ -1,7 +1,6 @@
 /*
 *  © 2021 Neil McKechnie
 *  © 2020-2022 Chris Harlow
- *  © 2022 Colin Murdoch
 *  © 2023 Harald Barth
 *  All rights reserved.
 *  
@@ -46,7 +45,7 @@
 // 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), LCD(row,msg) and SCREEN(display,row,msg) are implemented in a separate pass to create 
+// 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
@@ -81,14 +80,14 @@ void exrailHalSetup() {
 #define ROUTE(id, description) id,
 const int16_t HIGHFLASH RMFT2::routeIdList[]= {
    #include "myAutomation.h"
-    INT16_MAX};
+    0}; 
 // Pass 2a create throttle automation list 
 #include "EXRAIL2MacroReset.h"
 #undef AUTOMATION
 #define AUTOMATION(id, description) id,
 const int16_t HIGHFLASH RMFT2::automationIdList[]= {
    #include "myAutomation.h"
-    INT16_MAX};
+    0}; 

 // Pass 3 Create route descriptions:
 #undef ROUTE
@@ -143,18 +142,7 @@ const int StringMacroTracker1=__COUNTER__;
         tmode=thrunge_lcd; \
         lcdid=id;\
         break;\
-      }
-#undef SCREEN
-#define SCREEN(display,id,msg)  \
-     case (__COUNTER__ - StringMacroTracker1) : {\
-         static const char HIGHFLASH thrunge[]=msg;\
-         strfar=(uint32_t)GETFARPTR(thrunge);\
-         tmode=(thrunger)(thrunge_lcd+display); \
-         lcdid=id;\
-         break;\
      } 
-#undef WITHROTTLE
-#define WITHROTTLE(msg) THRUNGE(msg,thrunge_withrottle)

 void  RMFT2::printMessage(uint16_t id) { 
  thrunger tmode;
@@ -190,7 +178,7 @@ const FSH * RMFT2::getTurnoutDescription(int16_t turnoutid) {
 // Pass 6: Roster IDs (count)
 #include "EXRAIL2MacroReset.h"
 #undef ROSTER
-#define ROSTER(cabid,name,funcmap...) +(cabid <= 0 ? 0 : 1)
+#define ROSTER(cabid,name,funcmap...) +1
 const byte RMFT2::rosterNameCount=0
   #include "myAutomation.h"
   ;
@@ -201,7 +189,7 @@ const byte RMFT2::rosterNameCount=0
 #define ROSTER(cabid,name,funcmap...) cabid,
 const int16_t HIGHFLASH  RMFT2::rosterIdList[]={
   #include "myAutomation.h"
-   INT16_MAX};
+   0};

 // Pass 7: Roster names getter
 #include "EXRAIL2MacroReset.h"
@@ -223,7 +211,7 @@ const FSH * RMFT2::getRosterFunctions(int16_t id) {
      #include "myAutomation.h"
   default: break; 
   }   
-   return NULL;
+   return F("");
 } 

 // Pass 8 Signal definitions
@@ -258,7 +246,6 @@ const  HIGHFLASH  int16_t RMFT2::SignalDefinitions[] = {
 #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 ANOUT(vpin,value,param1,param2) OPCODE_SERVO,V(vpin),OPCODE_PAD,V(value),OPCODE_PAD,V(param1),OPCODE_PAD,V(param2),
 #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),  
@@ -310,7 +297,6 @@ const  HIGHFLASH  int16_t RMFT2::SignalDefinitions[] = {
 #define KILLALL OPCODE_KILLALL,0,0,
 #define LATCH(sensor_id) OPCODE_LATCH,V(sensor_id),
 #define LCD(id,msg) PRINT(msg)
-#define SCREEN(display,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),
@@ -319,7 +305,6 @@ const  HIGHFLASH  int16_t RMFT2::SignalDefinitions[] = {
 #define ONCLOSE(turnout_id) OPCODE_ONCLOSE,V(turnout_id),
 #define ONTIME(value) OPCODE_ONTIME,V(value),  
 #define ONCLOCKTIME(hours,mins) OPCODE_ONTIME,V((STRIP_ZERO(hours)*60)+STRIP_ZERO(mins)),
-#define ONCLOCKMINS(mins) ONCLOCKTIME(25,mins)
 #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),
@@ -327,10 +312,8 @@ const  HIGHFLASH  int16_t RMFT2::SignalDefinitions[] = {
 #define ONTHROW(turnout_id) OPCODE_ONTHROW,V(turnout_id),
 #define ONCHANGE(sensor_id) OPCODE_ONCHANGE,V(sensor_id),
 #define PAUSE OPCODE_PAUSE,0,0,
-#define PIN_TURNOUT(id,pin,description...) OPCODE_PINTURNOUT,V(id),OPCODE_PAD,V(pin),
-#ifndef DISABLE_PROG
+#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),
-#endif
 #define POWEROFF OPCODE_POWEROFF,0,0,
 #define POWERON OPCODE_POWERON,0,0,
 #define PRINT(msg) OPCODE_PRINT,V(__COUNTER__ - StringMacroTracker2),
@@ -367,12 +350,10 @@ const  HIGHFLASH  int16_t RMFT2::SignalDefinitions[] = {
 #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 TURNOUTL(id,addr,description...) TURNOUT(id,(addr-1)/4+1,(addr-1)%4, description)
 #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 WITHROTTLE(msg) PRINT(msg)
 #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),
@@ -386,8 +367,6 @@ const  HIGHFLASH  byte RMFT2::RouteCode[] = {
 // Restore normal code LCD & SERIAL  macro
 #undef LCD
 #define LCD   StringFormatter::lcd
-#undef SCREEN
-#define SCREEN  StringFormatter::lcd2
 #undef SERIAL
 #define SERIAL  0x0
 #endif
--- a/EthernetInterface.cpp
+++ b/EthernetInterface.cpp
@@ -136,7 +136,7 @@ bool EthernetInterface::checkLink() {
      DIAG(F("Ethernet cable connected"));
      connected=true;
      #ifdef IP_ADDRESS
-      Ethernet.setLocalIP(IP_ADDRESS);      // for static IP, set it again
+      setLocalIP(IP_ADDRESS);               // for static IP, set it again
      #endif
      IPAddress ip = Ethernet.localIP();    // look what IP was obtained (dynamic or static)
      server = new EthernetServer(IP_PORT); // Ethernet Server listening on default port IP_PORT
--- a/FSH.h
+++ b/FSH.h
@@ -47,11 +47,7 @@
 typedef __FlashStringHelper FSH;
 #define FLASH PROGMEM
 #define GETFLASH(addr) pgm_read_byte_near(addr)
-#define STRCPY_P strcpy_P
-#define STRCMP_P strcmp_P
-#define STRNCPY_P strncpy_P
-#define STRNCMP_P strncmp_P
-#define STRLEN_P strlen_P
+

 #if defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560)
 // AVR_MEGA memory deliberately placed at end of link may need _far functions
@@ -84,10 +80,5 @@ typedef char FSH;
 #define GETFLASH(addr) (*(const byte *)(addr))
 #define GETHIGHFLASH(data,offset)  (*(const byte *)(GETFARPTR(data)+offset))
 #define GETHIGHFLASHW(data,offset) (*(const uint16_t *)(GETFARPTR(data)+offset))
-#define STRCPY_P strcpy
-#define STRCMP_P strcmp
-#define STRNCPY_P strncpy
-#define STRNCMP_P strncmp
-#define STRLEN_P strlen
 #endif
 #endif
--- a/GITHUB_SHA.h
+++ b/GITHUB_SHA.h
@@ -1 +1 @@
-#define GITHUB_SHA "devel-202308020800Z"
+#define GITHUB_SHA "devel-202302131946Z"
--- a/I2CManager.cpp
+++ b/I2CManager.cpp
@@ -1,6 +1,6 @@
 /*
- *  © 2023, Neil McKechnie
 *  © 2022 Paul M Antoine
+ *  © 2021, Neil McKechnie
 *  All rights reserved.
 *
 *  This file is part of CommandStation-EX
@@ -35,125 +35,28 @@
 #elif defined(ARDUINO_ARCH_SAMD)
 #include "I2CManager_NonBlocking.h"
 #include "I2CManager_SAMD.h"      // SAMD21 for now... SAMD51 as well later
-#elif defined(ARDUINO_ARCH_STM32)
-#include "I2CManager_NonBlocking.h"
-#include "I2CManager_STM32.h"      // STM32F411RE for now... more later
 #else
 #define I2C_USE_WIRE
 #include "I2CManager_Wire.h"      // Other platforms
 #endif


-// Helper function for listing device types
-static const FSH * guessI2CDeviceType(uint8_t address) {
-  if (address >= 0x20 && address <= 0x26)
-    return F("GPIO Expander");
-  else if (address == 0x27)
-    return F("GPIO Expander or LCD Display");
-  else if (address == 0x29)
-    return F("Time-of-flight sensor");
-  else if (address >= 0x3c && address <= 0x3d)
-    return F("OLED Display");
-  else if (address >= 0x48 && address <= 0x4f)
-    return F("Analogue Inputs or PWM");
-  else if (address >= 0x40 && address <= 0x4f)
-    return F("PWM");
-  else if (address >= 0x50 && address <= 0x5f) 
-    return F("EEPROM"); 
-  else if (address == 0x68) 
-    return F("Real-time clock"); 
-  else if (address >= 0x70 && address <= 0x77)
-    return F("I2C Mux");
-  else
-    return F("?");
-}
-
 // If not already initialised, initialise I2C
 void I2CManagerClass::begin(void) {
+  //setTimeout(25000); // 25 millisecond timeout
  if (!_beginCompleted) {
    _beginCompleted = true;
-
-    // Check for short-circuit or floating lines (no pull-up) on I2C before enabling I2C
-    const FSH *message = F("WARNING: Check I2C %S line for short/pullup");
-    pinMode(SDA, INPUT);
-    if (!digitalRead(SDA))
-      DIAG(message, F("SDA"));
-    pinMode(SCL, INPUT);
-    if (!digitalRead(SCL))
-      DIAG(message, F("SCL"));
-
-    // Now initialise I2C
    _initialise();

-    #if defined(I2C_USE_WIRE)
-    DIAG(F("I2CManager: Using Wire library"));
-    #endif
-
-    // Probe and list devices.  Use standard mode 
-    //  (clock speed 100kHz) for best device compatibility.
-    _setClock(100000);
-    unsigned long originalTimeout = _timeout;
-    setTimeout(1000);       // use 1ms timeout for probes
-
-  #if defined(I2C_EXTENDED_ADDRESS)
-    // First count the multiplexers and switch off all subbuses
-    _muxCount = 0;
-    for (uint8_t muxNo=I2CMux_0; muxNo <= I2CMux_7; muxNo++) {
-      if (I2CManager.muxSelectSubBus({(I2CMux)muxNo, SubBus_None})==I2C_STATUS_OK)
-        _muxCount++;
-    }
-  #endif
-
-    // Enumerate devices that are visible
+    // Probe and list devices.
    bool found = false;
-    for (uint8_t addr=0x08; addr<0x78; addr++) {
+    for (byte addr=1; addr<127; addr++) {
      if (exists(addr)) {
        found = true; 
-        DIAG(F("I2C Device found at 0x%x, %S?"), addr, guessI2CDeviceType(addr));
+        DIAG(F("I2C Device found at x%x"), addr);
      }
    }
-
-#if defined(I2C_EXTENDED_ADDRESS)
-    // Enumerate all I2C devices that are connected via multiplexer, 
-    // i.e. that respond when only one multiplexer has one subBus enabled
-    // and the device doesn't respond when the mux subBus is disabled.
-    // If any probes time out, then assume that the subbus is dead and
-    // don't do any more on that subbus.
-    for (uint8_t muxNo=I2CMux_0; muxNo <= I2CMux_7; muxNo++) {
-      uint8_t muxAddr = I2C_MUX_BASE_ADDRESS + muxNo;
-      if (exists(muxAddr)) {
-        // Select Mux Subbus
-        for (uint8_t subBus=0; subBus<=SubBus_No; subBus++) {
-          muxSelectSubBus({(I2CMux)muxNo, (I2CSubBus)subBus});
-          for (uint8_t addr=0x08; addr<0x78; addr++) {
-            uint8_t status = checkAddress(addr);
-            if (status == I2C_STATUS_OK) {
-              // De-select subbus
-              muxSelectSubBus({(I2CMux)muxNo, SubBus_None});
-              if (!exists(addr)) {
-                // Device responds when subbus selected but not when
-                // subbus disabled - ergo it must be on subbus!
-                found = true; 
-                DIAG(F("I2C Device found at {I2CMux_%d,SubBus_%d,0x%x}, %S?"), 
-                  muxNo, subBus, addr, guessI2CDeviceType(addr));
-              }
-              // Re-select subbus
-              muxSelectSubBus({(I2CMux)muxNo, (I2CSubBus)subBus});
-            } else if (status == I2C_STATUS_TIMEOUT) {
-              // Bus stuck, skip to next one.
-              break;
-            }
-          }
-        }
-        // Deselect all subBuses for this mux.  Otherwise its devices will continue to
-        // respond when other muxes are being probed.
-        I2CManager.muxSelectSubBus({(I2CMux)muxNo, SubBus_None});  // Deselect Mux
-      } 
-    }
-#endif
    if (!found) DIAG(F("No I2C Devices found"));
-    _setClock(_clockSpeed);
-    setTimeout(originalTimeout);      // set timeout back to original
  }
 }

@@ -162,35 +65,31 @@ void I2CManagerClass::begin(void) {
 void I2CManagerClass::setClock(uint32_t speed) {
  if (speed < _clockSpeed && !_clockSpeedFixed) {
    _clockSpeed = speed;
-    DIAG(F("I2C clock speed set to %l Hz"), _clockSpeed);
  }
  _setClock(_clockSpeed);
 }

-// Force clock speed to that specified.
+// Force clock speed to that specified.  It can then only 
+// be overridden by calling Wire.setClock directly.
 void I2CManagerClass::forceClock(uint32_t speed) {
-  _clockSpeed = speed;
-  _clockSpeedFixed = true;
-  _setClock(_clockSpeed);
-  DIAG(F("I2C clock speed forced to %l Hz"), _clockSpeed);
+  if (!_clockSpeedFixed) {
+    _clockSpeed = speed;
+    _clockSpeedFixed = true;
+    _setClock(_clockSpeed);
+  }
 }

 // Check if specified I2C address is responding (blocking operation)
 // Returns I2C_STATUS_OK (0) if OK, or error code.
-// Suppress retries.  If it doesn't respond first time it's out of the running.
-uint8_t I2CManagerClass::checkAddress(I2CAddress address) {
-  I2CRB rb;
-  rb.setWriteParams(address, NULL, 0);
-  rb.suppressRetries(true);
-  queueRequest(&rb);
-  return rb.wait();
+uint8_t I2CManagerClass::checkAddress(uint8_t address) {
+  return write(address, NULL, 0);
 }


 /***************************************************************************
 *  Write a transmission to I2C using a list of data (blocking operation)
 ***************************************************************************/
-uint8_t I2CManagerClass::write(I2CAddress address, uint8_t nBytes, ...) {
+uint8_t I2CManagerClass::write(uint8_t address, uint8_t nBytes, ...) {
  uint8_t buffer[nBytes];
  va_list args;
  va_start(args, nBytes);
@@ -203,7 +102,7 @@ uint8_t I2CManagerClass::write(I2CAddress address, uint8_t nBytes, ...) {
 /***************************************************************************
 *  Initiate a write to an I2C device (blocking operation)
 ***************************************************************************/
-uint8_t I2CManagerClass::write(I2CAddress i2cAddress, const uint8_t writeBuffer[], uint8_t writeLen) {
+uint8_t I2CManagerClass::write(uint8_t i2cAddress, const uint8_t writeBuffer[], uint8_t writeLen) {
  I2CRB req;
  uint8_t status = write(i2cAddress, writeBuffer, writeLen, &req);
  return finishRB(&req, status);
@@ -212,7 +111,7 @@ uint8_t I2CManagerClass::write(I2CAddress i2cAddress, const uint8_t writeBuffer[
 /***************************************************************************
 *  Initiate a write from PROGMEM (flash) to an I2C device (blocking operation)
 ***************************************************************************/
-uint8_t I2CManagerClass::write_P(I2CAddress i2cAddress, const uint8_t * data, uint8_t dataLen) {
+uint8_t I2CManagerClass::write_P(uint8_t i2cAddress, const uint8_t * data, uint8_t dataLen) {
  I2CRB req;
  uint8_t status = write_P(i2cAddress, data, dataLen, &req);
  return finishRB(&req, status);
@@ -221,7 +120,7 @@ uint8_t I2CManagerClass::write_P(I2CAddress i2cAddress, const uint8_t * data, ui
 /***************************************************************************
 *  Initiate a write (optional) followed by a read from the I2C device (blocking operation)
 ***************************************************************************/
-uint8_t I2CManagerClass::read(I2CAddress i2cAddress, uint8_t *readBuffer, uint8_t readLen, 
+uint8_t I2CManagerClass::read(uint8_t i2cAddress, uint8_t *readBuffer, uint8_t readLen, 
    const uint8_t *writeBuffer, uint8_t writeLen)
 {
  I2CRB req;
@@ -232,7 +131,7 @@ uint8_t I2CManagerClass::read(I2CAddress i2cAddress, uint8_t *readBuffer, uint8_
 /***************************************************************************
 *  Overload of read() to allow command to be specified as a series of bytes (blocking operation)
 ***************************************************************************/
-uint8_t I2CManagerClass::read(I2CAddress address, uint8_t readBuffer[], uint8_t readSize, 
+uint8_t I2CManagerClass::read(uint8_t address, uint8_t readBuffer[], uint8_t readSize, 
                                  uint8_t writeSize, ...) {
  va_list args;
  // Copy the series of bytes into an array.
@@ -263,7 +162,7 @@ const FSH *I2CManagerClass::getErrorMessage(uint8_t status) {
    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("I2C bus timeout");
+    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");
@@ -277,40 +176,46 @@ const FSH *I2CManagerClass::getErrorMessage(uint8_t status) {
 ***************************************************************************/
 I2CManagerClass I2CManager = I2CManagerClass();

-// Buffer for conversion of I2CAddress to char*.
-/* static */ char I2CAddress::addressBuffer[30];

 /////////////////////////////////////////////////////////////////////////////
 // Helper functions associated with I2C Request Block
 /////////////////////////////////////////////////////////////////////////////

 /***************************************************************************
- *  Block waiting for request to complete, and return completion status.
- *  Timeout monitoring is performed in the I2CManager.loop() function.
+ *  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.
 ***************************************************************************/
 uint8_t I2CRB::wait() {
-  while (status==I2C_STATUS_PENDING) {
+  unsigned long waitStart = millis();
+  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);
  return status;
 }

 /***************************************************************************
 *  Check whether request is still in progress.
- *  Timeout monitoring is performed in the I2CManager.loop() function.
 ***************************************************************************/
 bool I2CRB::isBusy() {
-  if (status==I2C_STATUS_PENDING) {
-    I2CManager.loop();
-    return true;
-  } else
-    return false;
+  I2CManager.loop();
+  return (status==I2C_STATUS_PENDING);
 }

 /***************************************************************************
 *  Helper functions to fill the I2CRequest structure with parameters.
 ***************************************************************************/
-void I2CRB::setReadParams(I2CAddress i2cAddress, uint8_t *readBuffer, uint8_t readLen) {
+void I2CRB::setReadParams(uint8_t i2cAddress, uint8_t *readBuffer, uint8_t readLen) {
  this->i2cAddress = i2cAddress;
  this->writeLen = 0;
  this->readBuffer = readBuffer;
@@ -319,7 +224,7 @@ void I2CRB::setReadParams(I2CAddress i2cAddress, uint8_t *readBuffer, uint8_t re
  this->status = I2C_STATUS_OK;
 }

-void I2CRB::setRequestParams(I2CAddress i2cAddress, uint8_t *readBuffer, uint8_t readLen, 
+void I2CRB::setRequestParams(uint8_t i2cAddress, uint8_t *readBuffer, uint8_t readLen, 
    const uint8_t *writeBuffer, uint8_t writeLen) {
  this->i2cAddress = i2cAddress;
  this->writeBuffer = writeBuffer;
@@ -330,7 +235,7 @@ void I2CRB::setRequestParams(I2CAddress i2cAddress, uint8_t *readBuffer, uint8_t
  this->status = I2C_STATUS_OK;
 }

-void I2CRB::setWriteParams(I2CAddress i2cAddress, const uint8_t *writeBuffer, uint8_t writeLen) {
+void I2CRB::setWriteParams(uint8_t i2cAddress, const uint8_t *writeBuffer, uint8_t writeLen) {
  this->i2cAddress = i2cAddress;
  this->writeBuffer = writeBuffer;
  this->writeLen = writeLen;
@@ -339,28 +244,3 @@ void I2CRB::setWriteParams(I2CAddress i2cAddress, const uint8_t *writeBuffer, ui
  this->status = I2C_STATUS_OK;
 }

-void I2CRB::suppressRetries(bool suppress) {
-  if (suppress)
-    this->operation |= OPERATION_NORETRY;
-  else
-    this->operation &= ~OPERATION_NORETRY;
-}
-
-
-// Helper function for converting a uint8_t to four characters (e.g. 0x23).
-void I2CAddress::toHex(const uint8_t value, char *buffer) {
-  char *ptr = buffer;
-  // Just display hex value, two digits.
-  *ptr++ = '0';
-  *ptr++ = 'x';
-  uint8_t bits = (value >> 4) & 0xf;
-  *ptr++ = bits > 9 ? bits-10+'a' : bits+'0';
-  bits = value & 0xf;
-  *ptr++ = bits > 9 ? bits-10+'a' : bits+'0';
-}
-
-#if !defined(I2C_EXTENDED_ADDRESS) 
-
-/* static */ bool I2CAddress::_addressWarningDone = false;
-
-#endif
--- a/I2CManager.h
+++ b/I2CManager.h
@@ -1,6 +1,6 @@
 /*
- *  © 2023, Neil McKechnie. All rights reserved.
 *  © 2022 Paul M Antoine
+ *  © 2021, Neil McKechnie. All rights reserved.
 *
 *  This file is part of CommandStation-EX
 *
@@ -23,15 +23,13 @@

 #include <inttypes.h>
 #include "FSH.h"
-#include "defines.h"
-#include "DIAG.h"

 /* 
 * Manager for I2C communications.  For portability, it allows use 
 * of the Wire class, but also has a native implementation for AVR
 * which supports non-blocking queued I/O requests.
 * 
- * Helps to avoid calling Wire.begin() multiple times (which is not
+ * Helps to avoid calling Wire.begin() multiple times (which is not)
 * entirely benign as it reinitialises).
 * 
 * Also helps to avoid the Wire clock from being set, by another device
@@ -78,12 +76,12 @@
 * Timeout monitoring is possible, but requires that the following call is made
 * reasonably frequently in the program's loop() function:
 *  I2CManager.loop();
- * So that the application doesn't need to do this explicitly, this call is performed
- * from the I2CRB::isBusy() or I2CRB::wait() functions.
 * 
 */

 /* 
+ * Future enhancement possibility:
+ *
 *  I2C Multiplexer (e.g. TCA9547, TCA9548)
 * 
 *  A multiplexer offers a way of extending the address range of I2C devices.  For example, GPIO extenders use address range 0x20-0x27
@@ -96,10 +94,15 @@
 *  Thirdly, the multiplexer offers the ability to use mixed-speed devices more effectively, by allowing high-speed devices to be
 *  put on a different bus to low-speed devices, enabling the software to switch the I2C speed on-the-fly between I2C transactions.
 * 
+ *  Changes required:  Increase the size of the I2CAddress field in the IODevice class from uint8_t to uint16_t.
+ *  The most significant byte would contain a '1' bit flag, the multiplexer number (0-7) and bus number (0-7).  Then, when performing
+ *  an I2C operation, the I2CManager would check this byte and, if zero, do what it currently does.  If the byte is non-zero, then
+ *  that means the device is connected via a multiplexer so the I2C transaction should be preceded by a select command issued to the
+ *  relevant multiplexer.
 * 
 *  Non-interrupting I2C:
 * 
- *  Non-blocking I2C may be operated without interrupts (undefine I2C_USE_INTERRUPTS).  Instead, the I2C state
+ *  I2C may be operated without interrupts (undefine I2C_USE_INTERRUPTS).  Instead, the I2C state
 *  machine handler, currently invoked from the interrupt service routine, is invoked from the loop() function.
 *  The speed at which I2C operations can be performed then becomes highly dependent on the frequency that 
 *  the loop() function is called, and may be adequate under some circumstances.  
@@ -108,13 +111,6 @@
 * 
 */

-// Maximum number of retries on an I2C operation.
-// A value of zero will disable retries.
-// Maximum value is 254 (unsigned byte counter)
-// Note that timeout failures are not retried, but any timeout
-// configured applies to each try separately.
-#define MAX_I2C_RETRIES 2
-
 // Add following line to config.h to enable Wire library instead of native I2C drivers
 //#define I2C_USE_WIRE

@@ -126,233 +122,6 @@
 #define I2C_USE_INTERRUPTS
 #endif

-// I2C Extended Address support I2C Multiplexers and allows various properties to be 
-// associated with an I2C address such as the MUX and SubBus.  In the future, this
-// may be extended to include multiple buses, and other features. 
-// Uncomment to enable extended address.
-//
-
-//#define I2C_EXTENDED_ADDRESS
-
-/////////////////////////////////////////////////////////////////////////////////////
-// Extended I2C Address type to facilitate extended I2C addresses including
-// I2C multiplexer support.
-/////////////////////////////////////////////////////////////////////////////////////
-
-// Currently only one bus supported, and one instance of I2CManager to handle it.
-enum I2CBus : uint8_t {
-    I2CBus_0 = 0,
-};
-
-// Currently I2CAddress supports one I2C bus, with up to eight
-// multipexers (MUX) attached.  Each MUX can have up to eight sub-buses.
-enum I2CMux : uint8_t {
-  I2CMux_0 = 0,
-  I2CMux_1 = 1,
-  I2CMux_2 = 2,
-  I2CMux_3 = 3,
-  I2CMux_4 = 4,
-  I2CMux_5 = 5,
-  I2CMux_6 = 6,
-  I2CMux_7 = 7,
-  I2CMux_None = 255,   // Address doesn't need mux switching
-};
-  
-enum I2CSubBus : uint8_t {
-  SubBus_0 = 0,        // Enable individual sub-buses...
-  SubBus_1 = 1,
-#if !defined(I2CMUX_PCA9542)
-  SubBus_2 = 2,
-  SubBus_3 = 3,
-#if !defined(I2CMUX_PCA9544)
-  SubBus_4 = 4,
-  SubBus_5 = 5,
-  SubBus_6 = 6,
-  SubBus_7 = 7,
-#endif
-#endif
-  SubBus_No,           // Number of subbuses (highest + 1)
-  SubBus_None = 254,   // Disable all sub-buses on selected mux
-  SubBus_All = 255,    // Enable all sub-buses (not supported by some multiplexers)
-};
-
-// Type to hold I2C address
-#if defined(I2C_EXTENDED_ADDRESS)
-
-// First MUX address (they range between 0x70-0x77).
-#define I2C_MUX_BASE_ADDRESS 0x70
-
-// Currently I2C address supports one I2C bus, with up to eight
-// multiplexers (MUX) attached.  Each MUX can have up to eight sub-buses.
-// This structure could be extended in the future (if there is a need) 
-// to support 10-bit I2C addresses, different I2C clock speed for each
-// sub-bus, multiple I2C buses, and other features not yet thought of.
-struct I2CAddress {
-private:
-  // Fields
-  I2CBus _busNumber;
-  I2CMux _muxNumber;
-  I2CSubBus _subBus;
-  uint8_t _deviceAddress;
-  static char addressBuffer[];
-public:
-  // Constructors
-  // For I2CAddress "{I2CBus_0, Mux_0, SubBus_0, 0x23}" syntax.
-  I2CAddress(const I2CBus busNumber, const I2CMux muxNumber, const I2CSubBus subBus, const uint8_t deviceAddress) {
-    _busNumber = busNumber;
-    _muxNumber = muxNumber;
-    _subBus = subBus;
-    _deviceAddress = deviceAddress;
-  }
-
-  // Basic constructor
-  I2CAddress() : I2CAddress(I2CMux_None, SubBus_None, 0) {}
-
-  // For I2CAddress "{Mux_0, SubBus_0, 0x23}" syntax.
-  I2CAddress(const I2CMux muxNumber, const I2CSubBus subBus, const uint8_t deviceAddress) :
-    I2CAddress(I2CBus_0, muxNumber, subBus, deviceAddress) {}
-
-  // For I2CAddress in form "{SubBus_0, 0x23}" - assume Mux0 (0x70)
-  I2CAddress(I2CSubBus subBus, uint8_t deviceAddress) : 
-    I2CAddress(I2CMux_0, subBus, deviceAddress) {}
-
-  // Conversion from uint8_t to I2CAddress
-  // For I2CAddress in form "0x23"
-  // (device assumed to be on the main I2C bus).
-  I2CAddress(const uint8_t deviceAddress) : 
-    I2CAddress(I2CMux_None, SubBus_None, deviceAddress) {}
-    
-  // Conversion from uint8_t to I2CAddress
-  // For I2CAddress in form "{I2CBus_1, 0x23}"
-  // (device not connected via multiplexer).
-  I2CAddress(const I2CBus bus, const uint8_t deviceAddress) : 
-    I2CAddress(bus, I2CMux_None, SubBus_None, deviceAddress) {}
-
-  // For I2CAddress in form "{I2CMux_0, SubBus_0}" (mux selector)
-  I2CAddress(const I2CMux muxNumber, const I2CSubBus subBus) :
-    I2CAddress(muxNumber, subBus, 0x00) {}
-
-  // For I2CAddress in form "{i2cAddress, deviceAddress}"
-  // where deviceAddress is to be on the same subbus as i2cAddress.
-  I2CAddress(I2CAddress firstAddress, uint8_t newDeviceAddress) :
-    I2CAddress(firstAddress._muxNumber, firstAddress._subBus, newDeviceAddress) {}
-
-  // Conversion operator from I2CAddress to uint8_t
-  // For "uint8_t address = i2cAddress;" syntax
-  // (device assumed to be on the main I2C bus or on a currently selected subbus.
-  operator uint8_t () const { return _deviceAddress; }
-
-  // Conversion from I2CAddress to char* (uses static storage so only 
-  // one conversion can be done at a time).  So don't call it twice in a
-  // single DIAG statement for example.
-  const char* toString() { 
-    char *ptr = addressBuffer;
-    if (_muxNumber != I2CMux_None) {
-      strcpy_P(ptr, (const char*)F("{I2CMux_"));
-      ptr += 8;
-      *ptr++ = '0' + _muxNumber;
-      strcpy_P(ptr, (const char*)F(",Subbus_"));
-      ptr += 8;
-      if (_subBus == SubBus_None) {
-        strcpy_P(ptr, (const char*)F("None"));
-        ptr += 4;
-      } else if (_subBus == SubBus_All) {
-        strcpy_P(ptr, (const char*)F("All"));
-        ptr += 3;
-      } else 
-        *ptr++ = '0' + _subBus;
-      *ptr++ = ',';
-    }
-    toHex(_deviceAddress, ptr);
-    ptr += 4;
-    if (_muxNumber != I2CMux_None)
-      *ptr++ = '}';
-    *ptr = 0; // terminate string
-    return addressBuffer;
-  }
-
-  // Comparison operator
-  int operator == (I2CAddress &a) const {
-    if (_deviceAddress != a._deviceAddress) 
-      return false; // Different device address so no match
-    if (_muxNumber == I2CMux_None || a._muxNumber == I2CMux_None)
-      return true;  // Same device address, one or other on main bus
-    if (_subBus == SubBus_None || a._subBus == SubBus_None) 
-      return true;  // Same device address, one or other on main bus
-    if (_muxNumber != a._muxNumber) 
-      return false; // Connected to a subbus on a different mux
-    if (_subBus != a._subBus)
-      return false;  // different subbus
-    return true;  // Same address on same mux and same subbus
-  }
-  // Field accessors
-  I2CMux muxNumber() { return _muxNumber; }
-  I2CSubBus subBus() { return _subBus; }
-  uint8_t deviceAddress() { return _deviceAddress; }
-
-private:
-  // Helper function for converting byte to four-character hex string (e.g. 0x23).
-  void toHex(const uint8_t value, char *buffer);
-};
-
-#else
-struct I2CAddress {
-private:
-  uint8_t _deviceAddress;
-  static char addressBuffer[];
-public:
-  // Constructors
-  I2CAddress(const uint8_t deviceAddress) {
-    _deviceAddress = deviceAddress;
-  }
-  I2CAddress(I2CMux, I2CSubBus, const uint8_t deviceAddress) {
-    addressWarning();
-    _deviceAddress = deviceAddress;
-  }
-  I2CAddress(I2CSubBus, const uint8_t deviceAddress) {
-    addressWarning();
-    _deviceAddress = deviceAddress;
-  }
-
-  // Basic constructor
-  I2CAddress() : I2CAddress(0) {}
-
-  // Conversion operator from I2CAddress to uint8_t
-  // For "uint8_t address = i2cAddress;" syntax
-  operator uint8_t () const { return _deviceAddress; }
-
-  // Conversion from I2CAddress to char* (uses static storage so only 
-  // one conversion can be done at a time).  So don't call it twice in a
-  // single DIAG statement for example.
-  const char* toString () { 
-    char *ptr = addressBuffer;
-    // Just display hex value, two digits.
-    toHex(_deviceAddress, ptr);
-    ptr += 4;
-    *ptr = 0; // terminate string
-    return addressBuffer;
-  }
-
-  // Comparison operator
-  int operator == (I2CAddress &a) const {
-    if (_deviceAddress != a._deviceAddress) 
-      return false; // Different device address so no match
-    return true;  // Same address on same mux and same subbus
-  }
-private:
-  // Helper function for converting byte to four-character hex string (e.g. 0x23).
-  void toHex(const uint8_t value, char *buffer);
-  void addressWarning() {
-    if (!_addressWarningDone) {
-      DIAG(F("WARNIING: Extended I2C address used but not supported in this configuration"));
-      _addressWarningDone = true;
-    }
-  }    
-  static bool _addressWarningDone;
-};
-#endif // I2C_EXTENDED_ADDRESS
-
-
 // Status codes for I2CRB structures.
 enum : uint8_t {
  // Codes used by Wire and by native drivers
@@ -375,7 +144,6 @@ enum : uint8_t {
  I2C_STATE_ACTIVE=253,
  I2C_STATE_FREE=254,
  I2C_STATE_CLOSING=255,
-  I2C_STATE_COMPLETED=252,
 };

 typedef enum : uint8_t
@@ -384,8 +152,6 @@ typedef enum : uint8_t
  OPERATION_REQUEST = 2,
  OPERATION_SEND = 3,
  OPERATION_SEND_P = 4,
-  OPERATION_NORETRY = 0x80,  // OR with operation to suppress retries.
-  OPERATION_MASK = 0x7f,  // mask for extracting the operation code
 } OperationEnum;


@@ -404,19 +170,18 @@ public:
  uint8_t wait();
  bool isBusy();

-  void setReadParams(I2CAddress i2cAddress, uint8_t *readBuffer, uint8_t readLen);
-  void setRequestParams(I2CAddress i2cAddress, uint8_t *readBuffer, uint8_t readLen, const uint8_t *writeBuffer, uint8_t writeLen);
-  void setWriteParams(I2CAddress i2cAddress, const uint8_t *writeBuffer, uint8_t writeLen);
-  void suppressRetries(bool suppress);
+  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);

  uint8_t writeLen;
  uint8_t readLen;
  uint8_t operation;
-  I2CAddress i2cAddress;
+  uint8_t i2cAddress;
  uint8_t *readBuffer;
  const uint8_t *writeBuffer;
 #if !defined(I2C_USE_WIRE)
-  I2CRB *nextRequest;  // Used by non-blocking devices for I2CRB queue management.
+  I2CRB *nextRequest;
 #endif
 };

@@ -430,33 +195,26 @@ public:
  void setClock(uint32_t speed);
  // Force clock speed 
  void forceClock(uint32_t speed);
-  // setTimeout sets the timout value for I2C transactions (milliseconds).
-  void setTimeout(unsigned long);
  // Check if specified I2C address is responding.
-  uint8_t checkAddress(I2CAddress address);
-  inline bool exists(I2CAddress address) {
+  uint8_t checkAddress(uint8_t address);
+  inline bool exists(uint8_t address) {
    return checkAddress(address)==I2C_STATUS_OK;
  }
-  // Select/deselect Mux Sub-Bus (if using legacy addresses, just checks address)
-  // E.g. muxSelectSubBus({I2CMux_0, SubBus_3});
-  uint8_t muxSelectSubBus(I2CAddress address) {
-    return checkAddress(address);
-  }
  // Write a complete transmission to I2C from an array in RAM
-  uint8_t write(I2CAddress address, const uint8_t buffer[], uint8_t size);
-  uint8_t write(I2CAddress address, const uint8_t buffer[], uint8_t size, I2CRB *rb);
+  uint8_t write(uint8_t address, const uint8_t buffer[], uint8_t size);
+  uint8_t write(uint8_t address, const uint8_t buffer[], uint8_t size, I2CRB *rb);
  // Write a complete transmission to I2C from an array in Flash
-  uint8_t write_P(I2CAddress address, const uint8_t buffer[], uint8_t size);
-  uint8_t write_P(I2CAddress address, const uint8_t buffer[], uint8_t size, I2CRB *rb);
+  uint8_t write_P(uint8_t address, const uint8_t buffer[], uint8_t size);
+  uint8_t write_P(uint8_t address, const uint8_t buffer[], uint8_t size, I2CRB *rb);
  // Write a transmission to I2C from a list of bytes.
-  uint8_t write(I2CAddress address, uint8_t nBytes, ...);
+  uint8_t write(uint8_t address, uint8_t nBytes, ...);
  // Write a command from an array in RAM and read response
-  uint8_t read(I2CAddress address, uint8_t readBuffer[], uint8_t readSize, 
+  uint8_t read(uint8_t address, uint8_t readBuffer[], uint8_t readSize, 
    const uint8_t writeBuffer[]=NULL, uint8_t writeSize=0);
-  uint8_t read(I2CAddress address, uint8_t readBuffer[], uint8_t readSize, 
+  uint8_t read(uint8_t address, uint8_t readBuffer[], uint8_t readSize, 
    const uint8_t writeBuffer[], uint8_t writeSize, I2CRB *rb);
  // Write a command from an arbitrary list of bytes and read response
-  uint8_t read(I2CAddress address, uint8_t readBuffer[], uint8_t readSize, 
+  uint8_t read(uint8_t address, uint8_t readBuffer[], uint8_t readSize, 
    uint8_t writeSize, ...);
  void queueRequest(I2CRB *req);

@@ -473,37 +231,18 @@ public:
 private:
  bool _beginCompleted = false;
  bool _clockSpeedFixed = false;
-  uint8_t retryCounter;  // Count of retries
-  // Clock speed must be no higher than 400kHz on AVR. Higher is possible on 4809, SAMD
-  // and STM32 but most popular I2C devices are 400kHz so in practice the higher speeds
-  // will not be useful.  The speed can be overridden by I2CManager::forceClock().
-  uint32_t _clockSpeed = I2C_FREQ;  
-  // Default timeout 100ms on I2C request block completion.
-  // A full 32-byte transmission takes about 8ms at 100kHz,
-  // so this value allows lots of headroom.  
-  // It can be modified by calling I2CManager.setTimeout() function.
-  // When retries are enabled, the timeout applies to each
-  // try, and failure from timeout does not get retried.
-  // A value of 0 means disable timeout monitoring.
-  unsigned long _timeout = 100000UL;
-    
+#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);

  void _initialise();
  void _setClock(unsigned long);

-#if defined(I2C_EXTENDED_ADDRESS)
-// Count of I2C multiplexers found when initialising.  If there is only one
-// MUX then the subbus does not need de-selecting after use; however, if there
-// are two or more, then the subbus must be deselected to avoid multiple
-// sub-bus legs on different multiplexers being accessible simultaneously.
-private:
-  uint8_t _muxCount = 0;
-public:
-  uint8_t getMuxCount() { return _muxCount; }
-#endif
-
 #if !defined(I2C_USE_WIRE)
    // I2CRB structs are queued on the following two links.
    // If there are no requests, both are NULL.
@@ -513,57 +252,42 @@ public:
    // Within the queue, each request's nextRequest field points to the 
    // next request, or NULL.
    // Mark volatile as they are updated by IRC and read/written elsewhere.
-private:
-    I2CRB * volatile queueHead = NULL;
-    I2CRB * volatile queueTail = NULL;
+    static I2CRB * volatile queueHead;
+    static I2CRB * volatile queueTail;
+    static volatile uint8_t state;

-    // State is set to I2C_STATE_FREE when the interrupt handler has finished
-    // the current request and is ready to complete.
-    uint8_t state = I2C_STATE_FREE;
-
-    // CompletionStatus may be set by the interrupt handler at any time but is
-    // not written to the I2CRB until the state is I2C_STATE_FREE.
-    uint8_t completionStatus = I2C_STATUS_OK;
-    uint8_t overallStatus = I2C_STATUS_OK;
-
-    I2CRB * currentRequest = NULL;
-    uint8_t txCount = 0;
-    uint8_t rxCount = 0;
-    uint8_t bytesToSend = 0;
-    uint8_t bytesToReceive = 0;
-    uint8_t operation = 0;
-    unsigned long startTime = 0;
-    uint8_t muxPhase = 0;
-    uint8_t muxAddress = 0;
-    uint8_t muxData[1];
-    uint8_t deviceAddress;
-    const uint8_t *sendBuffer;
-    uint8_t *receiveBuffer;
-
-    volatile uint32_t pendingClockSpeed = 0;
+    static I2CRB * volatile currentRequest;
+    static volatile uint8_t txCount;
+    static volatile uint8_t rxCount;
+    static volatile uint8_t bytesToSend;
+    static volatile uint8_t bytesToReceive;
+    static volatile uint8_t operation;
+    static volatile unsigned long startTime;

+    static unsigned long timeout; // Transaction timeout in microseconds.  0=disabled.
+    
    void startTransaction();
    
    // Low-level hardware manipulation functions.
-    void I2C_init();
-    void I2C_setClock(unsigned long i2cClockSpeed);
-    void I2C_handleInterrupt();
-    void I2C_sendStart();
-    void I2C_sendStop();
-    void I2C_close();
+    static void I2C_init();
+    static void I2C_setClock(unsigned long i2cClockSpeed);
+    static void I2C_handleInterrupt();
+    static void I2C_sendStart();
+    static void I2C_sendStop();
+    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; */ };
+
    // handleInterrupt needs to be public to be called from the ISR function!
-    void handleInterrupt();
+    static void handleInterrupt();
 #endif


 };

-// Pointer to class instance (Note: if there is more than one bus, each will have
-// its own instance of I2CManager, selected by the queueRequest function from
-// the I2CBus field within the request block's I2CAddress).
 extern I2CManagerClass I2CManager;

-
 #endif
--- a/I2CManager_AVR.h
+++ b/I2CManager_AVR.h
@@ -1,5 +1,5 @@
 /*
- *  © 2023, Neil McKechnie. All rights reserved.
+ *  © 2021, Neil McKechnie. All rights reserved.
 *
 *  This file is part of CommandStation-EX
 *
@@ -22,7 +22,6 @@

 #include <Arduino.h>
 #include "I2CManager.h"
-#include "I2CManager_NonBlocking.h"   // to satisfy intellisense

 #include <avr/io.h>
 #include <avr/interrupt.h>
@@ -95,13 +94,12 @@ void I2CManagerClass::I2C_init()
 *  Initiate a start bit for transmission.
 ***************************************************************************/
 void I2CManagerClass::I2C_sendStart() {
-  rxCount = 0;
-  txCount = 0;
-  // We may have already triggered a stop bit in the same run as this.  To avoid
-  // clearing that bit before the stop bit has been sent, we can either wait for
-  // it to complete or we can OR the bit onto the existing bits.
-  TWCR |= (1<<TWEN)|ENABLE_TWI_INTERRUPT|(1<<TWINT)|(1<<TWEA)|(1<<TWSTA);  // Send Start
-
+  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 (TWCR & (1<<TWSTO)) {}
+  TWCR = (1<<TWEN)|ENABLE_TWI_INTERRUPT|(1<<TWINT)|(1<<TWEA)|(1<<TWSTA);  // Send Start
 }

 /***************************************************************************
@@ -109,7 +107,7 @@ void I2CManagerClass::I2C_sendStart() {
 ***************************************************************************/
 void I2CManagerClass::I2C_sendStop() {
  TWDR = 0xff;  // Default condition = SDA released
-  TWCR = (1<<TWEN)|(1<<TWINT)|(1<<TWSTO);  // Send Stop
+  TWCR = (1<<TWEN)|(1<<TWINT)|(1<<TWEA)|(1<<TWSTO);  // Send Stop
 }

 /***************************************************************************
@@ -117,8 +115,9 @@ void I2CManagerClass::I2C_sendStop() {
 ***************************************************************************/
 void I2CManagerClass::I2C_close() {
  // disable TWI
+  I2C_sendStop();
+  while (TWCR & (1<<TWSTO)) {}
  TWCR = (1<<TWINT);                 // clear any interrupt and stop twi.
-  delayMicroseconds(10);  // Wait for things to stabilise (hopefully)
 }

 /***************************************************************************
@@ -126,51 +125,37 @@ void I2CManagerClass::I2C_close() {
 *  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 (!(TWCR & (1<<TWINT))) return;  // Nothing to do.

  uint8_t twsr = TWSR & 0xF8;

-
-  // Main I2C interrupt handler, used for the device communications.
-  // The following variables are used:
-  //    bytesToSend, bytesToReceive (R/W)
-  //    txCount, rxCount (W)
-  //    deviceAddress (R)
-  //    sendBuffer, receiveBuffer (R)
-  //    operation (R)
-  //    state, completionStatus (W)
-  // 
  // Cases are ordered so that the most frequently used ones are tested first.
  switch (twsr) {
    case TWI_MTX_DATA_ACK:      // Data byte has been transmitted and ACK received
    case TWI_MTX_ADR_ACK:       // SLA+W has been transmitted and ACK received
      if (bytesToSend) {  // Send first.
        if (operation == OPERATION_SEND_P)
-          TWDR = GETFLASH(sendBuffer + (txCount++));
+          TWDR = GETFLASH(currentRequest->writeBuffer + (txCount++));
        else
-          TWDR = sendBuffer[txCount++];
+          TWDR = currentRequest->writeBuffer[txCount++];
        bytesToSend--;
-        TWCR = (1<<TWEN)|ENABLE_TWI_INTERRUPT|(1<<TWINT);
+        TWCR = (1<<TWEN)|ENABLE_TWI_INTERRUPT|(1<<TWINT)|(1<<TWEA);
      } else if (bytesToReceive) {  // All sent, anything to receive?
-        // Don't need to wait for stop, as the interface won't send the start until
-        // any in-progress stop condition from previous interrupts has been sent.
-        TWCR = (1<<TWEN)|ENABLE_TWI_INTERRUPT|(1<<TWINT)|(1<<TWSTA);  // Send Start
-      } else {  
-         // Nothing left to send or receive
+        while (TWCR & (1<<TWSTO)) {}    // Wait for stop to be sent
+        TWCR = (1<<TWEN)|ENABLE_TWI_INTERRUPT|(1<<TWINT)|(1<<TWEA)|(1<<TWSTA);  // Send Start
+      } 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_STATE_COMPLETED;
+        state = I2C_STATUS_OK;
      }
      break;
-
    case TWI_MRX_DATA_ACK:      // Data byte has been received and ACK transmitted
      if (bytesToReceive > 0) {
-        receiveBuffer[rxCount++] = TWDR;
+        currentRequest->readBuffer[rxCount++] = TWDR;
        bytesToReceive--;
      }
      /* fallthrough */
-
    case TWI_MRX_ADR_ACK:      // SLA+R has been sent and ACK received
      if (bytesToReceive <= 1) {
        TWCR = (1<<TWEN)|ENABLE_TWI_INTERRUPT|(1<<TWINT); // Send NACK after next reception
@@ -179,51 +164,45 @@ void I2CManagerClass::I2C_handleInterrupt() {
        TWCR = (1<<TWEN)|ENABLE_TWI_INTERRUPT|(1<<TWINT)|(1<<TWEA);
      }
      break;
-
    case TWI_MRX_DATA_NACK:     // Data byte has been received and NACK transmitted
      if (bytesToReceive > 0) {
-        receiveBuffer[rxCount++] = TWDR;
+        currentRequest->readBuffer[rxCount++] = TWDR;
        bytesToReceive--;
      }
      TWCR = (1<<TWEN)|(1<<TWINT)|(1<<TWEA)|(1<<TWSTO);  // Send Stop
-      state = I2C_STATE_COMPLETED;
+      state = I2C_STATUS_OK;
      break;
-
    case TWI_START:             // START has been transmitted  
    case TWI_REP_START:         // Repeated START has been transmitted
      // Set up address and R/W
      if (operation == OPERATION_READ || (operation==OPERATION_REQUEST && !bytesToSend))
-        TWDR = (deviceAddress << 1) | 1; // SLA+R
+        TWDR = (currentRequest->i2cAddress << 1) | 1; // SLA+R
      else
-        TWDR = (deviceAddress << 1) | 0; // SLA+W
+        TWDR = (currentRequest->i2cAddress << 1) | 0; // SLA+W
      TWCR = (1<<TWEN)|ENABLE_TWI_INTERRUPT|(1<<TWINT)|(1<<TWEA);
      break;
-
    case TWI_MTX_ADR_NACK:      // SLA+W has been transmitted and NACK received
    case TWI_MRX_ADR_NACK:      // SLA+R has been transmitted and NACK received
    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
-      completionStatus = I2C_STATUS_NEGATIVE_ACKNOWLEDGE;
-      state = I2C_STATE_COMPLETED;
+      state = I2C_STATUS_NEGATIVE_ACKNOWLEDGE;
      break;
-
    case TWI_ARB_LOST:          // Arbitration lost
      // Restart transaction from start.
      I2C_sendStart();
      break;
-
    case TWI_BUS_ERROR:         // Bus error due to an illegal START or STOP condition
    default:
      TWDR = 0xff;  // Default condition = SDA released
      TWCR = (1<<TWEN)|(1<<TWINT)|(1<<TWEA)|(1<<TWSTO);  // Send Stop
-      completionStatus = I2C_STATUS_TRANSMIT_ERROR;
-      state = I2C_STATE_COMPLETED;
+      state = I2C_STATUS_TRANSMIT_ERROR;
  }
 }

 #if defined(I2C_USE_INTERRUPTS)
 ISR(TWI_vect) {
-  I2CManager.handleInterrupt();
+  I2CManagerClass::handleInterrupt();
 }
 #endif

--- a/I2CManager_Mega4809.h
+++ b/I2CManager_Mega4809.h
@@ -1,5 +1,5 @@
 /*
- *  © 2023, Neil McKechnie. All rights reserved.
+ *  © 2021, Neil McKechnie. All rights reserved.
 *
 *  This file is part of CommandStation-EX
 *
@@ -28,21 +28,21 @@
 ***************************************************************************/
 void I2CManagerClass::I2C_setClock(unsigned long i2cClockSpeed) {
  uint16_t t_rise;
-  if (i2cClockSpeed < 200000)
+  if (i2cClockSpeed < 200000) {
+    i2cClockSpeed = 100000;
    t_rise = 1000;
-  else if (i2cClockSpeed < 800000)
+  } else if (i2cClockSpeed < 800000) {
+    i2cClockSpeed = 400000;
    t_rise = 300;
-  else
+  } else if (i2cClockSpeed < 1200000) {
+    i2cClockSpeed = 1000000;
    t_rise = 120;
-
-  if (t_rise == 120)
-    TWI0.CTRLA |= TWI_FMPEN_bm;
-  else
-    TWI0.CTRLA &= ~TWI_FMPEN_bm;
-  
+  } else {
+    i2cClockSpeed = 100000;
+    t_rise = 1000;
+  }
  uint32_t baud = (F_CPU_CORRECTED / i2cClockSpeed - F_CPU_CORRECTED / 1000 / 1000
    * t_rise / 1000 - 10) / 2;
-  if (baud > 255) baud = 255;  // ~30kHz
  TWI0.MBAUD = (uint8_t)baud;
 }

@@ -54,13 +54,13 @@ void I2CManagerClass::I2C_init()
  pinMode(PIN_WIRE_SDA, INPUT_PULLUP);
  pinMode(PIN_WIRE_SCL, INPUT_PULLUP);
  PORTMUX.TWISPIROUTEA |= TWI_MUX;
-  I2C_setClock(I2C_FREQ);

 #if defined(I2C_USE_INTERRUPTS)
  TWI0.MCTRLA = TWI_RIEN_bm | TWI_WIEN_bm | TWI_ENABLE_bm;
 #else
  TWI0.MCTRLA = TWI_ENABLE_bm;
 #endif
+  I2C_setClock(I2C_FREQ);
  TWI0.MSTATUS = TWI_BUSSTATE_IDLE_gc;
 }

@@ -68,8 +68,8 @@ void I2CManagerClass::I2C_init()
 *  Initiate a start bit for transmission, followed by address and R/W
 ***************************************************************************/
 void I2CManagerClass::I2C_sendStart() {
-  txCount = 0;
-  rxCount = 0;
+  bytesToSend = currentRequest->writeLen;
+  bytesToReceive = currentRequest->readLen;

  // If anything to send, initiate write.  Otherwise initiate read.
  if (operation == OPERATION_READ || ((operation == OPERATION_REQUEST) && !bytesToSend))
@@ -89,10 +89,7 @@ void I2CManagerClass::I2C_sendStop() {
 *  Close I2C down
 ***************************************************************************/
 void I2CManagerClass::I2C_close() {
-
-  TWI0.MCTRLA &= ~(TWI_RIEN_bm | TWI_WIEN_bm | TWI_ENABLE_bm);        // Switch off I2C
-  TWI0.MSTATUS = TWI_BUSSTATE_UNKNOWN_gc;
-  delayMicroseconds(10);  // Wait for things to stabilise (hopefully)
+  I2C_sendStop();
 }

 /***************************************************************************
@@ -108,42 +105,46 @@ void I2CManagerClass::I2C_handleInterrupt() {
    I2C_sendStart();   // Reinitiate request
  } else if (currentStatus & TWI_BUSERR_bm) {
    // Bus error
-    completionStatus = I2C_STATUS_BUS_ERROR;
-    state = I2C_STATE_COMPLETED;
+    state = 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;
-      completionStatus = I2C_STATUS_NEGATIVE_ACKNOWLEDGE;
-      state = I2C_STATE_COMPLETED;
-
+      state = I2C_STATUS_NEGATIVE_ACKNOWLEDGE;
    } else if (bytesToSend) {
-      // Acked, so send next byte (don't need to use GETFLASH)
-      TWI0.MDATA = sendBuffer[txCount++];
+      // Acked, so send next byte
+      if (currentRequest->operation == OPERATION_SEND_P)
+        TWI0.MDATA = GETFLASH(currentRequest->writeBuffer + (txCount++));
+      else
+        TWI0.MDATA = currentRequest->writeBuffer[txCount++];
      bytesToSend--;
    } else if (bytesToReceive) {
-      // Last sent byte acked and no more to send.  Send repeated start, address and read bit.
-      TWI0.MADDR = (deviceAddress << 1) | 1;
+        // Last sent byte acked and no more to send.  Send repeated start, address and read bit.
+        TWI0.MADDR = (currentRequest->i2cAddress << 1) | 1;
    } else {
      // No more data to send/receive. Initiate a STOP condition.
      TWI0.MCTRLB = TWI_MCMD_STOP_gc;
-      state = I2C_STATE_COMPLETED;
+      state = I2C_STATUS_OK;  // Done
    }
  } else if (currentStatus & TWI_RIF_bm) {
    // Master read completed without errors
    if (bytesToReceive) {
-      receiveBuffer[rxCount++] = TWI0.MDATA;  // Store received byte
+      currentRequest->readBuffer[rxCount++] = TWI0.MDATA;  // Store received byte
      bytesToReceive--;
-    } 
+    } else { 
+      // Buffer full, issue nack/stop
+      TWI0.MCTRLB = TWI_ACKACT_bm | TWI_MCMD_STOP_gc;
+      state = I2C_STATUS_OK;
+    }
    if (bytesToReceive) {
      // More bytes to receive, issue ack and start another read
      TWI0.MCTRLB = TWI_MCMD_RECVTRANS_gc;
    } else {
      // Transaction finished, issue NACK and STOP.
      TWI0.MCTRLB = TWI_ACKACT_bm | TWI_MCMD_STOP_gc;
-      state = I2C_STATE_COMPLETED;
+      state = I2C_STATUS_OK;
    }
  }
 }
@@ -153,7 +154,7 @@ void I2CManagerClass::I2C_handleInterrupt() {
 *  Interrupt handler.
 ***************************************************************************/
 ISR(TWI0_TWIM_vect) {
-  I2CManager.handleInterrupt();
+  I2CManagerClass::handleInterrupt();
 }

 #endif
--- a/I2CManager_NonBlocking.h
+++ b/I2CManager_NonBlocking.h
@@ -1,6 +1,6 @@
 /*
- *  © 2023, Neil McKechnie
 *  © 2022 Paul M Antoine
+ *  © 2021, Neil McKechnie
 *  All rights reserved.
 *
 *  This file is part of CommandStation-EX
@@ -24,47 +24,51 @@

 #include <Arduino.h>
 #include "I2CManager.h"
-
-// Support for atomic isolation (i.e. a block with interrupts disabled).
-// E.g. 
-//       ATOMIC_BLOCK() {
-//         doSomethingWithInterruptsDisabled();
-//       }
-// This has the advantage over simple noInterrupts/Interrupts that the
-// original interrupt state is restored when the block finishes.
-//
-// (This should really be defined in an include file somewhere more global, so 
-// it can replace use of noInterrupts/interrupts in other parts of DCC-EX.
-//
-static inline uint8_t _deferInterrupts(void) {
-  noInterrupts();
-  return 1;
+#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 void _conditionalEnableInterrupts(bool *wasEnabled) {
-  if (*wasEnabled) interrupts();
-}
-#define ATOMIC_BLOCK(x) \
-for (bool _int_saved __attribute__((__cleanup__(_conditionalEnableInterrupts))) \
-            =_getInterruptState(),_ToDo=_deferInterrupts(); _ToDo; _ToDo=0)

-#if defined(__AVR__) // Nano, Uno, Mega2580, NanoEvery, etc.
-  static inline bool _getInterruptState(void) {
-    return bitRead(SREG, SREG_I);  // true if enabled, false if disabled
-  }
-#elif defined(__arm__)  // STM32, SAMD, Teensy
-  static inline bool _getInterruptState( void ) {
-    uint32_t reg;
-    __asm__ __volatile__ ("MRS %0, primask" : "=r" (reg) );
-    return !(reg & 1);  // true if interrupts enabled, false otherwise
-  }
-#else
-  #warning "ATOMIC_BLOCK() not defined for this target type, I2C interrupts disabled"
-  #define ATOMIC_BLOCK(x) // expand to nothing.
-  #ifdef I2C_USE_INTERRUPTS
-    #undef I2C_USE_INTERRUPTS
-  #endif
+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
 #endif
-

 // This module is only compiled if I2C_USE_WIRE is not defined, so undefine it here
 // to get intellisense to work correctly.
@@ -72,14 +76,6 @@ for (bool _int_saved __attribute__((__cleanup__(_conditionalEnableInterrupts)))
 #undef I2C_USE_WIRE
 #endif

-enum MuxPhase: uint8_t {
-  MuxPhase_OFF = 0,
-  MuxPhase_PROLOG,
-  MuxPhase_PAYLOAD,
-  MuxPhase_EPILOG,
-} ;
-
-
 /***************************************************************************
 * Initialise the I2CManagerAsync class.
 ***************************************************************************/
@@ -88,82 +84,31 @@ void I2CManagerClass::_initialise()
  queueHead = queueTail = NULL;
  state = I2C_STATE_FREE;
  I2C_init();
-  _setClock(_clockSpeed);
 }

 /***************************************************************************
 *  Set I2C clock speed.  Normally 100000 (Standard) or 400000 (Fast)
 *   on Arduino.  Mega4809 supports 1000000 (Fast+) too.
- *   This function saves the desired clock speed and the startTransaction
- *   function acts on it before a new transaction, to avoid speed changes
- *   during an I2C transaction.
 ***************************************************************************/
 void I2CManagerClass::_setClock(unsigned long i2cClockSpeed) {
-  pendingClockSpeed = i2cClockSpeed;
+  I2C_setClock(i2cClockSpeed);
 }

 /***************************************************************************
- * Start an I2C transaction, if the I2C interface is free and
+ * Helper function to start operations, if the I2C interface is free and
 * there is a queued request to be processed.
- * If there's an I2C clock speed change pending, then implement it before 
- * starting the operation.
 ***************************************************************************/
-void I2CManagerClass::startTransaction() {
-  ATOMIC_BLOCK() {
+void I2CManagerClass::startTransaction() { 
+  ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
    if ((state == I2C_STATE_FREE) && (queueHead != NULL)) {
      state = I2C_STATE_ACTIVE;
-      completionStatus = I2C_STATUS_OK;
-      // Check for pending clock speed change
-      if (pendingClockSpeed) {
-        // We're about to start a new I2C transaction, so set clock now.
-        I2C_setClock(pendingClockSpeed);
-        pendingClockSpeed = 0;
-      }
-      startTime = micros();
      currentRequest = queueHead;
      rxCount = txCount = 0;
-
+      // Copy key fields to static data for speed.
+      operation = currentRequest->operation;
      // Start the I2C process going.
-#if defined(I2C_EXTENDED_ADDRESS)
-      I2CMux muxNumber = currentRequest->i2cAddress.muxNumber();
-      if (muxNumber != I2CMux_None) {
-        muxPhase = MuxPhase_PROLOG;
-        uint8_t subBus = currentRequest->i2cAddress.subBus();
-        muxData[0] = (subBus == SubBus_All) ? 0xff :
-                     (subBus == SubBus_None) ? 0x00 :
-#if defined(I2CMUX_PCA9547)
-                      0x08 | subBus;
-#elif defined(I2CMUX_PCA9542) || defined(I2CMUX_PCA9544)
-                      0x04 | subBus;   // NB Only 2 or 4 subbuses respectively
-#else
-                      // Default behaviour for most MUXs is to use a mask
-                      // with a bit set for the subBus to be enabled
-                      1 << subBus;
-#endif
-        deviceAddress = I2C_MUX_BASE_ADDRESS + muxNumber;
-        sendBuffer = &muxData[0];
-        bytesToSend = 1;
-        bytesToReceive = 0;
-        operation = OPERATION_SEND;
-      } else {
-        // Send/receive payload for device only.
-        muxPhase = MuxPhase_OFF;
-        deviceAddress = currentRequest->i2cAddress;
-        sendBuffer = currentRequest->writeBuffer;
-        bytesToSend = currentRequest->writeLen;
-        receiveBuffer = currentRequest->readBuffer;
-        bytesToReceive = currentRequest->readLen;
-        operation = currentRequest->operation & OPERATION_MASK;
-      } 
-#else
-      deviceAddress = currentRequest->i2cAddress;
-      sendBuffer = currentRequest->writeBuffer;
-      bytesToSend = currentRequest->writeLen;
-      receiveBuffer = currentRequest->readBuffer;
-      bytesToReceive = currentRequest->readLen;
-      operation = currentRequest->operation & OPERATION_MASK;
-#endif
      I2C_sendStart();
+      startTime = micros();
    }
  }
 }
@@ -174,7 +119,8 @@ void I2CManagerClass::startTransaction() {
 void I2CManagerClass::queueRequest(I2CRB *req) {
  req->status = I2C_STATUS_PENDING;
  req->nextRequest = NULL;
-  ATOMIC_BLOCK() {
+
+  ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
    if (!queueTail) 
      queueHead = queueTail = req;  // Only item on queue
    else
@@ -187,7 +133,7 @@ void I2CManagerClass::queueRequest(I2CRB *req) {
 /***************************************************************************
 *  Initiate a write to an I2C device (non-blocking operation)
 ***************************************************************************/
-uint8_t I2CManagerClass::write(I2CAddress i2cAddress, const uint8_t *writeBuffer, uint8_t writeLen, I2CRB *req) {
+uint8_t I2CManagerClass::write(uint8_t i2cAddress, const uint8_t *writeBuffer, uint8_t writeLen, I2CRB *req) {
  // Make sure previous request has completed.
  req->wait();
  req->setWriteParams(i2cAddress, writeBuffer, writeLen);
@@ -198,7 +144,7 @@ uint8_t I2CManagerClass::write(I2CAddress i2cAddress, const uint8_t *writeBuffer
 /***************************************************************************
 *  Initiate a write from PROGMEM (flash) to an I2C device (non-blocking operation)
 ***************************************************************************/
-uint8_t I2CManagerClass::write_P(I2CAddress i2cAddress, const uint8_t * writeBuffer, uint8_t writeLen, I2CRB *req) {
+uint8_t I2CManagerClass::write_P(uint8_t i2cAddress, const uint8_t * writeBuffer, uint8_t writeLen, I2CRB *req) {
  // Make sure previous request has completed.
  req->wait();
  req->setWriteParams(i2cAddress, writeBuffer, writeLen);
@@ -211,7 +157,7 @@ uint8_t I2CManagerClass::write_P(I2CAddress i2cAddress, const uint8_t * writeBuf
 *  Initiate a read from the I2C device, optionally preceded by a write 
 *   (non-blocking operation)
 ***************************************************************************/
-uint8_t I2CManagerClass::read(I2CAddress i2cAddress, uint8_t *readBuffer, uint8_t readLen, 
+uint8_t I2CManagerClass::read(uint8_t i2cAddress, uint8_t *readBuffer, uint8_t readLen, 
    const uint8_t *writeBuffer, uint8_t writeLen, I2CRB *req)
 {
  // Make sure previous request has completed.
@@ -221,54 +167,31 @@ uint8_t I2CManagerClass::read(I2CAddress i2cAddress, uint8_t *readBuffer, uint8_
  return I2C_STATUS_OK;
 }

-/***************************************************************************
- *  Set I2C timeout value in microseconds.  The timeout applies to the entire
- *   I2CRB request, e.g. where a write+read is performed, the timer is not
- *   reset before the read.
- ***************************************************************************/
-void I2CManagerClass::setTimeout(unsigned long value) { 
-  _timeout = value; 
-};
-
 /***************************************************************************
 * checkForTimeout() function, called from isBusy() and wait() to cancel
- * requests that are taking too long to complete.  Such faults
+ * 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() {
-  ATOMIC_BLOCK() {
+  unsigned long currentMicros = micros();
+  ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
    I2CRB *t = queueHead;
-    if (state==I2C_STATE_ACTIVE && t!=0 && t==currentRequest && _timeout > 0) {
+    if (state==I2C_STATE_ACTIVE && t!=0 && t==currentRequest && timeout > 0) {
      // Check for timeout
-      unsigned long elapsed = micros() - startTime;
-      if (elapsed > _timeout) { 
-#ifdef DIAG_IO
-        //DIAG(F("I2CManager Timeout on %s"), t->i2cAddress.toString());
-#endif
+      if (currentMicros - startTime > timeout) { 
        // Excessive time. Dequeue request
        queueHead = t->nextRequest;
        if (!queueHead) queueTail = NULL;
        currentRequest = NULL;
-        bytesToReceive = bytesToSend = 0;
        // Post request as timed out.
        t->status = I2C_STATUS_TIMEOUT;
        // Reset TWI interface so it is able to continue
        // Try close and init, not entirely satisfactory but sort of works...
        I2C_close();  // Shutdown and restart twi interface
-
-        // If SDA is stuck low, issue up to 9 clock pulses to attempt to free it.
-        pinMode(SCL, INPUT_PULLUP);
-        pinMode(SDA, INPUT_PULLUP);
-        for (int i=0; !digitalRead(SDA) && i<9; i++) {
-          digitalWrite(SCL, 0); 
-          pinMode(SCL, OUTPUT);         // Force clock low
-          delayMicroseconds(10);        // ... for 5us
-          pinMode(SCL, INPUT_PULLUP);   // ... then high
-          delayMicroseconds(10);        // ... for 5us (100kHz Clock)
-        }
-        // Whether that's succeeded or not, now try reinitialising.
        I2C_init();
-        _setClock(_clockSpeed);
        state = I2C_STATE_FREE;
        
        // Initiate next queued request if any.
@@ -285,8 +208,10 @@ void I2CManagerClass::loop() {
 #if !defined(I2C_USE_INTERRUPTS)
  handleInterrupt();
 #endif
-  // Call function to monitor for stuck I2C operations.
-  checkForTimeout();
+  // 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();
 }

 /***************************************************************************
@@ -298,85 +223,43 @@ void I2CManagerClass::handleInterrupt() {
  // Update hardware state machine
  I2C_handleInterrupt();

+  // Enable interrupts to minimise effect on other interrupt code
+  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_COMPLETED && currentRequest != NULL) {
-    // Operation has completed.
-    if (completionStatus == I2C_STATUS_OK || ++retryCounter > MAX_I2C_RETRIES
-      || currentRequest->operation & OPERATION_NORETRY) 
-    {
-      // Status is OK, or has failed and retry count exceeded, or retries disabled.
-#if defined(I2C_EXTENDED_ADDRESS)
-      if (muxPhase == MuxPhase_PROLOG ) {
-        overallStatus = completionStatus;
-        uint8_t rbAddress = currentRequest->i2cAddress.deviceAddress();
-        if (completionStatus == I2C_STATUS_OK && rbAddress != 0) {
-          // Mux request OK, start handling application request.
-          muxPhase = MuxPhase_PAYLOAD;
-          deviceAddress = rbAddress;
-          sendBuffer = currentRequest->writeBuffer;
-          bytesToSend = currentRequest->writeLen;
-          receiveBuffer = currentRequest->readBuffer;
-          bytesToReceive = currentRequest->readLen;
-          operation = currentRequest->operation & OPERATION_MASK;
-          state = I2C_STATE_ACTIVE;
-          I2C_sendStart();
-          return;
-        } 
-      } else if (muxPhase == MuxPhase_PAYLOAD) {
-        // Application request completed, now send epilogue to mux
-        overallStatus = completionStatus;
-        currentRequest->nBytes = rxCount;  // Save number of bytes read into rb
-        if (_muxCount == 1) {
-          // Only one MUX, don't need to deselect subbus
-          muxPhase = MuxPhase_OFF;
-        } else {
-          muxPhase = MuxPhase_EPILOG;
-          deviceAddress = I2C_MUX_BASE_ADDRESS + currentRequest->i2cAddress.muxNumber();
-          muxData[0] = 0x00;
-          sendBuffer = &muxData[0];
-          bytesToSend = 1;
-          bytesToReceive = 0;
-          operation = OPERATION_SEND;
-          state = I2C_STATE_ACTIVE;
-          I2C_sendStart();
-          return;
-        }
-      } else if (muxPhase == MuxPhase_EPILOG) {
-        // Epilog finished, ignore completionStatus
-        muxPhase = MuxPhase_OFF;
-      } else
-        overallStatus = completionStatus;
-#else
-      overallStatus = completionStatus;
-      currentRequest->nBytes = rxCount;
-#endif
-          
-      // Remove completed request from head of queue
+  if (state != I2C_STATE_ACTIVE && currentRequest != NULL) {
+    // Remove completed request from head of queue
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
      I2CRB * t = queueHead;
-      if (t == currentRequest) {
+      if (t == queueHead) {
        queueHead = t->nextRequest;
        if (!queueHead) queueTail = queueHead;
-        t->status = overallStatus;
+        t->nBytes = rxCount;
+        t->status = state;
        
        // I2C state machine is now free for next request
        currentRequest = NULL;
        state = I2C_STATE_FREE;
-      }
-      retryCounter = 0;
-    } else {
-      // Status is failed and retry permitted.
-      // Retry previous request.
-      state = I2C_STATE_FREE;  
-    }
-  }

-  if (state == I2C_STATE_FREE && queueHead != NULL) {
-    // Allow any pending interrupts before starting the next request.
-    //interrupts();
-    // Start next request
-    I2CManager.startTransaction();
+        // Start next request (if any)
+        I2CManager.startTransaction();
+      }
+    }
  }
 }

+// Fields in I2CManager class specific to Non-blocking implementation.
+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::txCount;
+volatile uint8_t I2CManagerClass::rxCount;
+volatile uint8_t I2CManagerClass::operation;
+volatile uint8_t I2CManagerClass::bytesToSend;
+volatile uint8_t I2CManagerClass::bytesToReceive;
+volatile unsigned long I2CManagerClass::startTime;
+unsigned long I2CManagerClass::timeout = 0;
+
 #endif
--- a/I2CManager_SAMD.h
+++ b/I2CManager_SAMD.h
@@ -1,6 +1,6 @@
 /*
 *  © 2022 Paul M Antoine
- *  © 2023, Neil McKechnie
+ *  © 2021, Neil McKechnie
 *  All rights reserved.
 *
 *  This file is part of CommandStation-EX
@@ -38,7 +38,7 @@
 ***************************************************************************/
 #if defined(I2C_USE_INTERRUPTS) && defined(ARDUINO_SAMD_ZERO)
 void SERCOM3_Handler() {
-  I2CManager.handleInterrupt();
+  I2CManagerClass::handleInterrupt();
 }
 #endif

@@ -46,16 +46,14 @@ void SERCOM3_Handler() {
 Sercom *s = SERCOM3;

 /***************************************************************************
- *  Set I2C clock speed register.  This should only be called outside of
- *  a transmission.  The I2CManagerClass::_setClock() function ensures 
- *  that it is only called at the beginning of an I2C transaction.
+ *  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;    // NB: this overrides a "force clock" of lower than 100KHz!
+    i2cClockSpeed = 100000L;
    t_rise = 1000;
  } else if (i2cClockSpeed < 800000L) {
    i2cClockSpeed = 400000L;
@@ -68,9 +66,6 @@ void I2CManagerClass::I2C_setClock(uint32_t i2cClockSpeed) {
    t_rise = 1000;
  }

-  // Wait while the bus is busy
-  while (s->I2CM.STATUS.bit.BUSSTATE != 0x1);
-
  // Disable the I2C master mode and wait for sync
  s->I2CM.CTRLA.bit.ENABLE = 0 ;
  while (s->I2CM.SYNCBUSY.bit.ENABLE != 0);
@@ -85,6 +80,8 @@ void I2CManagerClass::I2C_setClock(uint32_t i2cClockSpeed) {
  // Setting bus idle mode and wait for sync
  s->I2CM.STATUS.bit.BUSSTATE = 1 ;
  while (s->I2CM.SYNCBUSY.bit.SYSOP != 0);
+
+  return;
 }

 /***************************************************************************
@@ -110,8 +107,8 @@ void I2CManagerClass::I2C_init()
  s->I2CM.CTRLA.reg =  SERCOM_I2CM_CTRLA_MODE( I2C_MASTER_OPERATION )/* |
                            SERCOM_I2CM_CTRLA_SCLSM*/ ;

-  // Enable Smart mode (but not Quick Command)
-  s->I2CM.CTRLB.reg =  SERCOM_I2CM_CTRLB_SMEN;
+  // 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
@@ -144,33 +141,30 @@ void I2CManagerClass::I2C_init()
 	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;
+		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;

-  // Set counters here in case this is a retry.
-  txCount = 0;
-  rxCount = 0;
-
-  // On a single-master I2C bus, the start bit won't be sent until the bus 
-  // state goes to IDLE so we can request it without waiting.  On a 
-  // multi-master bus, the bus may be BUSY under control of another master, 
-  // in which case we can avoid some arbitration failures by waiting until
-  // the bus state is IDLE.  We don't do that here.
+  // 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 flag (1) or'd in
-    s->I2CM.ADDR.bit.ADDR = (deviceAddress << 1) | 1;
+    // Send start and address with read/write flag or'd in
+    s->I2CM.ADDR.bit.ADDR = (currentRequest->i2cAddress << 1) | 1;
  }
  else {
-    // Send start and address with write flag (0) or'd in
-    s->I2CM.ADDR.bit.ADDR = (deviceAddress << 1ul) | 0;
+    // Wait while the I2C bus is BUSY
+    while (s->I2CM.STATUS.bit.BUSSTATE != 0x1);
+    s->I2CM.ADDR.bit.ADDR = (currentRequest->i2cAddress << 1ul) | 0;
  }
 }

@@ -186,13 +180,6 @@ void I2CManagerClass::I2C_sendStop() {
 ***************************************************************************/
 void I2CManagerClass::I2C_close() {
  I2C_sendStop();
-  // Disable the I2C master mode and wait for sync
-  s->I2CM.CTRLA.bit.ENABLE = 0 ;
-  // Wait for up to 500us only.
-  unsigned long startTime = micros();
-  while (s->I2CM.SYNCBUSY.bit.ENABLE != 0) {
-    if (micros() - startTime >= 500UL) break;
-  }
 }

 /***************************************************************************
@@ -207,39 +194,49 @@ void I2CManagerClass::I2C_handleInterrupt() {
    I2C_sendStart();   // Reinitiate request
  } else if (s->I2CM.STATUS.bit.BUSERR) {
    // Bus error
-    completionStatus = I2C_STATUS_BUS_ERROR;
-    state = I2C_STATE_COMPLETED;  // Completed with 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();
-      completionStatus = I2C_STATUS_NEGATIVE_ACKNOWLEDGE;
-      state = I2C_STATE_COMPLETED;  // Completed with error
+      state = I2C_STATUS_NEGATIVE_ACKNOWLEDGE;
    } else if (bytesToSend) {
      // Acked, so send next byte
-      s->I2CM.DATA.bit.DATA = sendBuffer[txCount++];
+      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 = (deviceAddress << 1) | 1;
+        s->I2CM.ADDR.bit.ADDR = (currentRequest->i2cAddress << 1) | 1;
    } else {
-      // No more data to send/receive. Initiate a STOP condition
+      // No more data to send/receive. Initiate a STOP condition.
      I2C_sendStop();
-      state = I2C_STATE_COMPLETED;  // Completed OK
+      state = I2C_STATUS_OK; // Done
    }
  } else if (s->I2CM.INTFLAG.bit.SB) {
    // Master read completed without errors
-    if (bytesToReceive == 1) {
-      s->I2CM.CTRLB.bit.ACKACT = 1;  // NAK final byte
-      I2C_sendStop();  // send stop
-      receiveBuffer[rxCount++] = s->I2CM.DATA.bit.DATA;  // Store received byte
-      bytesToReceive = 0;
-      state = I2C_STATE_COMPLETED;  // Completed OK
-    } else if (bytesToReceive) {
-      s->I2CM.CTRLB.bit.ACKACT = 0;  // ACK all but final byte
-      receiveBuffer[rxCount++] = s->I2CM.DATA.bit.DATA;  // Store received byte
+    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;
    }
  }
 }
--- a/I2CManager_STM32.h
+++ b/I2CManager_STM32.h
@@ -1,312 +0,0 @@
-/*
- *  © 2022-23 Paul M Antoine
- *  © 2023, 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_STM32_H
-#define I2CMANAGER_STM32_H
-
-#include <Arduino.h>
-#include "I2CManager.h"
-#include "I2CManager_NonBlocking.h"   // to satisfy intellisense
-
-//#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_ARCH_STM32)
-void I2C1_IRQHandler() {
-  I2CManager.handleInterrupt();
-}
-#endif
-
-// Assume I2C1 for now - default I2C bus on Nucleo-F411RE and likely Nucleo-64 variants
-I2C_TypeDef *s = I2C1;
-#define I2C_IRQn  I2C1_EV_IRQn
-#define I2C_BUSFREQ 16
-
-// I2C SR1 Status Register #1 bit definitions for convenience
-// #define I2C_SR1_SMBALERT  (1<<15)   // SMBus alert
-// #define I2C_SR1_TIMEOUT   (1<<14)   // Timeout of Tlow error
-// #define I2C_SR1_PECERR    (1<<12)   // PEC error in reception
-// #define I2C_SR1_OVR       (1<<11)   // Overrun/Underrun error
-// #define I2C_SR1_AF        (1<<10)   // Acknowledge failure
-// #define I2C_SR1_ARLO      (1<<9)    // Arbitration lost (master mode)
-// #define I2C_SR1_BERR      (1<<8)    // Bus error (misplaced start or stop condition)
-// #define I2C_SR1_TxE       (1<<7)    // Data register empty on transmit
-// #define I2C_SR1_RxNE      (1<<6)    // Data register not empty on receive
-// #define I2C_SR1_STOPF     (1<<4)    // Stop detection (slave mode)
-// #define I2C_SR1_ADD10     (1<<3)    // 10 bit header sent
-// #define I2C_SR1_BTF       (1<<2)    // Byte transfer finished - data transfer done
-// #define I2C_SR1_ADDR      (1<<1)    // Address sent (master) or matched (slave)
-// #define I2C_SR1_SB        (1<<0)    // Start bit (master mode) 1=start condition generated
-
-// I2C CR1 Control Register #1 bit definitions for convenience
-// #define I2C_CR1_SWRST     (1<<15)   // Software reset - places peripheral under reset
-// #define I2C_CR1_ALERT     (1<<13)   // SMBus alert assertion
-// #define I2C_CR1_PEC       (1<<12)   // Packet Error Checking transfer in progress
-// #define I2C_CR1_POS       (1<<11)   // Acknowledge/PEC Postion (for data reception in PEC mode)
-// #define I2C_CR1_ACK       (1<<10)   // Acknowledge enable - ACK returned after byte is received (address or data)
-// #define I2C_CR1_STOP      (1<<9)    // STOP generated
-// #define I2C_CR1_START     (1<<8)    // START generated
-// #define I2C_CR1_NOSTRETCH (1<<7)    // Clock stretching disable (slave mode)
-// #define I2C_CR1_ENGC      (1<<6)    // General call (broadcast) enable (address 00h is ACKed)
-// #define I2C_CR1_ENPEC     (1<<5)    // PEC Enable
-// #define I2C_CR1_ENARP     (1<<4)    // ARP enable (SMBus)
-// #define I2C_CR1_SMBTYPE   (1<<3)    // SMBus type, 1=host, 0=device
-// #define I2C_CR1_SMBUS     (1<<1)    // SMBus mode, 1=SMBus, 0=I2C
-// #define I2C_CR1_PE        (1<<0)    // I2C Peripheral enable
-
-/***************************************************************************
- *  Set I2C clock speed register.  This should only be called outside of
- *  a transmission.  The I2CManagerClass::_setClock() function ensures 
- *  that it is only called at the beginning of an I2C transaction.
- ***************************************************************************/
-void I2CManagerClass::I2C_setClock(uint32_t i2cClockSpeed) {
-
-  // Calculate a rise time appropriate to the requested bus speed
-  // Use 10x the rise time spec to enable integer divide of 62.5ns clock period
-  uint16_t t_rise;
-  uint32_t ccr_freq;
-  if (i2cClockSpeed < 200000L) {
-    // i2cClockSpeed = 100000L;
-    t_rise = 0x11;  // (1000ns /62.5ns) + 1;
-  }
-  else if (i2cClockSpeed < 800000L)
-  {
-    i2cClockSpeed = 400000L;
-    t_rise = 0x06;  // (300ns / 62.5ns) + 1;
-    // } else if (i2cClockSpeed < 1200000L) {
-    //   i2cClockSpeed = 1000000L;
-    //   t_rise = 120;
-  }
-  else
-  {
-    i2cClockSpeed = 100000L;
-    t_rise = 0x11;  // (1000ns /62.5ns) + 1;
-  }
-
-  // Enable the I2C master mode
-  s->CR1 &= ~(I2C_CR1_PE);  // Enable I2C
-  // Software reset the I2C peripheral
-  // s->CR1 |= I2C_CR1_SWRST;  // reset the I2C
-  // Release reset
-  // s->CR1 &= ~(I2C_CR1_SWRST);  // Normal operation
-
-  // Calculate baudrate - using a rise time appropriate for the speed
-  ccr_freq = I2C_BUSFREQ * 1000000 / i2cClockSpeed / 2;
-
-  // Bit 15: I2C Master mode, 0=standard, 1=Fast Mode
-  // Bit 14: Duty, fast mode duty cycle
-  // Bit 11-0: FREQR = 16MHz => TPCLK1 = 62.5ns, so CCR divisor must be 0x50 (80 * 62.5ns = 5000ns)
-  s->CCR = (uint16_t)ccr_freq;
-
-  // Configure the rise time register
-  s->TRISE = t_rise;  // 1000 ns / 62.5 ns = 16 + 1
-
-  // Enable the I2C master mode
-  s->CR1 |= I2C_CR1_PE;  // Enable I2C
-}
-
-/***************************************************************************
- *  Initialise I2C registers.
- ***************************************************************************/
-void I2CManagerClass::I2C_init()
-{
-  //Setting up the clocks
-  RCC->APB1ENR |= (1<<21);  // Enable I2C CLOCK
-  RCC->AHB1ENR |= (1<<1);   // Enable GPIOB CLOCK for PB8/PB9
-  // Standard I2C pins are SCL on PB8 and SDA on PB9
-  // Bits (17:16)= 1:0 --> Alternate Function for Pin PB8;
-  // Bits (19:18)= 1:0 --> Alternate Function for Pin PB9
-  GPIOB->MODER |= (2<<(8*2)) | (2<<(9*2));    // PB8 and PB9 set to ALT function
-  GPIOB->OTYPER |= (1<<8) | (1<<9);           // PB8 and PB9 set to open drain output capability
-  GPIOB->OSPEEDR |= (3<<(8*2)) | (3<<(9*2));  // PB8 and PB9 set to High Speed mode
-  GPIOB->PUPDR |= (1<<(8*2)) | (1<<(9*2));    // PB8 and PB9 set to pull-up capability
-  // Alt Function High register routing pins PB8 and PB9 for I2C1:
-  // Bits (3:2:1:0) = 0:1:0:0 --> AF4 for pin PB8
-  // Bits (7:6:5:4) = 0:1:0:0 --> AF4 for pin PB9
-  GPIOB->AFR[1] |= (4<<0) | (4<<4);           // PB8 on low nibble, PB9 on next nibble up
-
-  // Software reset the I2C peripheral
-  s->CR1 |= I2C_CR1_SWRST;  // reset the I2C
-  s->CR1 &= ~(I2C_CR1_SWRST);  // Normal operation
-
-  // Program the peripheral input clock in CR2 Register in order to generate correct timings
-  s->CR2 |= I2C_BUSFREQ;  // PCLK1 FREQUENCY in MHz
-
-#if defined(I2C_USE_INTERRUPTS)
-  // Setting NVIC
-  NVIC_SetPriority(I2C_IRQn, 1);  // Match default priorities
-  NVIC_EnableIRQ(I2C_IRQn);
-
-  // CR2 Interrupt Settings
-  // Bit 15-13: reserved
-  // Bit 12: LAST - DMA last transfer
-  // Bit 11: DMAEN - DMA enable
-  // Bit 10: ITBUFEN - Buffer interrupt enable
-  // Bit 9: ITEVTEN - Event interrupt enable
-  // Bit 8: ITERREN - Error interrupt enable
-  // Bit 7-6: reserved
-  // Bit 5-0: FREQ - Peripheral clock frequency (max 50MHz)
-  // s->CR2 |= 0x0700;   // Enable Buffer, Event and Error interrupts
-  s->CR2 |= 0x0300;   // Enable Event and Error interrupts
-#endif
-
-  // Calculate baudrate and set default rate for now
-  // Configure the Clock Control Register for 100KHz SCL frequency
-  // Bit 15: I2C Master mode, 0=standard, 1=Fast Mode
-  // Bit 14: Duty, fast mode duty cycle
-  // Bit 11-0: FREQR = 16MHz => TPCLK1 = 62.5ns, so CCR divisor must be 0x50 (80 * 62.5ns = 5000ns)
-  s->CCR = 0x0050;
-
-  // Configure the rise time register - max allowed in 1000ns
-  s->TRISE = 0x0011; // 1000 ns / 62.5 ns = 16 + 1
-
-  // Enable the I2C master mode
-  s->CR1 |= I2C_CR1_PE;  // Enable I2C
-  // Setting bus idle mode and wait for sync
-}
-
-/***************************************************************************
- *  Initiate a start bit for transmission.
- ***************************************************************************/
-void I2CManagerClass::I2C_sendStart() {
-
-  // Set counters here in case this is a retry.
-  rxCount = txCount = 0;
-  uint8_t temp;
-
-  // On a single-master I2C bus, the start bit won't be sent until the bus 
-  // state goes to IDLE so we can request it without waiting.  On a 
-  // multi-master bus, the bus may be BUSY under control of another master, 
-  // in which case we can avoid some arbitration failures by waiting until
-  // the bus state is IDLE.  We don't do that here.
-
-  // If anything to send, initiate write.  Otherwise initiate read.
-  if (operation == OPERATION_READ || ((operation == OPERATION_REQUEST) && !bytesToSend))
-  {
-    // Send start for read operation
-    s->CR1 |= I2C_CR1_ACK;  // Enable the ACK
-    s->CR1 |= I2C_CR1_START;  // Generate START
-    // Send address with read flag (1) or'd in
-    s->DR = (deviceAddress << 1) | 1;  //  send the address
-    while (!(s->SR1 && I2C_SR1_ADDR));  // wait for ADDR bit to set
-    // Special case for 1 byte reads!
-    if (bytesToReceive == 1)
-    {
-      s->CR1 &= ~I2C_CR1_ACK;            // clear the ACK bit 
-		  temp = I2C1->SR1 | I2C1->SR2;  // read SR1 and SR2 to clear the ADDR bit.... EV6 condition
-		  s->CR1 |= I2C_CR1_STOP;              // Stop I2C
-    }
-    else
-      temp = s->SR1 | s->SR2;        // read SR1 and SR2 to clear the ADDR bit
-  }
-  else {
-    // Send start for write operation
-    s->CR1 |= I2C_CR1_ACK;  // Enable the ACK
-    s->CR1 |= I2C_CR1_START;  // Generate START
-    // Send address with write flag (0) or'd in
-    s->DR = (deviceAddress << 1) | 0;  //  send the address
-    while (!(s->SR1 && I2C_SR1_ADDR));  // wait for ADDR bit to set
-    temp = s->SR1 | s->SR2;  // read SR1 and SR2 to clear the ADDR bit
-  }
-}
-
-/***************************************************************************
- *  Initiate a stop bit for transmission (does not interrupt)
- ***************************************************************************/
-void I2CManagerClass::I2C_sendStop() {
-  s->CR1 |= I2C_CR1_STOP;              // Stop I2C
-}
-
-/***************************************************************************
- *  Close I2C down
- ***************************************************************************/
-void I2CManagerClass::I2C_close() {
-  I2C_sendStop();
-  // Disable the I2C master mode and wait for sync
-  s->CR1 &= ~I2C_CR1_PE;  // Disable I2C peripheral
-  // Should never happen, but wait for up to 500us only.
-  unsigned long startTime = micros();
-  while ((s->CR1 && I2C_CR1_PE) != 0) {
-    if (micros() - startTime >= 500UL) break;
-  }
-}
-
-/***************************************************************************
- *  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->SR1 && I2C_SR1_ARLO) {
-    // Arbitration lost, restart
-    I2C_sendStart();   // Reinitiate request
-  } else if (s->SR1 && I2C_SR1_BERR) {
-    // Bus error
-    completionStatus = I2C_STATUS_BUS_ERROR;
-    state = I2C_STATE_COMPLETED;
-  } else if (s->SR1 && I2C_SR1_TXE) {
-    // Master write completed
-    if (s->SR1 && (1<<10)) {
-      // Nacked, send stop.
-      I2C_sendStop();
-      completionStatus = I2C_STATUS_NEGATIVE_ACKNOWLEDGE;
-      state = I2C_STATE_COMPLETED;
-    } else if (bytesToSend) {
-      // Acked, so send next byte
-      s->DR = sendBuffer[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 = (deviceAddress << 1) | 1;
-    } else {
-      // Check both TxE/BTF == 1 before generating stop
-      while (!(s->SR1 && I2C_SR1_TXE));    // Check TxE
-      while (!(s->SR1 && I2C_SR1_BTF));    // Check BTF
-      // No more data to send/receive. Initiate a STOP condition and finish
-      I2C_sendStop();
-      state = I2C_STATE_COMPLETED;
-    }
-  } else if (s->SR1 && I2C_SR1_RXNE) {
-    // Master read completed without errors
-    if (bytesToReceive == 1) {
-//      s->I2CM.CTRLB.bit.ACKACT = 1;  // NAK final byte
-      I2C_sendStop();  // send stop
-      receiveBuffer[rxCount++] = s->DR;  // Store received byte
-      bytesToReceive = 0;
-      state = I2C_STATE_COMPLETED;
-    } else if (bytesToReceive) {
-//      s->I2CM.CTRLB.bit.ACKACT = 0;  // ACK all but final byte
-      receiveBuffer[rxCount++] = s->DR;  // Store received byte
-      bytesToReceive--;
-    }
-  }
-}
-
-#endif /* I2CMANAGER_STM32_H */
--- a/I2CManager_Wire.h
+++ b/I2CManager_Wire.h
@@ -1,5 +1,5 @@
 /*
- *  © 2023, Neil McKechnie. All rights reserved.
+ *  © 2021, Neil McKechnie. All rights reserved.
 *
 *  This file is part of CommandStation-EX
 *
@@ -30,19 +30,11 @@
 #define I2C_USE_WIRE
 #endif

-// Older versions of Wire don't have setWireTimeout function.  AVR does.
-#ifdef ARDUINO_ARCH_AVR
-#define WIRE_HAS_TIMEOUT
-#endif
-
 /***************************************************************************
 *  Initialise I2C interface software
 ***************************************************************************/
 void I2CManagerClass::_initialise() {
  Wire.begin();
-#if defined(WIRE_HAS_TIMEOUT) 
-  Wire.setWireTimeout(_timeout, true);
-#endif
 }

 /***************************************************************************
@@ -53,85 +45,20 @@ void I2CManagerClass::_setClock(unsigned long i2cClockSpeed) {
  Wire.setClock(i2cClockSpeed);
 }

-/***************************************************************************
- *  Set I2C timeout value in microseconds.  The timeout applies to each
- *   Wire call separately, i.e. in a write+read, the timer is reset before the
- *   read is started.
- ***************************************************************************/
-void I2CManagerClass::setTimeout(unsigned long value) {
-  _timeout = value;
-#if defined(WIRE_HAS_TIMEOUT) 
-  Wire.setWireTimeout(value, true);
-#endif
-}
-
-/********************************************************
- * Helper function for I2C Multiplexer operations
- ********************************************************/
-#ifdef I2C_EXTENDED_ADDRESS
-static uint8_t muxSelect(I2CAddress address) {
-  // Select MUX sub bus.
-  I2CMux muxNo = address.muxNumber();
-  I2CSubBus subBus = address.subBus();
-  if (muxNo != I2CMux_None) {
-    Wire.beginTransmission(I2C_MUX_BASE_ADDRESS+muxNo); 
-    uint8_t data =  (subBus == SubBus_All) ? 0xff :
-                    (subBus == SubBus_None) ? 0x00 :
-#if defined(I2CMUX_PCA9547)
-                    0x08 | subBus;
-#elif defined(I2CMUX_PCA9542) || defined(I2CMUX_PCA9544)
-                    0x04 | subBus;   // NB Only 2 or 4 subbuses respectively
-#else
-                    // Default behaviour for most MUXs is to use a mask
-                    // with a bit set for the subBus to be enabled
-                    1 << subBus;
-#endif
-    Wire.write(&data, 1);
-    return Wire.endTransmission(true);  // have to release I2C bus for it to work
-  }
-  return I2C_STATUS_OK;
-}
-#endif
-
-
 /***************************************************************************
 *  Initiate a write to an I2C device (blocking operation on Wire)
 ***************************************************************************/
-uint8_t I2CManagerClass::write(I2CAddress address, const uint8_t buffer[], uint8_t size, I2CRB *rb) {
-  uint8_t status, muxStatus;
-  uint8_t retryCount = 0;
-  // If request fails, retry up to the defined limit, unless the NORETRY flag is set
-  // in the request block.
-  do {
-    status = muxStatus = I2C_STATUS_OK;
-#ifdef I2C_EXTENDED_ADDRESS
-    if (address.muxNumber() != I2CMux_None)
-      muxStatus = muxSelect(address);
-#endif
-    // Only send new transaction if address is non-zero.
-    if (muxStatus == I2C_STATUS_OK && address != 0) {
-      Wire.beginTransmission(address);
-      if (size > 0) Wire.write(buffer, size);
-      status = Wire.endTransmission();
-    }
-#ifdef I2C_EXTENDED_ADDRESS
-    // Deselect MUX if there's more than one MUX present, to avoid having multiple ones selected
-    if (_muxCount > 1 && muxStatus == I2C_STATUS_OK 
-          && address.deviceAddress() != 0 && address.muxNumber() != I2CMux_None) {
-      muxSelect({address.muxNumber(), SubBus_None});
-    }
-    if (muxStatus != I2C_STATUS_OK) status = muxStatus;
-#endif
-  } while (!(status == I2C_STATUS_OK
-    || ++retryCount > MAX_I2C_RETRIES || rb->operation & OPERATION_NORETRY));
-  rb->status = status;
+uint8_t I2CManagerClass::write(uint8_t address, const uint8_t buffer[], uint8_t size, I2CRB *rb) {
+  Wire.beginTransmission(address);
+  if (size > 0) Wire.write(buffer, size);
+  rb->status = Wire.endTransmission();
  return I2C_STATUS_OK;
 }

 /***************************************************************************
 *  Initiate a write from PROGMEM (flash) to an I2C device (blocking operation on Wire)
 ***************************************************************************/
-uint8_t I2CManagerClass::write_P(I2CAddress address, const uint8_t buffer[], uint8_t size, I2CRB *rb) {
+uint8_t I2CManagerClass::write_P(uint8_t address, const uint8_t buffer[], uint8_t size, I2CRB *rb) {
  uint8_t ramBuffer[size];
  const uint8_t *p1 = buffer;
  for (uint8_t i=0; i<size; i++)
@@ -143,64 +70,27 @@ uint8_t I2CManagerClass::write_P(I2CAddress address, const uint8_t buffer[], uin
 *  Initiate a write (optional) followed by a read from the I2C device (blocking operation on Wire)
 *  If fewer than the number of requested bytes are received, status is I2C_STATUS_TRUNCATED.
 ***************************************************************************/
-uint8_t I2CManagerClass::read(I2CAddress address, uint8_t readBuffer[], uint8_t readSize,
+uint8_t I2CManagerClass::read(uint8_t address, uint8_t readBuffer[], uint8_t readSize,
                              const uint8_t writeBuffer[], uint8_t writeSize, I2CRB *rb)
 {
-  uint8_t status, muxStatus;
+  uint8_t status = I2C_STATUS_OK;
  uint8_t nBytes = 0;
-  uint8_t retryCount = 0;
-  // If request fails, retry up to the defined limit, unless the NORETRY flag is set
-  // in the request block.
-  do {
-    status = muxStatus = I2C_STATUS_OK;
-#ifdef I2C_EXTENDED_ADDRESS
-    if (address.muxNumber() != I2CMux_None) {
-      muxStatus = muxSelect(address);
-    }
-#endif
-    // Only start new transaction if address is non-zero.
-    if (muxStatus == I2C_STATUS_OK && address != 0) {
-      if (writeSize > 0) {
-        Wire.beginTransmission(address);
-        Wire.write(writeBuffer, writeSize);
-        status = Wire.endTransmission(false); // Don't free bus yet
-      }
-      if (status == I2C_STATUS_OK) {
-#ifdef WIRE_HAS_TIMEOUT
-        Wire.clearWireTimeoutFlag();
-        Wire.requestFrom(address, (size_t)readSize);
-        if (!Wire.getWireTimeoutFlag()) {
-          while (Wire.available() && nBytes < readSize) 
-            readBuffer[nBytes++] = Wire.read();
-          if (nBytes < readSize) status = I2C_STATUS_TRUNCATED;
-        } else {
-          status = I2C_STATUS_TIMEOUT;
-        }
-#else
-        Wire.requestFrom(address, (size_t)readSize);
-          while (Wire.available() && nBytes < readSize) 
-            readBuffer[nBytes++] = Wire.read();
-          if (nBytes < readSize) status = I2C_STATUS_TRUNCATED;
-#endif
-      }
-    }
-#ifdef I2C_EXTENDED_ADDRESS
-    // Deselect MUX if there's more than one MUX present, to avoid having multiple ones selected
-    if (_muxCount > 1 && muxStatus == I2C_STATUS_OK && address != 0 && address.muxNumber() != I2CMux_None) {
-      muxSelect({address.muxNumber(), SubBus_None});
-    }
-    if (muxStatus != I2C_STATUS_OK) status = muxStatus;
-#endif
-
-  } while (!((status == I2C_STATUS_OK) 
-    || ++retryCount > MAX_I2C_RETRIES || rb->operation & OPERATION_NORETRY));
-
+  if (writeSize > 0) {
+    Wire.beginTransmission(address);
+    Wire.write(writeBuffer, writeSize);
+    status = Wire.endTransmission(false); // Don't free bus yet
+  }
+  if (status == I2C_STATUS_OK) {
+    Wire.requestFrom(address, (size_t)readSize);
+    while (Wire.available() && nBytes < readSize) 
+      readBuffer[nBytes++] = Wire.read();
+    if (nBytes < readSize) status = I2C_STATUS_TRUNCATED;
+  }
  rb->nBytes = nBytes;
  rb->status = status;
  return I2C_STATUS_OK;
 }

-
 /***************************************************************************
 *  Function to queue a request block and initiate operations.
 * 
@@ -210,7 +100,7 @@ uint8_t I2CManagerClass::read(I2CAddress address, uint8_t readBuffer[], uint8_t
 * the non-blocking version.
 ***************************************************************************/
 void I2CManagerClass::queueRequest(I2CRB *req) {
-  switch (req->operation & OPERATION_MASK) {
+  switch (req->operation) {
    case OPERATION_READ:
      read(req->i2cAddress, req->readBuffer, req->readLen, NULL, 0, req);
      break;
@@ -231,4 +121,8 @@ void I2CManagerClass::queueRequest(I2CRB *req) {
 ***************************************************************************/
 void I2CManagerClass::loop() {}

+// Loop function
+void I2CManagerClass::checkForTimeout() {}
+
+
 #endif
--- a/IODevice.cpp
+++ b/IODevice.cpp
@@ -48,14 +48,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() {
-  // Initialise the IO subsystem defaults
-  ArduinoPins::create(2, NUM_DIGITAL_PINS-2);  // Reserve pins for direct access
-
  // 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 early so that the subsequent defaults will detect an overlap and not
-  // create something that conflicts with the user's vpin definitions. 
+  
+  // 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();

@@ -63,43 +61,23 @@ void IODevice::begin() {
  if (exrailHalSetup)
    exrailHalSetup();

-  // Predefine two PCA9685 modules 0x40-0x41 if no conflicts
+  // Initialise the IO subsystem defaults
+  ArduinoPins::create(2, NUM_DIGITAL_PINS-2);  // Reserve pins for direct access
+  // Predefine two PCA9685 modules 0x40-0x41
  // Allocates 32 pins 100-131
-  if (checkNoOverlap(100, 16, 0x40)) {
-    PCA9685::create(100, 16, 0x40);
-  } else {
-    DIAG(F("Default PCA9685 at I2C 0x40 disabled due to configured user device"));
-  }
-  if (checkNoOverlap(116, 16, 0x41)) {
-    PCA9685::create(116, 16, 0x41);
-  } else {
-    DIAG(F("Default PCA9685 at I2C 0x41 disabled due to configured user device"));
-  }
+  PCA9685::create(100, 16, 0x40);
+  PCA9685::create(116, 16, 0x41);
  
-  // Predefine two MCP23017 module 0x20/0x21 if no conflicts
+  // Predefine two MCP23017 module 0x20/0x21
  // Allocates 32 pins 164-195
-  if (checkNoOverlap(164, 16, 0x20)) {
-    MCP23017::create(164, 16, 0x20);
-  } else {
-    DIAG(F("Default MCP23017 at I2C 0x20 disabled due to configured user device"));
-  }
-  if (checkNoOverlap(180, 16, 0x21)) {
-    MCP23017::create(180, 16, 0x21);
-  } else {
-    DIAG(F("Default MCP23017 at I2C 0x21 disabled due to configured user device"));
-  }
-}
+  MCP23017::create(164, 16, 0x20);
+  MCP23017::create(180, 16, 0x21);

-// reset() function to reinitialise all devices
-void IODevice::reset() {
-  unsigned long currentMicros = micros();
-  for (IODevice *dev = _firstDevice; dev != NULL; dev = dev->_nextDevice) {
-    dev->_deviceState = DEVSTATE_DORMANT;
-    // First ensure that _loop isn't delaying 
-    dev->delayUntil(currentMicros);
-    // Then invoke _begin to restart driver
+  // Call the begin() methods of each configured device in turn
+  for (IODevice *dev=_firstDevice; dev!=NULL; dev = dev->_nextDevice) {
    dev->_begin();
  }
+  _initPhase = false;
 }

 // Overarching static loop() method for the IODevice subsystem.  Works through the
@@ -131,19 +109,18 @@ void IODevice::loop() {
  
  // Report loop time if diags enabled
 #if defined(DIAG_LOOPTIMES)
-  unsigned long diagMicros = micros();
  static unsigned long lastMicros = 0;
-  // Measure time since HAL's loop() method started.
-  unsigned long halElapsed = diagMicros - currentMicros;
-  // Measure time between loop() method entries (excluding this diagnostic).
-  unsigned long elapsed = diagMicros - lastMicros;
+  // 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 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

-  // Ignore long loop counts while message is still outputting (~3 milliseconds)
+  // Ignore long loop counts while message is still outputting
  if (currentMicros - lastOutputTime > 3000UL) {
    if (elapsed > maxElapsed) maxElapsed = elapsed;
    if (halElapsed > maxHalElapsed) maxHalElapsed = halElapsed;
@@ -151,16 +128,14 @@ void IODevice::loop() {
    total += elapsed;
    count++;
  }
-  if (diagMicros - lastOutputTime > interval) {
+  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;
-    lastOutputTime = diagMicros;
+    lastOutputTime = currentMicros;
  }
-  // Read microsecond count after calculations, so they aren't
-  // included in the overall timings.
-  lastMicros = micros();
+  lastMicros = currentMicros;
 #endif
 }

@@ -185,7 +160,7 @@ bool IODevice::hasCallback(VPIN vpin) {

 // Display (to diagnostics) details of the device.
 void IODevice::_display() {
-  DIAG(F("Unknown device Vpins:%u-%u %S"), 
+  DIAG(F("Unknown device Vpins:%d-%d %S"), 
    (int)_firstVpin, (int)_firstVpin+_nPins-1, _deviceState==DEVSTATE_FAILED ? F("OFFLINE") : F(""));
 }

@@ -195,7 +170,7 @@ bool IODevice::configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, i
  IODevice *dev = findDevice(vpin);
  if (dev) return dev->_configure(vpin, configType, paramCount, params);
 #ifdef DIAG_IO
-  DIAG(F("IODevice::configure(): VPIN %u not found!"), (int)vpin);
+  DIAG(F("IODevice::configure(): Vpin ID %d not found!"), (int)vpin);
 #endif
  return false;
 }
@@ -207,7 +182,7 @@ int IODevice::read(VPIN vpin) {
      return dev->_read(vpin);
  }
 #ifdef DIAG_IO
-  DIAG(F("IODevice::read(): VPIN %u not found!"), (int)vpin);
+  DIAG(F("IODevice::read(): Vpin %d not found!"), (int)vpin);
 #endif
  return false;
 }
@@ -219,7 +194,7 @@ int IODevice::readAnalogue(VPIN vpin) {
      return dev->_readAnalogue(vpin);
  }
 #ifdef DIAG_IO
-  DIAG(F("IODevice::readAnalogue(): VPIN %u not found!"), (int)vpin);
+  DIAG(F("IODevice::readAnalogue(): Vpin %d not found!"), (int)vpin);
 #endif
  return -1023;
 }
@@ -229,7 +204,7 @@ int IODevice::configureAnalogIn(VPIN vpin) {
      return dev->_configureAnalogIn(vpin);
  }
 #ifdef DIAG_IO
-  DIAG(F("IODevice::configureAnalogIn(): VPIN %u not found!"), (int)vpin);
+  DIAG(F("IODevice::configureAnalogIn(): Vpin %d not found!"), (int)vpin);
 #endif
  return -1023;
 }
@@ -243,7 +218,7 @@ void IODevice::write(VPIN vpin, int value) {
    return;
  }
 #ifdef DIAG_IO
-  DIAG(F("IODevice::write(): VPIN %u not found!"), (int)vpin);
+  DIAG(F("IODevice::write(): Vpin ID %d not found!"), (int)vpin);
 #endif
 }

@@ -262,7 +237,7 @@ void IODevice::writeAnalogue(VPIN vpin, int value, uint8_t param1, uint16_t para
    return;
  }
 #ifdef DIAG_IO
-  DIAG(F("IODevice::writeAnalogue(): VPIN %u not found!"), (int)vpin);
+  DIAG(F("IODevice::writeAnalogue(): Vpin ID %d not found!"), (int)vpin);
 #endif
 }

@@ -283,27 +258,25 @@ void IODevice::setGPIOInterruptPin(int16_t pinNumber) {
  _gpioInterruptPin = pinNumber;
 }

-// Helper function to add a new device to the device chain.  If 
-// slaveDevice is NULL then the device is added to the end of the chain.
-// Otherwise, the chain is searched for slaveDevice and the new device linked
-// in front of it (to support filter devices that share the same VPIN range
-// as the devices they control).  If slaveDevice isn't found, then the
-// device is linked to the end of the chain.
-void IODevice::addDevice(IODevice *newDevice, IODevice *slaveDevice /* = NULL */) {
-  if (slaveDevice == _firstDevice) {
-    newDevice->_nextDevice = _firstDevice;
+// Private helper function to add a device to the chain of devices.
+void IODevice::addDevice(IODevice *newDevice) {
+  // Link new object to the end of the chain.  Thereby, the first devices to be declared/created
+  // will be located faster by findDevice than those which are created later.
+  // Ideally declare/create the digital IO pins first, then servos, then more esoteric devices.
+  IODevice *lastDevice;
+  if (_firstDevice == 0)
    _firstDevice = newDevice;
-  } else {
-    for (IODevice *dev = _firstDevice; dev != 0; dev = dev->_nextDevice) {
-      if (dev->_nextDevice == slaveDevice || dev->_nextDevice == NULL) {
-          // Link new device between dev and slaveDevice (or at end of chain)
-        newDevice->_nextDevice = dev->_nextDevice;
-        dev->_nextDevice = newDevice;
-        break;
-      }
-    }
+  else {
+    for (IODevice *dev = _firstDevice; dev != 0; dev = dev->_nextDevice)
+      lastDevice = dev;
+    lastDevice->_nextDevice = newDevice;
  }
-  newDevice->_begin();
+  newDevice->_nextDevice = 0;
+
+  // If the IODevice::begin() method has already been called, initialise device here.  If not,
+  // the device's _begin() method will be called by IODevice::begin().
+  if (!_initPhase)
+    newDevice->_begin();
 }

 // Private helper function to locate a device by VPIN.  Returns NULL if not found.
@@ -317,42 +290,28 @@ IODevice *IODevice::findDevice(VPIN vpin) {
  return NULL;
 }

-// Instance helper function for filter devices (layered over others).  Looks for 
-//  a device that is further down the chain than the current device.
-IODevice *IODevice::findDeviceFollowing(VPIN vpin) {
-  for (IODevice *dev = _nextDevice; dev != 0; dev = dev->_nextDevice) {
-    VPIN firstVpin = dev->_firstVpin;
-    if (vpin >= firstVpin && vpin < firstVpin+dev->_nPins)
-      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
-// TODO: Move the I2C address reservation and checks into the I2CManager code.
-// That will enable non-HAL devices to reserve I2C addresses too.
-bool IODevice::checkNoOverlap(VPIN firstPin, uint8_t nPins, I2CAddress i2cAddress) {
+bool IODevice::checkNoOverlap(VPIN firstPin, uint8_t nPins, uint8_t i2cAddress) {
 #ifdef DIAG_IO
-  DIAG(F("Check no overlap %u %u %s"), firstPin,nPins,i2cAddress.toString());
+  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) {
    
-    if (nPins > 0 && dev->_nPins > 0) {
-      // 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, redefinition of Vpins %u to %u ignored."),
-              firstPin, lastPin);
-          return false;
-      } 
-    }
+    // 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 %s ignored."),i2cAddress.toString());
+      DIAG(F("WARNING HAL Overlap. i2c Addr 0x%x ignored."),i2cAddress);
      return false;
    } 
  }
@@ -367,12 +326,15 @@ bool IODevice::checkNoOverlap(VPIN firstPin, uint8_t nPins, I2CAddress i2cAddres
 // Chain of callback blocks (identifying registered callback functions for state changes)
 IONotifyCallback *IONotifyCallback::first = 0;

-// Start and end of chain of devices.
+// Start of chain of devices.
 IODevice *IODevice::_firstDevice = 0;

 // Reference to next device to be called on _loop() method.
 IODevice *IODevice::_nextLoopDevice = 0;

+// Flag which is reset when IODevice::begin has been called.
+bool IODevice::_initPhase = true;  
+

 //==================================================================================================================
 // Instance members
@@ -392,7 +354,7 @@ 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]);
+  DIAG(F("Arduino _configurePullup Pin:%d Val:%d"), pin, p[0]);
  #endif
  pinMode(pin, p[0] ? INPUT_PULLUP : INPUT);
  return true;
@@ -546,7 +508,7 @@ int ArduinoPins::_configureAnalogIn(VPIN vpin) {
 }

 void ArduinoPins::_display() {
-  DIAG(F("Arduino Vpins:%u-%u"), (int)_firstVpin, (int)_firstVpin+_nPins-1);
+  DIAG(F("Arduino Vpins:%d-%d"), (int)_firstVpin, (int)_firstVpin+_nPins-1);
 }

 /////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/IODevice.h
+++ b/IODevice.h
@@ -1,5 +1,4 @@
 /*
- *  © 2023, Paul Antoine, Discord user @ADUBOURG
 *  © 2021, Neil McKechnie. All rights reserved.
 *  
 *  This file is part of DCC++EX API
@@ -94,8 +93,6 @@ public:
    CONFIGURE_INPUT = 1,
    CONFIGURE_SERVO = 2,
    CONFIGURE_OUTPUT = 3,
-    CONFIGURE_ANALOGOUTPUT = 4,
-    CONFIGURE_ANALOGINPUT = 5,
  } ConfigTypeEnum;

  typedef enum : uint8_t {
@@ -113,10 +110,6 @@ public:
  // Also, the _begin method of any existing instances is called from here.
  static void begin();

-  // reset function to invoke all driver's _begin() methods again, to
-  // reset the state of the devices and reinitialise.
-  static void reset();
-
  // configure is used invoke an IODevice instance's _configure method
  static bool configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, int params[]);

@@ -168,12 +161,27 @@ public:
  // once the GPIO port concerned has been read.
  void setGPIOInterruptPin(int16_t pinNumber);

-  // Method to check if pins will overlap before creating new device. 
-  static bool checkNoOverlap(VPIN firstPin, uint8_t nPins=1, I2CAddress i2cAddress=0);
+ // Method to check if pins will overlap before creating new device. 
+  static bool checkNoOverlap(VPIN firstPin, uint8_t nPins=1, uint8_t i2cAddress=0);
+  
+protected:
+  
+  // Constructor
+  IODevice(VPIN firstVpin=0, int nPins=0) {
+    _firstVpin = firstVpin;
+    _nPins = nPins;
+    _nextEntryTime = 0;
+    _I2CAddress=0;
+  }

-  // Method used by IODevice filters to locate slave pins that may be overlayed by their own
-  // pin range.  
-  IODevice *findDeviceFollowing(VPIN vpin);
+ // Method to perform initialisation of the device (optionally implemented within device class)
+  virtual void _begin() {}
+
+  // Method to configure device (optionally implemented within device class)
+  virtual bool _configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, int params[]) { 
+    (void)vpin; (void)configType; (void)paramCount; (void)params; // Suppress compiler warning.
+    return false;
+  };

  // Method to write new state (optionally implemented within device class)
  virtual void _write(VPIN vpin, int value) {
@@ -181,7 +189,7 @@ public:
  };

  // Method to write an 'analogue' value (optionally implemented within device class)
-  virtual void _writeAnalogue(VPIN vpin, int value, uint8_t param1=0, uint16_t param2=0) {
+  virtual void _writeAnalogue(VPIN vpin, int value, uint8_t param1, uint16_t param2) {
    (void)vpin; (void)value; (void) param1; (void)param2;
  };

@@ -196,29 +204,6 @@ public:
    (void)vpin; 
    return 0;
  };
-
-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)
-  virtual void _begin() {}
-
-  // Method to check whether the vpin corresponds to this device
-  bool owns(VPIN vpin);
-
-  // Method to configure device (optionally implemented within device class)
-  virtual bool _configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, int params[]) { 
-    (void)vpin; (void)configType; (void)paramCount; (void)params; // Suppress compiler warning.
-    return false;
-  };
-
  virtual int _configureAnalogIn(VPIN vpin) { 
    (void)vpin; 
    return 0;
@@ -243,7 +228,7 @@ protected:
  // Common object fields.
  VPIN _firstVpin;
  int _nPins;
-  I2CAddress _I2CAddress;
+  uint8_t _I2CAddress;
  // Flag whether the device supports callbacks.
  bool _hasCallback = false;

@@ -252,20 +237,22 @@ protected:
  int16_t _gpioInterruptPin = -1;
    
  // Static support function for subclass creation
-  static void addDevice(IODevice *newDevice, IODevice *slaveDevice = NULL);
-
-  // Method to find device handling Vpin
-  static IODevice *findDevice(VPIN vpin);
+  static void addDevice(IODevice *newDevice);

  // Current state of device
  DeviceStateEnum _deviceState = DEVSTATE_DORMANT;

 private:
+  // Method to check whether the vpin corresponds to this device
+  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;
+  static bool _initPhase;
 };


@@ -276,7 +263,7 @@ private:
 
 class PCA9685 : public IODevice {
 public:
-  static void create(VPIN vpin, int nPins, I2CAddress i2cAddress, uint16_t frequency = 50);
+  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
@@ -289,7 +276,7 @@ public:

 private:
  // Constructor
-  PCA9685(VPIN vpin, int nPins, I2CAddress i2cAddress, uint16_t frequency);
+  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;
@@ -319,14 +306,13 @@ private:
  struct ServoData *_servoData [16];

  static const uint8_t _catchupSteps = 5; // number of steps to wait before switching servo off
-  static const uint8_t FLASH _bounceProfile[30];
+  static const byte FLASH _bounceProfile[30];

  const unsigned int refreshInterval = 50; // refresh every 50ms

  // structures for setting up non-blocking writes to servo controller
  I2CRB requestBlock;
  uint8_t outputBuffer[5];
-  uint8_t prescaler; // clock prescaler for setting PWM frequency
 };

 /////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -390,9 +376,9 @@ private:
 
 class EXTurntable : public IODevice {
 public:
-  static void create(VPIN firstVpin, int nPins, I2CAddress I2CAddress);
+  static void create(VPIN firstVpin, int nPins, uint8_t I2CAddress);
  // Constructor
-  EXTurntable(VPIN firstVpin, int nPins, I2CAddress I2CAddress);
+  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
@@ -418,128 +404,9 @@ private:

 /////////////////////////////////////////////////////////////////////////////////////////////////////

-
-// IODevice framework for invoking user-written functions.
-// To use, define a function that you want to be regularly
-// invoked, and then create an instance of UserAddin.  
-// For example, you can show the status, on screen 3, of the first eight
-// locos in the speed table:
-// 
-// void updateLocoScreen() {
-//   for (int i=0; i<8; i++) {
-//     if (DCC::speedTable[i].loco > 0) {
-//       int speed = DCC::speedTable[i].speedCode;
-//       SCREEN(3, i, F("Loco:%4d %3d %c"), DCC::speedTable[i].loco,
-//         speed & 0x7f, speed & 0x80 ? 'R' : 'F');
-//     }
-//   }
-// }
-//
-// void halSetup() {
-//   ...
-//   UserAddin(updateLocoScreen, 1000);  // Update every 1000ms
-//   ...
-// }
-//
-class UserAddin : public IODevice {
-private:
-  void (*_invokeUserFunction)();
-  int _delay; // milliseconds
-public:
-  UserAddin(void (*func)(), int delay) {
-    _invokeUserFunction = func; 
-    _delay = delay; 
-    addDevice(this); 
-  }
-  // userFunction has no return value, no parameter.  delay is in milliseconds.
-  static void create(void (*userFunction)(), int delay) {
-    new UserAddin(userFunction, delay);
-  }
-protected:
-  void _begin() { _display(); }
-  void _loop(unsigned long currentMicros) override {
-    _invokeUserFunction();
-    // _loop won't be called again until _delay ms have elapsed.
-    delayUntil(currentMicros + _delay * 1000UL);
-  }
-  void _display() override {
-    DIAG(F("UserAddin run every %dms"), _delay);
-  }
-};
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// 
-// This HAL device driver is intended for communication in automation
-// sequences.  A VPIN can be SET or RESET within a sequence, and its
-// current state checked elsewhere using IF, IFNOT, AT etc. or monitored
-// from JMRI using a Sensor object (DCC-EX <S ...> command).
-// Alternatively, the flag can be set from JMRI and other interfaces
-// using the <Z ...> command, to enable or disable actions within a sequence.
-// 
-// Example of configuration in halSetup.h:
-// 
-//  FLAGS::create(32000, 128);
-// 
-// or in myAutomation.h:
-//  
-//  HAL(FLAGS, 32000, 128);
-// 
-// Both create 128 flags numbered with VPINs 32000-32127.
-// 
-//
-
-class FLAGS : IODevice {
-private:
-  uint8_t *_states = NULL;
-
-public:
-  static void create(VPIN firstVpin, unsigned int nPins) {
-    if (checkNoOverlap(firstVpin, nPins))
-        new FLAGS(firstVpin, nPins);
-  }
-
-protected:
-  // Constructor performs static initialisation of the device object
-  FLAGS (VPIN firstVpin, int nPins) {
-    _firstVpin = firstVpin;
-    _nPins = nPins;
-    _states = (uint8_t *)calloc(1, (_nPins+7)/8);
-    if (!_states) {
-      DIAG(F("FLAGS: ERROR Memory Allocation Failure"));
-      return;
-    }
-
-    addDevice(this);
-  }
-
-  int _read(VPIN vpin) override {
-    int pin = vpin - _firstVpin;
-    if (pin >= _nPins || pin < 0) return 0;
-    uint8_t mask = 1 << (pin & 7);
-    return (_states[pin>>3] & mask) ? 1 : 0;
-  }
-
-  void _write(VPIN vpin, int value) override {
-    int pin = vpin - _firstVpin;
-    if (pin >= _nPins || pin < 0) return;
-    uint8_t mask = 1 << (pin & 7);
-    if (value) 
-      _states[pin>>3] |= mask;
-    else
-      _states[pin>>3] &= ~mask;
-  }
-
-  void _display() override {
-    DIAG(F("FLAGS configured on VPINs %u-%u"),
-      _firstVpin, _firstVpin+_nPins-1);
-  }
-
-};
-
 #include "IO_MCP23008.h"
 #include "IO_MCP23017.h"
 #include "IO_PCF8574.h"
-#include "IO_PCF8575.h"
 #include "IO_duinoNodes.h"
 #include "IO_EXIOExpander.h"

--- a/IO_AnalogueInputs.h
+++ b/IO_AnalogueInputs.h
@@ -59,33 +59,28 @@
 **********************************************************************************************/
 class ADS111x: public IODevice { 
 public:
-  static void create(VPIN firstVpin, int nPins, I2CAddress i2cAddress) {
+  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, I2CAddress i2cAddress) {
+  ADS111x(VPIN firstVpin, int nPins, uint8_t i2cAddress) {
    _firstVpin = firstVpin;
-    _nPins = (nPins > 4) ? 4 : nPins;
-    _I2CAddress = i2cAddress;
+    _nPins = min(nPins,4);
+    _i2cAddress = i2cAddress;
    _currentPin = 0;
    for (int8_t i=0; i<_nPins; i++)
      _value[i] = -1;
    addDevice(this);
  }
  void _begin() {
-    // Initialise I2C
-    I2CManager.begin();
-    // ADS111x support high-speed I2C (4.3MHz) but that requires special
-    // processing.  So stick to fast mode (400kHz maximum).
-    I2CManager.setClock(400000);
    // Initialise ADS device
-    if (I2CManager.exists(_I2CAddress)) {
+    if (I2CManager.exists(_i2cAddress)) {
      _nextState = STATE_STARTSCAN;
 #ifdef DIAG_IO
      _display();
 #endif
    } else {
-      DIAG(F("ADS111x device not found, I2C:%s"), _I2CAddress.toString());
+      DIAG(F("ADS111x device not found, I2C:%x"), _i2cAddress);
      _deviceState = DEVSTATE_FAILED;
    }
  }
@@ -103,7 +98,7 @@ private:
          _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);
+          I2CManager.write(_i2cAddress, _outBuffer, 3, &_i2crb);

          delayUntil(currentMicros + scanInterval);
          _nextState = STATE_STARTREAD;
@@ -112,14 +107,14 @@ private:
        case STATE_STARTREAD:
          // Reading the pin value
          _outBuffer[0] = 0x00;  // Conversion register address
-          I2CManager.read(_I2CAddress, _inBuffer, 2, _outBuffer, 1, &_i2crb); // Read register
+          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 VPIN:%u value:%d"), _currentPin, _value[_currentPin]);
+          DIAG(F("ADS111x pin:%d value:%d"), _currentPin, _value[_currentPin]);
          #endif

          // Move to next pin
@@ -131,7 +126,7 @@ private:
          break;
      }
    } else { // error status
-      DIAG(F("ADS111x I2C:%s Error:%d %S"), _I2CAddress.toString(), status, I2CManager.getErrorMessage(status));
+      DIAG(F("ADS111x I2C:x%d Error:%d %S"), _i2cAddress, status, I2CManager.getErrorMessage(status));
      _deviceState = DEVSTATE_FAILED;
    }
  }
@@ -142,7 +137,7 @@ private:
  }
  
  void _display() override {
-    DIAG(F("ADS111x I2C:%s Configured on Vpins:%u-%u %S"), _I2CAddress.toString(), _firstVpin, _firstVpin+_nPins-1,
+    DIAG(F("ADS111x I2C:x%x Configured on Vpins:%d-%d %S"), _i2cAddress, _firstVpin, _firstVpin+_nPins-1,
      _deviceState == DEVSTATE_FAILED ? F("OFFLINE") : F(""));
  }

@@ -159,6 +154,7 @@ private:
    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
--- a/IO_DCCAccessory.cpp
+++ b/IO_DCCAccessory.cpp
@@ -62,7 +62,7 @@ void DCCAccessoryDecoder::_write(VPIN id, int state) {

 void DCCAccessoryDecoder::_display() {
  int endAddress = _packedAddress + _nPins - 1;
-  DIAG(F("DCCAccessoryDecoder Configured on Vpins:%u-%u Addresses %d/%d-%d/%d)"), _firstVpin, _firstVpin+_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));
 }

--- a/IO_DFPlayer.h
+++ b/IO_DFPlayer.h
@@ -1,5 +1,5 @@
 /*
- *  © 2023, Neil McKechnie. All rights reserved.
+ *  © 2022, Neil McKechnie. All rights reserved.
 *  
 *  This file is part of DCC++EX API
 *
@@ -33,13 +33,10 @@
 *   and Serialn is the name of the Serial port connected to the DFPlayer (e.g. Serial1).
 * 
 * Example:
- *   In halSetup function within myHal.cpp:
+ *   In mySetup function within mySetup.cpp:
 *       DFPlayer::create(3500, 5, Serial1);
- *   or in myAutomation.h:
- *       HAL(DFPlayer, 3500, 5, Serial1)
 * 
- * Writing an analogue value 1-2999 to the first pin (3500) will play the numbered file from the
- * SD card; e.g. a value of 1 will play the first file, 2 for the second file etc.
+ * Writing an analogue value 1-2999 to the first pin (3500) will play the numbered file from the SD card;
 * Writing an analogue value 0 to the first pin (3500) will stop the file playing;
 * Writing an analogue value 0-30 to the second pin (3501) will set the volume;
 * Writing a digital value of 1 to a pin will play the file corresponding to that pin, e.g.
@@ -64,10 +61,6 @@
 * card (as listed by the DIR command in Windows).  This may not match the order of the files 
 * as displayed by Windows File Manager, which sorts the file names.  It is suggested that
 * files be copied into an empty SDcard in the desired order, one at a time.
- * 
- * The driver now polls the device for its current status every second.  Should the device
- * fail to respond it will be marked off-line and its busy indicator cleared, to avoid
- * lock-ups in automation scripts that are executing for a WAITFOR().
 */

 #ifndef IO_DFPlayer_h
@@ -77,17 +70,23 @@

 class DFPlayer : public IODevice {
 private: 
-  const uint8_t MAXVOLUME=30;
  HardwareSerial *_serial;
  bool _playing = false;
  uint8_t _inputIndex = 0;
-  unsigned long _commandSendTime; // Time (us) that last transmit took place.
-  unsigned long _timeoutTime;
-  uint8_t _recvCMD;  // Last received command code byte
-  bool _awaitingResponse = false;
-  uint8_t _requestedVolumeLevel = MAXVOLUME;
-  uint8_t _currentVolume = MAXVOLUME;
-  int _requestedSong = -1;  // -1=none, 0=stop, >0=file number
+  unsigned long _commandSendTime; // Allows timeout processing
+
+  // When two commands are sent in quick succession, the device sometimes 
+  // fails to execute one.  A delay is required between successive commands.
+  // This could be implemented by buffering commands and outputting them
+  // from the loop() function, but it would somewhat complicate the 
+  // driver.  A simpler solution is to output a number of NUL pad characters
+  // between successive command strings if there isn't sufficient elapsed time
+  // between them.  At 9600 baud, each pad character takes approximately
+  // 1ms to complete.  Experiments indicate that the minimum number of pads
+  // for reliable operation is 17.  This gives 17.7ms between the end of one
+  // command and the beginning of the next, or 28ms between successive commands
+  // being completed.  I've allowed 20 characters, which is almost 21ms.
+  const int numPadCharacters = 20;  // Number of pad characters between commands
  
 public:
 
@@ -112,151 +111,66 @@ protected:

    // Send a query to the device to see if it responds
    sendPacket(0x42); 
-    _timeoutTime = micros() + 5000000UL;  // 5 second timeout
-    _awaitingResponse = true;
+    _commandSendTime = micros();
  }

  void _loop(unsigned long currentMicros) override {
-
-    // Read responses from device
-    processIncoming();
-
-    // Check if a command sent to device has timed out.  Allow 0.5 second for response
-    if (_awaitingResponse && (int32_t)(currentMicros - _timeoutTime) > 0) {
-      DIAG(F("DFPlayer device not responding on serial port"));
-      _deviceState = DEVSTATE_FAILED;
-      _awaitingResponse = false;
-      _playing = false;
-    }
-
-    // Send any commands that need to go.
-    processOutgoing(currentMicros);
-
-    delayUntil(currentMicros + 10000); // Only enter every 10ms
-  }
-
-  // Check for incoming data on _serial, and update busy flag and other state accordingly
-  void processIncoming() {
+    // Check for incoming data on _serial, and update busy flag accordingly.
    // Expected message is in the form "7E FF 06 3D xx xx xx xx xx EF"
-    bool ok = false;
    while (_serial->available()) {
      int c = _serial->read();
-      switch (_inputIndex) {
-        case 0:
-          if (c == 0x7E) ok = true;
-          break;
-        case 1:
-          if (c == 0xFF) ok = true;
-          break;
-        case 2:
-          if (c== 0x06) ok = true;
-          break;
-        case 3:
-          _recvCMD = c; // CMD byte
-          ok = true;
-          break;
-        case 6:
-          switch (_recvCMD) {
-            case 0x42:
-              // Response to status query
-              _playing = (c != 0);
-              // Mark the device online and cancel timeout
-              if (_deviceState==DEVSTATE_INITIALISING) {
-                _deviceState = DEVSTATE_NORMAL;
-                #ifdef DIAG_IO
-                _display();
-                #endif
-              }
-              _awaitingResponse = false;
-              break;
-            case 0x3d:
-              // End of play
-              if (_playing) {
-                #ifdef DIAG_IO
-                DIAG(F("DFPlayer: Finished"));
-                #endif
-                _playing = false;
-              }
-              break;
-            case 0x40:
-              // Error code
-              DIAG(F("DFPlayer: Error %d returned from device"), c);
-              _playing = false;
-              break;
-          }
-          ok = true;
-          break;
-        case 4: case 5: case 7: case 8: 
-          ok = true;  // Skip over these bytes in message.
-          break;
-        case 9:
-          if (c==0xef) {
-            // Message finished
-          }
-          break;
-        default:
-          break;
-      }
-      if (ok)
-        _inputIndex++;  // character as expected, so increment index
-      else
-        _inputIndex = 0;  // otherwise reset.
-    }
-  }
-
-  // Send any commands that need to be sent
-  void processOutgoing(unsigned long currentMicros) {
-
-    // When two commands are sent in quick succession, the device will often fail to 
-    // execute one.  Testing has indicated that a delay of 100ms or more is required
-    // between successive commands to get reliable operation.
-    // If 100ms has elapsed since the last thing sent, then check if there's some output to do.
-    if (((int32_t)currentMicros - _commandSendTime) > 100000) {
-      if (_currentVolume > _requestedVolumeLevel) {
-        // Change volume before changing song if volume is reducing.
-        _currentVolume = _requestedVolumeLevel;
-        sendPacket(0x06, _currentVolume);
-      } else if (_requestedSong > 0) {
-        // Change song
-        sendPacket(0x03, _requestedSong);
-        _requestedSong = -1;
-      } else if (_requestedSong == 0) {
-        sendPacket(0x16);  // Stop playing
-        _requestedSong = -1;
-      } else if (_currentVolume < _requestedVolumeLevel) {
-        // Change volume after changing song if volume is increasing.
-        _currentVolume = _requestedVolumeLevel;
-        sendPacket(0x06, _currentVolume);
-      } else if ((int32_t)currentMicros - _commandSendTime > 1000000) {
-        // Poll device every second that other commands aren't being sent,
-        // to check if it's still connected and responding.
-        sendPacket(0x42); 
-        if (!_awaitingResponse) {
-          _timeoutTime = currentMicros + 5000000UL;  // Timeout if no response within 5 seconds
-          _awaitingResponse = true;
+      if (c == 0x7E && _inputIndex == 0) 
+        _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 5 seconds
+    if (_deviceState == DEVSTATE_INITIALISING && currentMicros - _commandSendTime > 5000000UL) {
+      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 {
-    if (_deviceState == DEVSTATE_FAILED) return;
    int pin = vpin - _firstVpin;
    if (value) {
      // Value 1, start playing
      #ifdef DIAG_IO
      DIAG(F("DFPlayer: Play %d"), pin+1);
      #endif
-      _requestedSong = pin+1;
+      sendPacket(0x03, pin+1);
      _playing = true;
    } else {
      // Value 0, stop playing
      #ifdef DIAG_IO
      DIAG(F("DFPlayer: Stop"));
      #endif
-      _requestedSong = 0;  // No song
+      sendPacket(0x16);
      _playing = false;
    }
  }
@@ -265,43 +179,51 @@ protected:
  // 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 { 
-    if (_deviceState == DEVSTATE_FAILED) return;
    uint8_t pin = vpin - _firstVpin;
 
-    #ifdef DIAG_IO
-    DIAG(F("DFPlayer: VPIN:%u FileNo:%d Volume:%d"), vpin, value, volume);
-    #endif
-
    // Validate parameter.
-    if (volume > MAXVOLUME) volume = MAXVOLUME;
+    volume = min((uint8_t)30,volume);

    if (pin == 0) {
      // Play track 
      if (value > 0) {
-        if (volume > 0)
-          _requestedVolumeLevel = volume;
-        _requestedSong = value;
+        #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 {
-        _requestedSong = 0; // stop playing
+        #ifdef DIAG_IO
+        DIAG(F("DFPlayer: Stop"));
+        #endif
+        sendPacket(0x16); // Stop play
        _playing = false;
      }
    } else if (pin == 1) {
      // Set volume (0-30)
-      _requestedVolumeLevel = value;  
+      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 {
-    if (_deviceState == DEVSTATE_FAILED) return false;
    return _playing;
  }

  void _display() override {
-    DIAG(F("DFPlayer Configured on Vpins:%u-%u %S"), _firstVpin, _firstVpin+_nPins-1,
+    DIAG(F("DFPlayer Configured on Vpins:%d-%d %S"), _firstVpin, _firstVpin+_nPins-1,
      (_deviceState==DEVSTATE_FAILED) ? F("OFFLINE") : F(""));
  }
  
@@ -318,6 +240,7 @@ private:

  void sendPacket(uint8_t command, uint16_t arg = 0)
  {
+    unsigned long currentMillis = millis();
    uint8_t out[] = { 0x7E,
        0xFF,
        06,
@@ -331,10 +254,19 @@ private:

    setChecksum(out);

-    // Output the command
-    _serial->write(out, sizeof(out));
+    // Check how long since the last command was sent.
+    // Each character takes approx 1ms at 9600 baud
+    unsigned long minimumGap = numPadCharacters + sizeof(out);
+    if (currentMillis - _commandSendTime < minimumGap) {
+      // Output some pad characters to add an
+      // artificial delay between commands
+      for (int i=0; i<numPadCharacters; i++) 
+        _serial->write(0);
+    }

-    _commandSendTime = micros();
+    // Now output the command
+    _serial->write(out, sizeof(out));
+    _commandSendTime = currentMillis;
  }

  uint16_t calcChecksum(uint8_t* packet)
--- a/IO_EXFastclock.h
+++ b/IO_EXFastclock.h
@@ -40,24 +40,24 @@ bool FAST_CLOCK_EXISTS = true;
 class EXFastClock : public IODevice {
 public:
  // Constructor
-    EXFastClock(I2CAddress i2cAddress){
-    _I2CAddress = i2cAddress;
+    EXFastClock(uint8_t I2CAddress){
+    _I2CAddress = I2CAddress;
    addDevice(this);
  }

-static void create(I2CAddress i2cAddress) {
+static void create(uint8_t _I2CAddress) {

  DIAG(F("Checking for Clock"));
  // Start by assuming we will find the clock
  // Check if specified I2C address is responding (blocking operation)
  // Returns I2C_STATUS_OK (0) if OK, or error code.
-  uint8_t _checkforclock = I2CManager.checkAddress(i2cAddress);
+  uint8_t _checkforclock = I2CManager.checkAddress(_I2CAddress);
  DIAG(F("Clock check result - %d"), _checkforclock);
  // XXXX change thistosave2 bytes
  if (_checkforclock == 0) {
      FAST_CLOCK_EXISTS = true;
-      //DIAG(F("I2C Fast Clock found at %s"), i2cAddress.toString());
-      new EXFastClock(i2cAddress); 
+      //DIAG(F("I2C Fast Clock found at x%x"), _I2CAddress);
+      new EXFastClock(_I2CAddress); 
    }
    else {
      FAST_CLOCK_EXISTS = false;
@@ -68,6 +68,7 @@ static void create(I2CAddress i2cAddress) {
  }
    
 private:
+uint8_t _I2CAddress;
  

 // Initialisation of Fastclock
@@ -83,7 +84,7 @@ void _begin() override {
    } else {
    _deviceState = DEVSTATE_FAILED;
    //LCD(6,F("CLOCK NOT FOUND")); 
-    DIAG(F("Fast Clock Not Found at address %s"), _I2CAddress.toString());
+    DIAG(F("Fast Clock Not Found at address %d"), _I2CAddress);
    }
  }
 }
@@ -109,15 +110,17 @@ void _loop(unsigned long currentMicros) override{
        // As the minimum clock increment is 2 seconds delay a bit - say 1 sec.
        // Clock interval is 60/ clockspeed i.e 60/b seconds
        delayUntil(currentMicros + ((60/b) * 1000000));  
+            
+        }
     
      #endif
    
  }
-}
+

  // Display EX-FastClock device driver info.
-  void _display() override {
-    DIAG(F("FastCLock on I2C:%s - %S"), _I2CAddress.toString(),  (_deviceState==DEVSTATE_FAILED) ? F("OFFLINE") : F(""));
+  void _display() {
+    DIAG(F("FastCLock on I2C:x%x - %S"), _I2CAddress,  (_deviceState==DEVSTATE_FAILED) ? F("OFFLINE") : F(""));
  }
  
 };
--- a/IO_EXIOExpander.h
+++ b/IO_EXIOExpander.h
@@ -34,16 +34,11 @@
 * device in use. There is no way for the device driver to sanity check pins are used for the
 * correct purpose, however the EX-IOExpander device's pin map will prevent pins being used
 * incorrectly (eg. A6/7 on Nano cannot be used for digital input/output).
-*
-* The total number of pins cannot exceed 256 because of the communications packet format.
-* The number of analogue inputs cannot exceed 16 because of a limit on the maximum
-* I2C packet size of 32 bytes (in the Wire library).
 */

 #ifndef IO_EX_IOEXPANDER_H
 #define IO_EX_IOEXPANDER_H

-#include "IODevice.h"
 #include "I2CManager.h"
 #include "DIAG.h"
 #include "FSH.h"
@@ -65,213 +60,120 @@ public:
    NoPowerOff = 0x80, // Flag to be ORed in to suppress power off after move.
  };

-  static void create(VPIN vpin, int nPins, I2CAddress i2cAddress) {
+  static void create(VPIN vpin, int nPins, uint8_t i2cAddress) {
    if (checkNoOverlap(vpin, nPins, i2cAddress)) new EXIOExpander(vpin, nPins, i2cAddress);
  }

-private:
+private:  
  // Constructor
-  EXIOExpander(VPIN firstVpin, int nPins, I2CAddress i2cAddress) {
+  EXIOExpander(VPIN firstVpin, int nPins, uint8_t i2cAddress) {
    _firstVpin = firstVpin;
-    // Number of pins cannot exceed 256 (1 byte) because of I2C message structure.
-    if (nPins > 256) nPins = 256;
    _nPins = nPins;
-    _I2CAddress = i2cAddress;
+    _i2cAddress = i2cAddress;
    addDevice(this);
  }

  void _begin() {
-    uint8_t status;
    // Initialise EX-IOExander device
    I2CManager.begin();
-    if (I2CManager.exists(_I2CAddress)) {
+    if (I2CManager.exists(_i2cAddress)) {
+      _command4Buffer[0] = EXIOINIT;
+      _command4Buffer[1] = _nPins;
+      _command4Buffer[2] = _firstVpin & 0xFF;
+      _command4Buffer[3] = _firstVpin >> 8;
      // Send config, if EXIOPINS returned, we're good, setup pin buffers, otherwise go offline
-      // NB The I2C calls here are done as blocking calls, as they're not time-critical
-      // during initialisation and the reads require waiting for a response anyway.
-      // Hence we can allocate I/O buffers from the stack.
-      uint8_t receiveBuffer[3];
-      uint8_t commandBuffer[4] = {EXIOINIT, (uint8_t)_nPins, (uint8_t)(_firstVpin & 0xFF), (uint8_t)(_firstVpin >> 8)};
-      status = I2CManager.read(_I2CAddress, receiveBuffer, sizeof(receiveBuffer), commandBuffer, sizeof(commandBuffer));
-      if (status == I2C_STATUS_OK) {
-        if (receiveBuffer[0] == EXIOPINS) {
-          _numDigitalPins = receiveBuffer[1];
-          _numAnaloguePins = receiveBuffer[2];
-
-          // See if we already have suitable buffers assigned
-          size_t digitalBytesNeeded = (_numDigitalPins + 7) / 8;
-          if (_digitalPinBytes < digitalBytesNeeded) {
-            // Not enough space, free any existing buffer and allocate a new one
-            if (_digitalPinBytes > 0) free(_digitalInputStates);
-            _digitalInputStates = (byte*) calloc(_digitalPinBytes, 1);
-            _digitalPinBytes = digitalBytesNeeded;
-          }
-          size_t analogueBytesNeeded = _numAnaloguePins * 2;
-          if (_analoguePinBytes < analogueBytesNeeded) {
-            // Free any existing buffers and allocate new ones.
-            if (_analoguePinBytes > 0) {
-              free(_analogueInputBuffer);
-              free(_analogueInputStates);
-              free(_analoguePinMap);
-            }
-            _analogueInputStates = (uint8_t*) calloc(analogueBytesNeeded, 1);
-            _analogueInputBuffer = (uint8_t*) calloc(analogueBytesNeeded, 1);
-            _analoguePinMap = (uint8_t*) calloc(_numAnaloguePins, 1);
-            _analoguePinBytes = analogueBytesNeeded;
-          }
-        } else {
-          DIAG(F("EX-IOExpander I2C:%s ERROR configuring device"), _I2CAddress.toString());
-          _deviceState = DEVSTATE_FAILED;
-          return;
-        }
-      } 
+      I2CManager.read(_i2cAddress, _receive3Buffer, 3, _command4Buffer, 4);
+      if (_receive3Buffer[0] == EXIOPINS) {
+        _numDigitalPins = _receive3Buffer[1];
+        _numAnaloguePins = _receive3Buffer[2];
+        _digitalPinBytes = (_numDigitalPins + 7)/8;
+        _digitalInputStates=(byte*) calloc(_digitalPinBytes,1);
+        _analoguePinBytes = _numAnaloguePins * 2;
+        _analogueInputStates = (byte*) calloc(_analoguePinBytes, 1);
+        _analoguePinMap = (uint8_t*) calloc(_numAnaloguePins, 1);
+      } else {
+        DIAG(F("ERROR configuring EX-IOExpander device, I2C:x%x"), _i2cAddress);
+        _deviceState = DEVSTATE_FAILED;
+        return;
+      }
      // We now need to retrieve the analogue pin map
-      if (status == I2C_STATUS_OK) {
-        commandBuffer[0] = EXIOINITA;
-        status = I2CManager.read(_I2CAddress, _analoguePinMap, _numAnaloguePins, commandBuffer, 1);
-      }
-      if (status == I2C_STATUS_OK) {
-        // Attempt to get version, if we don't get it, we don't care, don't go offline
-        uint8_t versionBuffer[3];
-        commandBuffer[0] = EXIOVER;
-        if (I2CManager.read(_I2CAddress, versionBuffer, sizeof(versionBuffer), commandBuffer, 1) == I2C_STATUS_OK) {
-          _majorVer = versionBuffer[0];
-          _minorVer = versionBuffer[1];
-          _patchVer = versionBuffer[2];
-        }
-        DIAG(F("EX-IOExpander device found, I2C:%s, Version v%d.%d.%d"),
-            _I2CAddress.toString(), _majorVer, _minorVer, _patchVer);
-
+      _command1Buffer[0] = EXIOINITA;
+      I2CManager.read(_i2cAddress, _analoguePinMap, _numAnaloguePins, _command1Buffer, 1);
+      // Attempt to get version, if we don't get it, we don't care, don't go offline
+      _command1Buffer[0] = EXIOVER;
+      I2CManager.read(_i2cAddress, _versionBuffer, 3, _command1Buffer, 1);
+      _majorVer = _versionBuffer[0];
+      _minorVer = _versionBuffer[1];
+      _patchVer = _versionBuffer[2];
+      DIAG(F("EX-IOExpander device found, I2C:x%x, Version v%d.%d.%d"),
+          _i2cAddress, _versionBuffer[0], _versionBuffer[1], _versionBuffer[2]);
 #ifdef DIAG_IO
-        _display();
+      _display();
 #endif
-      }
-      if (status != I2C_STATUS_OK)
-        reportError(status);
-
    } else {
-      DIAG(F("EX-IOExpander I2C:%s device not found"), _I2CAddress.toString());
+      DIAG(F("EX-IOExpander device not found, I2C:x%x"), _i2cAddress);
      _deviceState = DEVSTATE_FAILED;
    }
  }

-  // Digital input pin configuration, used to enable on EX-IOExpander device and set pullups if requested.
-  // Configuration isn't done frequently so we can use blocking I2C calls here, and so buffers can
-  // be allocated from the stack to reduce RAM allocation.
+  // Digital input pin configuration, used to enable on EX-IOExpander device and set pullups if in use
  bool _configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, int params[]) override {
    if (paramCount != 1) return false;
    int pin = vpin - _firstVpin;
    if (configType == CONFIGURE_INPUT) {
-      uint8_t pullup = params[0];
-      uint8_t outBuffer[] = {EXIODPUP, (uint8_t)pin, pullup};
-      uint8_t responseBuffer[1];
-      uint8_t status = I2CManager.read(_I2CAddress, responseBuffer, sizeof(responseBuffer),
-                                outBuffer, sizeof(outBuffer));
-      if (status == I2C_STATUS_OK) {
-        if (responseBuffer[0] == EXIORDY) {
-          return true;
-        } else {
-          DIAG(F("EXIOVpin %u cannot be used as a digital input pin"), (int)vpin);
-        }
-      } else
-        reportError(status);
-    } else if (configType == CONFIGURE_ANALOGINPUT) {
-      // TODO:  Consider moving code from _configureAnalogIn() to here and remove _configureAnalogIn
-      // from IODevice class definition.  Not urgent, but each virtual function defined
-      // means increasing the RAM requirement of every HAL device driver, whether it's relevant
-      // to the driver or not.
-      return false;
-    }
-    return false;
-  }
-
-  // Analogue input pin configuration, used to enable an EX-IOExpander device.
-  // Use I2C blocking calls and allocate buffers from stack to save RAM.
-  int _configureAnalogIn(VPIN vpin) override {
-    int pin = vpin - _firstVpin;
-    uint8_t commandBuffer[] = {EXIOENAN, (uint8_t)pin};
-    uint8_t responseBuffer[1];
-    uint8_t status = I2CManager.read(_I2CAddress, responseBuffer, sizeof(responseBuffer),
-                                  commandBuffer, sizeof(commandBuffer));
-    if (status == I2C_STATUS_OK) {
-      if (responseBuffer[0] == EXIORDY) {
+      bool pullup = params[0];
+      _digitalOutBuffer[0] = EXIODPUP;
+      _digitalOutBuffer[1] = pin;
+      _digitalOutBuffer[2] = pullup;
+      I2CManager.read(_i2cAddress, _command1Buffer, 1, _digitalOutBuffer, 3);
+      if (_command1Buffer[0] == EXIORDY) {
        return true;
      } else {
-        DIAG(F("EX-IOExpander: Vpin %u cannot be used as an analogue input pin"), (int)vpin);
+        DIAG(F("Vpin %d cannot be used as a digital input pin"), (int)vpin);
+        return false;
      }
-    } else
-      reportError(status);
+    } else {
+      return false;
+    }
+  }

-    return false;
+  // Analogue input pin configuration, used to enable on EX-IOExpander device
+  int _configureAnalogIn(VPIN vpin) override {
+    int pin = vpin - _firstVpin;
+    _command2Buffer[0] = EXIOENAN;
+    _command2Buffer[1] = pin;
+    I2CManager.read(_i2cAddress, _command1Buffer, 1, _command2Buffer, 2);
+    if (_command1Buffer[0] == EXIORDY) {
+      return true;
+    } else {
+      DIAG(F("Vpin %d cannot be used as an analogue input pin"), (int)vpin);
+      return false;
+    }
+    return true;
  }

  // Main loop, collect both digital and analogue pin states continuously (faster sensor/input reads)
  void _loop(unsigned long currentMicros) override {
-    if (_deviceState == DEVSTATE_FAILED) return;    // If device failed, return
-
-    // Request block is used for analogue and digital reads from the IOExpander, which are performed
-    // on a cyclic basis.  Writes are performed synchronously as and when requested.
-
-    if (_readState != RDS_IDLE) {
-      if (_i2crb.isBusy()) return;                // If I2C operation still in progress, return
-
-      uint8_t status = _i2crb.status;
-      if (status == I2C_STATUS_OK) {             // If device request ok, read input data
-
-        // First check if we need to process received data
-        if (_readState == RDS_ANALOGUE) {
-          // Read of analogue values was in progress, so process received values
-          // Here we need to copy the values from input buffer to the analogue value array.  We need to 
-          // do this to avoid tearing of the values (i.e. one byte of a two-byte value being changed
-          // while the value is being read).
-          memcpy(_analogueInputStates, _analogueInputBuffer, _analoguePinBytes); // Copy I2C input buffer to states
-
-        } else if (_readState == RDS_DIGITAL) {
-          // Read of digital states was in progress, so process received values 
-          // The received digital states are placed directly into the digital buffer on receipt, 
-          // so don't need any further processing at this point (unless we want to check for
-          // changes and notify them to subscribers, to avoid the need for polling - see IO_GPIOBase.h).
-        }
-      } else
-        reportError(status, false);   // report eror but don't go offline.
-
-      _readState = RDS_IDLE;
-    }
-
-    // If we're not doing anything now, check to see if a new input transfer is due.
-    if (_readState == RDS_IDLE) {
-      if (currentMicros - _lastDigitalRead > _digitalRefresh) { // Delay for digital read refresh
-        // Issue new read request for digital states.  As the request is non-blocking, the buffer has to
-        // be allocated from heap (object state).
-        _readCommandBuffer[0] = EXIORDD;
-        I2CManager.read(_I2CAddress, _digitalInputStates, (_numDigitalPins+7)/8, _readCommandBuffer, 1, &_i2crb);
-                                                                // non-blocking read
-        _lastDigitalRead = currentMicros;
-        _readState = RDS_DIGITAL;
-      } else if (currentMicros - _lastAnalogueRead > _analogueRefresh) { // Delay for analogue read refresh
-        // Issue new read for analogue input states
-        _readCommandBuffer[0] = EXIORDAN;
-        I2CManager.read(_I2CAddress, _analogueInputBuffer,
-            _numAnaloguePins * 2, _readCommandBuffer, 1, &_i2crb);
-        _lastAnalogueRead = currentMicros;
-        _readState = RDS_ANALOGUE;
-      }
-    }
+    (void)currentMicros; // remove warning
+    if (_deviceState == DEVSTATE_FAILED) return;
+    _command1Buffer[0] = EXIORDD;
+    I2CManager.read(_i2cAddress, _digitalInputStates, _digitalPinBytes, _command1Buffer, 1);
+    _command1Buffer[0] = EXIORDAN;
+    I2CManager.read(_i2cAddress, _analogueInputStates, _analoguePinBytes, _command1Buffer, 1);
  }

-  // Obtain the correct analogue input value, with reference to the analogue
-  // pin map.  
  // Obtain the correct analogue input value
  int _readAnalogue(VPIN vpin) override {
    if (_deviceState == DEVSTATE_FAILED) return 0;
    int pin = vpin - _firstVpin;
+    uint8_t _pinLSBByte;
    for (uint8_t aPin = 0; aPin < _numAnaloguePins; aPin++) {
      if (_analoguePinMap[aPin] == pin) {
-        uint8_t _pinLSBByte = aPin * 2;
-        uint8_t _pinMSBByte = _pinLSBByte + 1;
-        return (_analogueInputStates[_pinMSBByte] << 8) + _analogueInputStates[_pinLSBByte];
+        _pinLSBByte = aPin * 2;
      }
    }
-    return -1;  // pin not found in table
+    uint8_t _pinMSBByte = _pinLSBByte + 1;
+    return (_analogueInputStates[_pinMSBByte] << 8) + _analogueInputStates[_pinLSBByte];
  }

  // Obtain the correct digital input value
@@ -283,102 +185,63 @@ private:
    return value;
  }

-  // Write digital value.  We could have an output buffer of states, that is periodically
-  // written to the device if there are any changes; this would reduce the I2C overhead
-  // if lots of output requests are being made.  We could also cache the last value 
-  // sent so that we don't write the same value over and over to the output.  
-  // However, for the time being, we just write the current value (blocking I2C) to the
-  // IOExpander node.  As it is a blocking request, we can use buffers allocated from
-  // the stack to save RAM allocation.
  void _write(VPIN vpin, int value) override {
-    uint8_t digitalOutBuffer[3];
-    uint8_t responseBuffer[1];
    if (_deviceState == DEVSTATE_FAILED) return;
    int pin = vpin - _firstVpin;
-    digitalOutBuffer[0] = EXIOWRD;
-    digitalOutBuffer[1] = pin;
-    digitalOutBuffer[2] = value;
-    uint8_t status = I2CManager.read(_I2CAddress, responseBuffer, 1, digitalOutBuffer, 3);
-    if (status != I2C_STATUS_OK) {
-      reportError(status);
-    } else {
-      if (responseBuffer[0] != EXIORDY) {
-        DIAG(F("Vpin %u cannot be used as a digital output pin"), (int)vpin);
-      }
+    _digitalOutBuffer[0] = EXIOWRD;
+    _digitalOutBuffer[1] = pin;
+    _digitalOutBuffer[2] = value;
+    I2CManager.read(_i2cAddress, _command1Buffer, 1, _digitalOutBuffer, 3);
+    if (_command1Buffer[0] != EXIORDY) {
+      DIAG(F("Vpin %d cannot be used as a digital output pin"), (int)vpin);
    }
  }

-  // Write analogue (integer) value.  Write the parameters (blocking I2C) to the
-  // IOExpander node.  As it is a blocking request, we can use buffers allocated from
-  // the stack to reduce RAM allocation.
  void _writeAnalogue(VPIN vpin, int value, uint8_t profile, uint16_t duration) override {
-    uint8_t servoBuffer[7];
-    uint8_t responseBuffer[1];
-
    if (_deviceState == DEVSTATE_FAILED) return;
    int pin = vpin - _firstVpin;
 #ifdef DIAG_IO
-    DIAG(F("Servo: WriteAnalogue Vpin:%u Value:%d Profile:%d Duration:%d %S"), 
+    DIAG(F("Servo: WriteAnalogue Vpin:%d Value:%d Profile:%d Duration:%d %S"), 
      vpin, value, profile, duration, _deviceState == DEVSTATE_FAILED?F("DEVSTATE_FAILED"):F(""));
 #endif
-    servoBuffer[0] = EXIOWRAN;
-    servoBuffer[1] = pin;
-    servoBuffer[2] = value & 0xFF;
-    servoBuffer[3] = value >> 8;
-    servoBuffer[4] = profile;
-    servoBuffer[5] = duration & 0xFF;
-    servoBuffer[6] = duration >> 8;
-    uint8_t status = I2CManager.read(_I2CAddress, responseBuffer, 1, servoBuffer, 7);
-    if (status != I2C_STATUS_OK) {
-      DIAG(F("EX-IOExpander I2C:%s Error:%d %S"), _I2CAddress.toString(), status, I2CManager.getErrorMessage(status));
-      _deviceState = DEVSTATE_FAILED;
-    } else {
-      if (responseBuffer[0] != EXIORDY) {
-        DIAG(F("Vpin %u cannot be used as a servo/PWM pin"), (int)vpin);
-      }
+    _servoBuffer[0] = EXIOWRAN;
+    _servoBuffer[1] = pin;
+    _servoBuffer[2] = value & 0xFF;
+    _servoBuffer[3] = value >> 8;
+    _servoBuffer[4] = profile;
+    _servoBuffer[5] = duration & 0xFF;
+    _servoBuffer[6] = duration >> 8;
+    I2CManager.read(_i2cAddress, _command1Buffer, 1, _servoBuffer, 7);
+    if (_command1Buffer[0] != EXIORDY) {
+      DIAG(F("Vpin %d cannot be used as a servo/PWM pin"), (int)vpin);
    }
  }

-  // Display device information and status.
  void _display() override {
-    DIAG(F("EX-IOExpander I2C:%s v%d.%d.%d Vpins %u-%u %S"),
-              _I2CAddress.toString(), _majorVer, _minorVer, _patchVer,
+    DIAG(F("EX-IOExpander I2C:x%x v%d.%d.%d Vpins %d-%d %S"),
+              _i2cAddress, _majorVer, _minorVer, _patchVer,
              (int)_firstVpin, (int)_firstVpin+_nPins-1,
              _deviceState == DEVSTATE_FAILED ? F("OFFLINE") : F(""));
  }

-  // Helper function for error handling
-  void reportError(uint8_t status, bool fail=true) {
-    DIAG(F("EX-IOExpander I2C:%s Error:%d (%S)"), _I2CAddress.toString(), 
-      status, I2CManager.getErrorMessage(status));
-    if (fail)
-    _deviceState = DEVSTATE_FAILED;
-  }
-
+  uint8_t _i2cAddress;
  uint8_t _numDigitalPins = 0;
  uint8_t _numAnaloguePins = 0;
-
+  byte _digitalOutBuffer[3];
+  uint8_t _versionBuffer[3];
  uint8_t _majorVer = 0;
  uint8_t _minorVer = 0;
  uint8_t _patchVer = 0;
-
-  uint8_t* _digitalInputStates;
-  uint8_t* _analogueInputStates;
-  uint8_t* _analogueInputBuffer;  // buffer for I2C input transfers
-  uint8_t _readCommandBuffer[1];
-
-  uint8_t _digitalPinBytes = 0;  // Size of allocated memory buffer (may be longer than needed)
-  uint8_t _analoguePinBytes = 0;  // Size of allocated memory buffers (may be longer than needed)
+  byte* _digitalInputStates;
+  byte* _analogueInputStates;
+  uint8_t _digitalPinBytes = 0;
+  uint8_t _analoguePinBytes = 0;
+  byte _command1Buffer[1];
+  byte _command2Buffer[2];
+  byte _command4Buffer[4];
+  byte _receive3Buffer[3];
+  byte _servoBuffer[7];
  uint8_t* _analoguePinMap;
-  I2CRB _i2crb;
-
-  enum {RDS_IDLE, RDS_DIGITAL, RDS_ANALOGUE};  // Read operation states
-  uint8_t _readState = RDS_IDLE;
-  
-  unsigned long _lastDigitalRead = 0;
-  unsigned long _lastAnalogueRead = 0;
-  const unsigned long _digitalRefresh = 10000UL;    // Delay refreshing digital inputs for 10ms
-  const unsigned long _analogueRefresh = 50000UL;   // Delay refreshing analogue inputs for 50ms

  // EX-IOExpander protocol flags
  enum {
--- a/IO_EXTurntable.h
+++ b/IO_EXTurntable.h
@@ -35,12 +35,12 @@
 #include "I2CManager.h"
 #include "DIAG.h"

-void EXTurntable::create(VPIN firstVpin, int nPins, I2CAddress I2CAddress) {
+void EXTurntable::create(VPIN firstVpin, int nPins, uint8_t I2CAddress) {
  new EXTurntable(firstVpin, nPins, I2CAddress);
 }

 // Constructor
-EXTurntable::EXTurntable(VPIN firstVpin, int nPins, I2CAddress I2CAddress) {
+EXTurntable::EXTurntable(VPIN firstVpin, int nPins, uint8_t I2CAddress) {
  _firstVpin = firstVpin;
  _nPins = nPins;
  _I2CAddress = I2CAddress;
@@ -50,12 +50,12 @@ EXTurntable::EXTurntable(VPIN firstVpin, int nPins, I2CAddress I2CAddress) {
 // Initialisation of EXTurntable
 void EXTurntable::_begin() {
  I2CManager.begin();
+  I2CManager.setClock(1000000);
  if (I2CManager.exists(_I2CAddress)) {
 #ifdef DIAG_IO
    _display();
 #endif
  } else {
-    DIAG(F("EX-Turntable I2C:%s device not found"), _I2CAddress.toString());
    _deviceState = DEVSTATE_FAILED;
  }
 }
@@ -103,10 +103,10 @@ void EXTurntable::_writeAnalogue(VPIN vpin, int value, uint8_t activity, uint16_
  uint8_t stepsMSB = value >> 8;
  uint8_t stepsLSB = value & 0xFF;
 #ifdef DIAG_IO
-  DIAG(F("EX-Turntable WriteAnalogue VPIN:%u Value:%d Activity:%d Duration:%d"),
+  DIAG(F("EX-Turntable 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.toString(), stepsMSB, stepsLSB, activity);
+    _I2CAddress, stepsMSB, stepsLSB, activity);
 #endif
  _stepperStatus = 1;     // Tell the device driver Turntable-EX is busy
  I2CManager.write(_I2CAddress, 3, stepsMSB, stepsLSB, activity);
@@ -114,7 +114,7 @@ void EXTurntable::_writeAnalogue(VPIN vpin, int value, uint8_t activity, uint16_

 // Display Turnetable-EX device driver info.
 void EXTurntable::_display() {
-  DIAG(F("EX-Turntable I2C:%s Configured on Vpins:%u-%u %S"), _I2CAddress.toString(), (int)_firstVpin, 
+  DIAG(F("EX-Turntable I2C:x%x Configured on Vpins:%d-%d %S"), _I2CAddress, (int)_firstVpin, 
    (int)_firstVpin+_nPins-1, (_deviceState==DEVSTATE_FAILED) ? F("OFFLINE") : F(""));
 }

--- a/IO_ExampleSerial.cpp
+++ b/IO_ExampleSerial.cpp
@@ -0,0 +1,129 @@
+/*
+ *  © 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/>.
+ */
+
+#include <Arduino.h>
+#include "IO_ExampleSerial.h"
+#include "FSH.h"
+
+// Constructor
+IO_ExampleSerial::IO_ExampleSerial(VPIN firstVpin, int nPins, HardwareSerial *serial, unsigned long baud) {
+  _firstVpin = firstVpin;
+  _nPins = nPins;
+  _pinValues = (uint16_t *)calloc(_nPins, sizeof(uint16_t));
+  _baud = baud;
+  
+  // Save reference to serial port driver
+  _serial = serial;
+
+  addDevice(this);
+}
+
+// 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);
+}
+
+// Device-specific initialisation
+void IO_ExampleSerial::_begin() {
+  _serial->begin(_baud);
+#if defined(DIAG_IO)
+  _display();
+#endif
+
+  // Send a few # characters to the output
+  for (uint8_t i=0; i<3; i++)
+    _serial->write('#');
+}
+
+// Device-specific write function.  Write a string in the form "#Wm,n#"
+//  where m is the vpin number, and n is the value.
+void IO_ExampleSerial::_write(VPIN vpin, int value) {
+  int pin = vpin -_firstVpin;
+  #ifdef DIAG_IO
+  DIAG(F("IO_ExampleSerial::_write Pin:%d Value:%d"), (int)vpin, value);
+  #endif
+  // Send a command string over the serial line
+  _serial->print('#');
+  _serial->print('W');
+  _serial->print(pin);
+  _serial->print(',');
+  _serial->print(value);
+  _serial->println('#');
+  DIAG(F("ExampleSerial Sent command, p1=%d, p2=%d"), vpin, value);
+ }
+
+// Device-specific read function.
+int IO_ExampleSerial::_read(VPIN vpin) {
+
+  // Return a value for the specified vpin.
+  int result = _pinValues[vpin-_firstVpin];
+
+  return result;
+}
+
+// Loop function to do background scanning of the input port.  State 
+//  machine parses the incoming command as it is received.  Command
+//  is in the form "#Nm,n#" where m is the index and n is the value.
+void IO_ExampleSerial::_loop(unsigned long currentMicros) {
+  (void)currentMicros;  // Suppress compiler warnings
+  if (_serial->available()) {
+    // Input data available to read.  Read a character.
+    char c = _serial->read();
+    switch (_inputState) {
+      case 0: // Waiting for start of command
+        if (c == '#')  // Start of command received.
+          _inputState = 1;
+        break;
+      case 1: // Expecting command character
+        if (c == 'N') { // 'Notify' character received
+          _inputState = 2;
+          _inputValue = _inputIndex = 0;
+        } else
+          _inputState = 0; // Unexpected char, reset
+        break;
+      case 2: // reading first parameter (index)
+        if (isdigit(c))
+          _inputIndex = _inputIndex * 10 + (c-'0');
+        else if (c==',') 
+          _inputState = 3;
+        else
+          _inputState = 0; // Unexpected char, reset
+        break;
+      case 3: // reading reading second parameter (value)
+        if (isdigit(c)) 
+          _inputValue = _inputValue * 10 - (c-'0');
+        else if (c=='#') { // End of command
+          // Complete command received, do something with it.
+          DIAG(F("ExampleSerial Received command, p1=%d, p2=%d"), _inputIndex, _inputValue);
+          if (_inputIndex < _nPins) { // Store value
+            _pinValues[_inputIndex] = _inputValue;
+          }
+          _inputState = 0; // Done, start again.
+        } else
+          _inputState = 0; // Unexpected char, reset
+        break;
+    }
+  }
+}
+
+void IO_ExampleSerial::_display() {
+  DIAG(F("IO_ExampleSerial Configured on VPins:%d-%d"), (int)_firstVpin, 
+    (int)_firstVpin+_nPins-1);
+}
+
--- a/IO_ExampleSerial.h
+++ b/IO_ExampleSerial.h
@@ -35,131 +35,24 @@
 #include "IODevice.h"

 class IO_ExampleSerial : public IODevice {
+public:
+  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;
+  int _read(VPIN vpin) override;
+  void _display() override;
+
 private:
-  // Here we define the device-specific variables.  
  HardwareSerial *_serial;
  uint8_t _inputState = 0;
  int _inputIndex = 0;
  int _inputValue = 0;
  uint16_t *_pinValues; // Pointer to block of memory containing pin values
  unsigned long _baud;
-
-public:
-  //  Static function to handle "IO_ExampleSerial::create(...)" calls.
-  static void create(VPIN firstVpin, int nPins, HardwareSerial *serial, unsigned long baud) {
-    if (checkNoOverlap(firstVpin,nPins)) new IO_ExampleSerial(firstVpin, nPins, serial, baud);
-  } 
-
-protected:
-  // Constructor.  This should initialise variables etc. but not call other objects yet
-  // (e.g. Serial, I2CManager, and other parts of the CS functionality).
-  // defer those until the _begin() function.  The 'addDevice' call is required unless
-  // the device is not to be added (e.g. because of incorrect parameters).
-  IO_ExampleSerial(VPIN firstVpin, int nPins, HardwareSerial *serial, unsigned long baud) {
-    _firstVpin = firstVpin;
-    _nPins = nPins;
-    _pinValues = (uint16_t *)calloc(_nPins, sizeof(uint16_t));
-    _baud = baud;
-    
-    // Save reference to serial port driver
-    _serial = serial;
-
-    addDevice(this);
-  }
-
-  // Device-specific initialisation
-  void _begin() override {
-    _serial->begin(_baud);
-#if defined(DIAG_IO)
-    _display();
-#endif
-
-    // Send a few # characters to the output
-    for (uint8_t i=0; i<3; i++)
-      _serial->write('#');
-  }
-  
-  // Device-specific write function.  Write a string in the form "#Wm,n#"
-  //  where m is the vpin number, and n is the value.
-  void _write(VPIN vpin, int value) {
-    int pin = vpin -_firstVpin;
-    #ifdef DIAG_IO
-    DIAG(F("IO_ExampleSerial::_write VPIN:%u Value:%d"), (int)vpin, value);
-    #endif
-    // Send a command string over the serial line
-    _serial->print('#');
-    _serial->print('W');
-    _serial->print(pin);
-    _serial->print(',');
-    _serial->print(value);
-    _serial->println('#');
-    DIAG(F("ExampleSerial Sent command, p1=%d, p2=%d"), vpin, value);
-  }
-
-  // Device-specific read function.
-  int _read(VPIN vpin) {
-
-    // Return a value for the specified vpin.
-    int result = _pinValues[vpin-_firstVpin];
-
-    return result;
-  }
-
-  // Loop function to do background scanning of the input port.  State 
-  //  machine parses the incoming command as it is received.  Command
-  //  is in the form "#Nm,n#" where m is the index and n is the value.
-  void _loop(unsigned long currentMicros) {
-    (void)currentMicros;  // Suppress compiler warnings
-    if (_serial->available()) {
-      // Input data available to read.  Read a character.
-      char c = _serial->read();
-      switch (_inputState) {
-        case 0: // Waiting for start of command
-          if (c == '#')  // Start of command received.
-            _inputState = 1;
-          break;
-        case 1: // Expecting command character
-          if (c == 'N') { // 'Notify' character received
-            _inputState = 2;
-            _inputValue = _inputIndex = 0;
-          } else
-            _inputState = 0; // Unexpected char, reset
-          break;
-        case 2: // reading first parameter (index)
-          if (isdigit(c))
-            _inputIndex = _inputIndex * 10 + (c-'0');
-          else if (c==',') 
-            _inputState = 3;
-          else
-            _inputState = 0; // Unexpected char, reset
-          break;
-        case 3: // reading reading second parameter (value)
-          if (isdigit(c)) 
-            _inputValue = _inputValue * 10 - (c-'0');
-          else if (c=='#') { // End of command
-            // Complete command received, do something with it.
-            DIAG(F("ExampleSerial Received command, p1=%d, p2=%d"), _inputIndex, _inputValue);
-            if (_inputIndex >= 0 && _inputIndex < _nPins) { // Store value
-              _pinValues[_inputIndex] = _inputValue;
-            }
-            _inputState = 0; // Done, start again.
-          } else
-            _inputState = 0; // Unexpected char, reset
-          break;
-      }
-    }
-  }
-
-  // Display information about the device, and perhaps its current condition (e.g. active, disabled etc).
-  // Here we display the current values held for the pins.
-  void _display() {
-    DIAG(F("IO_ExampleSerial Configured on Vpins:%u-%u"), (int)_firstVpin, 
-      (int)_firstVpin+_nPins-1);
-    for (int i=0; i<_nPins; i++)
-      DIAG(F("  VPin %2u: %d"), _firstVpin+i, _pinValues[i]);
-  }
-
-
 };

 #endif // IO_EXAMPLESERIAL_H
--- a/IO_GPIOBase.h
+++ b/IO_GPIOBase.h
@@ -34,7 +34,7 @@ class GPIOBase : public IODevice {

 protected:
  // Constructor
-  GPIOBase(FSH *deviceName, VPIN firstVpin, uint8_t nPins, I2CAddress i2cAddress, int interruptPin);
+  GPIOBase(FSH *deviceName, VPIN firstVpin, uint8_t nPins, uint8_t I2CAddress, int interruptPin);
  // Device-specific initialisation
  void _begin() override;
  // Device-specific pin configuration function.  
@@ -49,13 +49,13 @@ protected:
  // Data fields
 
  // Allocate enough space for all input pins
-  T _portInputState; // 1=high (inactive), 0=low (activated)
-  T _portOutputState; // 1 =high, 0=low
-  T _portMode;  // 0=input, 1=output
-  T _portPullup; // 0=nopullup, 1=pullup
-  T _portInUse;  // 0=not in use, 1=in use
-  // Target interval between refreshes of each input port
-  static const int _portTickTime = 4000; // 4ms
+  T _portInputState; 
+  T _portOutputState;
+  T _portMode;
+  T _portPullup;
+  T _portInUse;
+  // Interval between refreshes of each input port
+  static const int _portTickTime = 4000;

  // Virtual functions for interfacing with I2C GPIO Device
  virtual void _writeGpioPort() = 0;
@@ -69,6 +69,10 @@ 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
@@ -76,21 +80,15 @@ protected:

 // Constructor
 template <class T>
-GPIOBase<T>::GPIOBase(FSH *deviceName, VPIN firstVpin, uint8_t nPins, I2CAddress i2cAddress, int interruptPin) :
+GPIOBase<T>::GPIOBase(FSH *deviceName, VPIN firstVpin, uint8_t nPins, uint8_t I2CAddress, int interruptPin) :
  IODevice(firstVpin, nPins)
 {
-  if (_nPins > (int)sizeof(T)*8) _nPins = sizeof(T)*8;  // Ensure nPins is consistent with the number of bits in T
  _deviceName = deviceName;
-  _I2CAddress = i2cAddress;
+  _I2CAddress = I2CAddress;
  _gpioInterruptPin = interruptPin;
  _hasCallback = true;
  // Add device to list of devices.
  addDevice(this);
-
-  _portMode = 0;  // default to input mode
-  _portPullup = -1; // default to pullup enabled
-  _portInputState = -1;  // default to all inputs high (inactive)
-  _portInUse = 0;  // No ports in use initially.
 }

 template <class T>
@@ -105,16 +103,21 @@ void GPIOBase<T>::_begin() {
 #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:%s Device not detected"), _deviceName, _I2CAddress.toString());
+    DIAG(F("%S I2C:x%x Device not detected"), _deviceName, _I2CAddress);
    _deviceState = DEVSTATE_FAILED;
  }
 }

 // Configuration parameters for inputs: 
 //  params[0]: enable pullup
+//  params[1]: invert input (optional)
 template <class T>
 bool GPIOBase<T>::_configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, int params[]) {
  if (configType != CONFIGURE_INPUT) return false;
@@ -122,7 +125,7 @@ bool GPIOBase<T>::_configure(VPIN vpin, ConfigTypeEnum configType, int paramCoun
  bool pullup = params[0];
  int pin = vpin - _firstVpin;
  #ifdef DIAG_IO
-  DIAG(F("%S I2C:%s Config Pin:%d Val:%d"), _deviceName, _I2CAddress.toString(), pin, pullup);
+  DIAG(F("%S I2C:x%x Config Pin:%d Val:%d"), _deviceName, _I2CAddress, pin, pullup);
  #endif
  uint16_t mask = 1 << pin;
  if (pullup) 
@@ -152,7 +155,7 @@ void GPIOBase<T>::_loop(unsigned long currentMicros) {
      _deviceState = DEVSTATE_NORMAL;
    } else {
      _deviceState = DEVSTATE_FAILED;
-      DIAG(F("%S I2C:%s Error:%d %S"), _deviceName, _I2CAddress.toString(), status, 
+      DIAG(F("%S I2C:x%x Error:%d %S"), _deviceName, _I2CAddress, status, 
        I2CManager.getErrorMessage(status));
    }
    _processCompletion(status);
@@ -175,7 +178,7 @@ void GPIOBase<T>::_loop(unsigned long currentMicros) {

    #ifdef DIAG_IO
    if (differences)
-      DIAG(F("%S I2C:%s PortStates:%x"), _deviceName, _I2CAddress.toString(), _portInputState);
+      DIAG(F("%S I2C:x%x PortStates:%x"), _deviceName, _I2CAddress, _portInputState);
    #endif
  }

@@ -196,7 +199,7 @@ void GPIOBase<T>::_loop(unsigned long currentMicros) {

 template <class T>
 void GPIOBase<T>::_display() {
-  DIAG(F("%S I2C:%s Configured on Vpins:%u-%u %S"), _deviceName, _I2CAddress.toString(), 
+  DIAG(F("%S I2C:x%x Configured on Vpins:%d-%d %S"), _deviceName, _I2CAddress, 
    _firstVpin, _firstVpin+_nPins-1, (_deviceState==DEVSTATE_FAILED) ? F("OFFLINE") : F(""));
 }

@@ -205,7 +208,7 @@ void GPIOBase<T>::_write(VPIN vpin, int value) {
  int pin = vpin - _firstVpin;
  T mask = 1 << pin;
  #ifdef DIAG_IO
-  DIAG(F("%S I2C:%s Write Pin:%d Val:%d"), _deviceName, _I2CAddress.toString(), pin, 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
@@ -241,7 +244,7 @@ int GPIOBase<T>::_read(VPIN vpin) {
  // Set unused pin and write mode pin value to 1
    _portInputState |= ~_portInUse | _portMode;
    #ifdef DIAG_IO
-    DIAG(F("%S I2C:%s PortStates:%x"), _deviceName, _I2CAddress.toString(), _portInputState);
+    DIAG(F("%S I2C:x%x PortStates:%x"), _deviceName, _I2CAddress, _portInputState);
    #endif
  }
  return (_portInputState & mask) ? 0 : 1;  // Invert state (5v=0, 0v=1)
--- a/IO_HALDisplay.h
+++ b/IO_HALDisplay.h
@@ -1,262 +0,0 @@
-/*
- *  © 2023, 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/>.
- */
-
-/* 
- * This driver provides a more immediate interface into the OLED display
- * than the one installed through the config.h file.  When an LCD(...) call
- * is made, the text is output immediately to the specified display line,
- * without waiting for the next 2.5 second refresh.  However, if the line 
- * specified is off the screen then the text in the bottom line will be 
- * overwritten.  There is however a special case that if line 255 is specified, 
- * the existing text will scroll up and the new line added to the bottom
- * line of the screen.
- * 
- * To install, use the following command in myHal.cpp:
- *
- *    HALDisplay<OLED>::create(address, width, height);
- * 
- * where address is the I2C address of the OLED display (0x3c or 0x3d),
- * width is the width in pixels, and height is the height in pixels.
- * 
- * Valid width and height are 128x32 (SSD1306 controller), 
- * 128x64 (SSD1306) and 132x64 (SH1106).  The driver uses
- * a 5x7 character set in a 6x8 pixel cell.
- * 
- * OR
- * 
- *    HALDisplay<LiquidCrystal>::create(address, width, height);
- * 
- * where address is the I2C address of the LCD display (0x27 typically),
- * width is the width in characters (16 or 20 typically),
- * and height is the height in characters (2 or 4 typically).
- */
-
-
-#ifndef IO_HALDisplay_H
-#define IO_HALDisplay_H
-
-#include "IODevice.h"
-#include "DisplayInterface.h"
-#include "SSD1306Ascii.h"
-#include "LiquidCrystal_I2C.h"
-#include "version.h"
-
-typedef SSD1306AsciiWire OLED;
-typedef LiquidCrystal_I2C LiquidCrystal; 
-
-template <class T> 
-class HALDisplay : public IODevice, public DisplayInterface {
-private:
-  // Here we define the device-specific variables.  
-  uint8_t _height; // in pixels
-  uint8_t _width;  // in pixels
-  T *_displayDriver;
-  uint8_t _rowNo = 0;   // Row number being written by caller
-  uint8_t _colNo = 0;  // Position in line being written by caller
-  uint8_t _numRows;
-  uint8_t _numCols;
-  char *_buffer = NULL;
-  uint8_t *_rowGeneration = NULL;
-  uint8_t *_lastRowGeneration = NULL;
-  uint8_t _rowNoToScreen = 0; 
-  uint8_t _charPosToScreen = 0;
-  bool _startAgain = false;
-  DisplayInterface *_nextDisplay = NULL;
-
-public:
-  //  Static function to handle "HALDisplay::create(...)" calls.
-  static void create(I2CAddress i2cAddress, int width, int height) {
-    if (checkNoOverlap(0, 0, i2cAddress)) new HALDisplay(0, i2cAddress, width, height);
-  } 
-  static void create(uint8_t displayNo, I2CAddress i2cAddress, int width, int height) {
-    if (checkNoOverlap(0, 0, i2cAddress)) new HALDisplay(displayNo, i2cAddress, width, height);
-  } 
-
-protected:
-  // Constructor
-  HALDisplay(uint8_t displayNo, I2CAddress i2cAddress, int width, int height) {
-    _displayDriver = new T(i2cAddress, width, height);
-    if (!_displayDriver) return;  // Check for memory allocation failure
-    _I2CAddress = i2cAddress;
-    _width = width;
-    _height = height;
-    _numCols = _displayDriver->getNumCols();
-    _numRows = _displayDriver->getNumRows();
-
-    _charPosToScreen = _numCols;
-
-    // Allocate arrays
-    _buffer = (char *)calloc(_numRows*_numCols, sizeof(char));
-    if (!_buffer) return;  // Check for memory allocation failure
-    _rowGeneration = (uint8_t *)calloc(_numRows, sizeof(uint8_t));
-    if (!_rowGeneration) return;  // Check for memory allocation failure
-    _lastRowGeneration = (uint8_t *)calloc(_numRows, sizeof(uint8_t));
-    if (!_lastRowGeneration) return;  // Check for memory allocation failure
-
-    // Fill buffer with spaces
-    memset(_buffer, ' ', _numCols*_numRows);
-
-    _displayDriver->clearNative();
-
-    // Add device to list of HAL devices (not necessary but allows
-    // status to be displayed using <D HAL SHOW> and device to be
-    // reinitialised using <D HAL RESET>).
-    IODevice::addDevice(this);
-
-    // Also add this display to list of display handlers
-    DisplayInterface::addDisplay(displayNo);
-
-    // Is this the system display (0)?
-    if (displayNo == 0) {
-      // Set first two lines on screen
-      this->setRow(displayNo, 0);
-      print(F("DCC-EX v"));
-      print(F(VERSION));
-      setRow(displayNo, 1);
-      print(F("Lic GPLv3"));
-    }
-  }
-  
-  
-  void screenUpdate() {
-    // Loop through the buffer and if a row has changed
-    // (rowGeneration[row] is changed) then start writing the
-    // characters from the buffer, one character per entry, 
-    // to the screen until that row has been refreshed.
-
-    // First check if the OLED driver is still busy from a previous 
-    // call.  If so, don't do anything until the next entry.
-    if (!_displayDriver->isBusy()) {
-      // Check if we've just done the end of a row
-      if (_charPosToScreen >= _numCols) {
-        // Move to next line
-        if (++_rowNoToScreen >= _numRows || _startAgain) {
-          _rowNoToScreen = 0; // Wrap to first row
-          _startAgain = false;
-        }
-
-        if (_rowGeneration[_rowNoToScreen] != _lastRowGeneration[_rowNoToScreen]) {
-          // Row content has changed, so start outputting it
-          _lastRowGeneration[_rowNoToScreen] = _rowGeneration[_rowNoToScreen];
-          _displayDriver->setRowNative(_rowNoToScreen);
-          _charPosToScreen = 0;  // Prepare to output first character on next entry
-        } else {
-          // Row not changed, don't bother writing it.
-        }
-      } else {
-        // output character at current position
-        _displayDriver->writeNative(_buffer[_rowNoToScreen*_numCols+_charPosToScreen++]);
-      }  
-    }
-    return;
-  }
-
-  /////////////////////////////////////////////////
-  // IODevice Class Member Overrides
-  /////////////////////////////////////////////////
-
-  // Device-specific initialisation
-  void _begin() override {
-    // Initialise device
-    if (_displayDriver->begin()) {
-
-      _display();
-
-      // Force all rows to be redrawn
-      for (uint8_t row=0; row<_numRows; row++)
-        _rowGeneration[row]++;
-      
-      // Start with top line (looks better).  
-      // The numbers will wrap round on the first loop2 entry.
-      _rowNoToScreen = _numRows;
-      _charPosToScreen = _numCols;
-    }
-  }
-
-  void _loop(unsigned long) override {
-    screenUpdate();
-  }
-  
-  // Display information about the device.
-  void _display() {
-    DIAG(F("HALDisplay %d configured on addr %s"), _displayNo, _I2CAddress.toString());
-  }
-  
-  /////////////////////////////////////////////////
-  // DisplayInterface functions
-  // 
-  /////////////////////////////////////////////////
-  
-public:
-  void _displayLoop() override {
-    screenUpdate();
-  }
-
-  // Position on nominated line number (0 to number of lines -1)
-  // Clear the line in the buffer ready for updating
-  // The displayNo referenced here is remembered and any following
-  // calls to write() will be directed to that display.
-  void _setRow(byte line) override {
-    if (line == 255) {
-      // LCD(255,"xxx") or SCREEN(displayNo,255, "xxx") - 
-      // scroll the contents of the buffer and put the new line
-      // at the bottom of the screen
-      for (int row=1; row<_numRows; row++) {
-        strncpy(&_buffer[(row-1)*_numCols], &_buffer[row*_numCols], _numCols);
-        _rowGeneration[row-1]++;
-      }
-      line = _numRows-1;
-    } else if (line >= _numRows) 
-      line = _numRows - 1;  // Overwrite bottom line.
-
-    _rowNo = line;
-    // Fill line with blanks
-    for (_colNo = 0; _colNo < _numCols; _colNo++)
-      _buffer[_rowNo*_numCols+_colNo] = ' ';
-    _colNo = 0;
-    // Mark that the buffer has been touched.  It will start being 
-    // sent to the screen on the next loop entry, by which time
-    // the line should have been written to the buffer.
-    _rowGeneration[_rowNo]++;
-    // Indicate that the output loop is to start updating the screen again from
-    // row 0.  Otherwise, on a full screen rewrite the bottom part may be drawn
-    // before the top part!
-    _startAgain = true;
-  }
-
-  // Write one character to the screen referenced in the last setRow() call.
-  virtual size_t _write(uint8_t c) override {
-    // Write character to buffer (if there's space)
-    if (_colNo < _numCols) {
-      _buffer[_rowNo*_numCols+_colNo++] = c;
-    }
-    return 1;
-  }
-
-  // Write blanks to all of the screen buffer
-  void _clear() {
-    // Clear buffer
-    memset(_buffer, ' ', _numCols*_numRows);
-    _colNo = 0;
-    _rowNo = 0;
-  }
-
-};
-
-#endif // IO_HALDisplay_H
--- a/IO_HCSR04.h
+++ b/IO_HCSR04.h
@@ -30,7 +30,7 @@
 *
 * 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 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
@@ -48,20 +48,6 @@
 * 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.
- * 
- * Example configuration:
- *  HCSR04::create(23000, 32, 33, 80, 85);
- * 
- * Where 23000 is the VPIN allocated,
- *       32 is the pin connected to the HCSR04 trigger terminal,
- *       33 is the pin connected to the HCSR04 echo terminal,
- *       80 is the distance in cm below which pin 23000 will be active,
- *   and 85 is the distance in cm above which pin 23000 will be inactive.
- * 
- * Alternative configuration, which hogs the processor until the measurement is complete
- * (old behaviour, more accurate but higher impact on other CS tasks):
- *  HCSR04::create(23000, 32, 33, 80, 85, HCSR04::LOOP);
- * 
 */

 #ifndef IO_HCSR04_H
@@ -75,52 +61,38 @@ private:
  // pins must be arduino GPIO pins, not extender pins or HAL pins.
  int _trigPin = -1;
  int _echoPin = -1;
-  // Thresholds for setting active _state in cm.
+  // 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 
+  // Active=1/inactive=0 state 
  uint8_t _value = 0;
-  // Factor for calculating the distance (cm) from echo time (us).
+  // 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; // us/cm
-  // Limit the time spent looping by dropping out when the expected
-  // worst case threshold value is greater than an arbitrary value.
-  const uint16_t maxPermittedLoopTime = 10 * factor; // max in us
-  unsigned long _startTime = 0;
-  unsigned long _maxTime = 0;
-  enum {DORMANT, MEASURING}; // _state values
-  uint8_t _state = DORMANT;
-  uint8_t _counter = 0;
-  uint16_t _options = 0;
+  const uint16_t factor = 58; // ms/cm

 public:
-  enum Options {
-    LOOP = 1,  // Option HCSR04::LOOP reinstates old behaviour, i.e. complete measurement in one loop entry.
-  };
 
  // Static create function provides alternative way to create object
-  static void create(VPIN vpin, int trigPin, int echoPin, uint16_t onThreshold, uint16_t offThreshold, uint16_t options = 0) {
+  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, options);
+        new HCSR04(vpin, trigPin, echoPin, onThreshold, offThreshold);
  }

 protected:
-  // Constructor performs static initialisation of the device object
-  HCSR04 (VPIN vpin, int trigPin, int echoPin, uint16_t onThreshold, uint16_t offThreshold, uint16_t options) {
+  // Constructor perfroms static initialisation of the device object
+  HCSR04 (VPIN vpin, int trigPin, int echoPin, uint16_t onThreshold, uint16_t offThreshold) {
    _firstVpin = vpin;
    _nPins = 1;
    _trigPin = trigPin;
    _echoPin = echoPin;
    _onThreshold = onThreshold;
    _offThreshold = offThreshold;
-    _options = options;
    addDevice(this);
  }
 // _begin function called to perform dynamic initialisation of the device
  void _begin() override {
-    _state = 0;
    pinMode(_trigPin, OUTPUT);
    pinMode(_echoPin, INPUT);
    ArduinoPins::fastWriteDigital(_trigPin, 0);
@@ -140,104 +112,78 @@ protected:
    return _distance;
  }

-  // _loop function - read HC-SR04 once every 100 milliseconds.
+  // _loop function - read HC-SR04 once every 50 milliseconds.
  void _loop(unsigned long currentMicros) override {
-    unsigned long waitTime;
-    switch(_state) {
-      case DORMANT: // Issue pulse
-        // If receive pin is still set on from previous call, do nothing till next entry.
-        if (ArduinoPins::fastReadDigital(_echoPin)) return;
-
-        // Send 10us pulse to trigger transmitter
-        ArduinoPins::fastWriteDigital(_trigPin, 1);
-        delayMicroseconds(10);
-        ArduinoPins::fastWriteDigital(_trigPin, 0);
-
-        // Wait, with timeout, for echo pin to become set.
-        // Measured time delay is just under 500us, so 
-        // wait for max of 1000us.
-        _startTime = micros();
-        _maxTime = 1000;
-
-        while (!ArduinoPins::fastReadDigital(_echoPin)) {
-          // Not set yet, see if we've timed out.
-          waitTime = micros() - _startTime;
-          if (waitTime > _maxTime) {
-            // Timeout waiting for pulse start, abort the read and start again
-            _state = DORMANT;
-            return;
-          }
-        }
-
-        // Echo pulse started, so wait for echo pin to reset, and measure length of pulse
-        _startTime = micros();
-        _maxTime = factor * _offThreshold;
-        _state = MEASURING;
-        // If maximum measurement time is high, then skip until next loop entry before 
-        // starting to look for pulse end.
-        // This gives better accuracy at shorter distance thresholds but without extending 
-        // loop execution time for longer thresholds.  If LOOP option is set on, then
-        // the entire measurement will be done in one loop entry, i.e. the code will fall
-        // through into the measuring phase.
-        if (!(_options & LOOP) && _maxTime > maxPermittedLoopTime) break;
-        /* fallthrough */
-
-      case MEASURING: // Check if echo pulse has finished
-        do {
-          waitTime = micros() - _startTime;
-          if (!ArduinoPins::fastReadDigital(_echoPin)) {
-            // Echo pulse completed; check if pulse length is below threshold and if so set value.
-            if (waitTime <= factor * _onThreshold) {
-              // Measured time is within the onThreshold, so value is one.
-              _value = 1;
-              // If the new distance value is less than the current, use it immediately.
-              // But if the new distance value is longer, then it may be erroneously long
-              // (because of extended loop times delays), so apply a delay to distance increases.
-              uint16_t estimatedDistance = waitTime / factor;
-              if (estimatedDistance < _distance) 
-                _distance = estimatedDistance;
-              else
-                _distance += 1;  // Just increase distance slowly.
-              _counter = 0;
-              //DIAG(F("HCSR04: Pulse Len=%l Distance=%d"), waitTime, _distance);
-            }
-            _state = DORMANT;
-          } else {
-            // Echo pulse hasn't finished, so check if maximum time has elapsed
-            // 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, value is provisionally zero.
-              // But don't change _value unless provisional value is zero for 10 consecutive measurements
-              if (_value == 1) {
-                if (++_counter >= 10) {
-                  _value = 0;
-                  _distance = 32767;
-                  _counter = 0;
-                }
-              }
-              _state = DORMANT; // start again
-            }
-          }
-          // If there's lots of time remaining before the expected completion time,
-          // then exit and wait for next loop entry.  Otherwise, loop until we finish.
-          // If option LOOP is set, then we loop until finished anyway.
-          uint32_t remainingTime = _maxTime - waitTime;
-          if (!(_options & LOOP) && remainingTime < maxPermittedLoopTime) return;
-        } while (_state == MEASURING) ;
-        break;
-    }
-    // Datasheet recommends a wait of at least 60ms between measurement cycles
-    if (_state == DORMANT)
-      delayUntil(currentMicros+60000UL); // wait 60ms till next measurement
-
+    read_HCSR04device();
+    // Delay next loop entry until 50ms have elapsed.
+    delayUntil(currentMicros + 50000UL);
  }

  void _display() override {
-    DIAG(F("HCSR04 Configured on VPIN:%u TrigPin:%d EchoPin:%d On:%dcm Off:%dcm"),
+    DIAG(F("HCSR04 Configured on Vpin:%d TrigPin:%d EchoPin:%d On:%dcm Off:%dcm"),
      _firstVpin, _trigPin, _echoPin, _onThreshold, _offThreshold);
  }

+private:
+  // This polls the HC-SR04 device by sending a pulse and measuring the duration of
+  //  the pulse observed on the receive pin.  In order to be kind to the rest of the CS
+  //  software, no interrupts are used and interrupts are not disabled.  The pulse duration
+  //  is measured in a loop, using the micros() function.  Therefore, interrupts from other
+  //  sources may affect the result.  However, interrupts response code in CS typically takes
+  //  much less than the 58us frequency for the DCC interrupt, and 58us corresponds to only 1cm
+  //  in the HC-SR04.
+  //  To reduce chatter on the output, hysteresis is applied on reset: the output is set to 1 when the 
+  //  measured distance is less than the onThreshold, and is set to 0 if the measured distance is
+  //  greater than the offThreshold.
+  //
+  void read_HCSR04device() {
+    // uint16 enough to time up to 65ms
+    uint16_t startTime, waitTime = 0, currentTime, maxTime;  
+
+    // If receive pin is still set on from previous call, abort the read.
+    if (ArduinoPins::fastReadDigital(_echoPin))
+      return;
+
+    // Send 10us pulse to trigger transmitter
+    ArduinoPins::fastWriteDigital(_trigPin, 1);
+    delayMicroseconds(10);
+    ArduinoPins::fastWriteDigital(_trigPin, 0);
+
+    // Wait for receive pin to be set
+    startTime = currentTime = micros();
+    maxTime = factor * _offThreshold * 2;
+    while (!ArduinoPins::fastReadDigital(_echoPin)) {
+      // lastTime = currentTime;
+      currentTime = micros();
+      waitTime = currentTime - startTime;
+      if (waitTime > maxTime) {
+        // Timeout waiting for pulse start, abort the read
+        return;
+      }
+    }
+
+    // Wait for receive pin to reset, and measure length of pulse
+    startTime = currentTime = micros();
+    maxTime = factor * _offThreshold;
+    while (ArduinoPins::fastReadDigital(_echoPin)) {
+      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;
+      }
+    } 
+    // 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;
+  }
+
 };

 #endif //IO_HCSR04_H
--- a/IO_MCP23008.h
+++ b/IO_MCP23008.h
@@ -25,14 +25,14 @@

 class MCP23008 : public GPIOBase<uint8_t> {
 public:
-  static void create(VPIN firstVpin, uint8_t nPins, I2CAddress i2cAddress, int interruptPin=-1) {
-    if (checkNoOverlap(firstVpin, nPins,i2cAddress)) new MCP23008(firstVpin, nPins, i2cAddress, interruptPin);
+  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);
  }

 private:
  // Constructor
-  MCP23008(VPIN firstVpin, uint8_t nPins, I2CAddress i2cAddress, int interruptPin=-1)
-    : GPIOBase<uint8_t>((FSH *)F("MCP23008"), firstVpin, nPins, i2cAddress, interruptPin) {
+  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) {

    requestBlock.setRequestParams(_I2CAddress, inputBuffer, sizeof(inputBuffer),
      outputBuffer, sizeof(outputBuffer));
@@ -60,7 +60,7 @@ private:
    if (immediate) {
      uint8_t buffer;
      I2CManager.read(_I2CAddress, &buffer, 1, 1, REG_GPIO);
-      _portInputState = buffer | _portMode;
+      _portInputState = buffer;
    } else {
      // Queue new request
      requestBlock.wait(); // Wait for preceding operation to complete
@@ -71,7 +71,7 @@ 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] | _portMode;
+      _portInputState = inputBuffer[0];
    else  
      _portInputState = 0xff;
  }
--- a/IO_MCP23017.h
+++ b/IO_MCP23017.h
@@ -30,14 +30,14 @@
 
 class MCP23017 : public GPIOBase<uint16_t> {
 public:
-  static void create(VPIN vpin, uint8_t nPins, I2CAddress i2cAddress, int interruptPin=-1) {
-    if (checkNoOverlap(vpin, nPins, i2cAddress)) new MCP23017(vpin, nPins, i2cAddress, interruptPin);
+  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);
  }

 private:  
  // Constructor
-  MCP23017(VPIN vpin, uint8_t nPins, I2CAddress i2cAddress, int interruptPin=-1) 
-    : GPIOBase<uint16_t>((FSH *)F("MCP23017"), vpin, nPins, i2cAddress, interruptPin) 
+  MCP23017(VPIN vpin, int nPins, uint8_t I2CAddress, int interruptPin=-1) 
+    : GPIOBase<uint16_t>((FSH *)F("MCP23017"), vpin, nPins, I2CAddress, interruptPin) 
  {
    requestBlock.setRequestParams(_I2CAddress, inputBuffer, sizeof(inputBuffer),
      outputBuffer, sizeof(outputBuffer));
@@ -65,7 +65,7 @@ private:
    if (immediate) {
      uint8_t buffer[2];
      I2CManager.read(_I2CAddress, buffer, 2, 1, REG_GPIOA);
-      _portInputState = ((uint16_t)buffer[1]<<8) | buffer[0] | _portMode;
+      _portInputState = ((uint16_t)buffer[1]<<8) | buffer[0];
    } else {
      // Queue new request
      requestBlock.wait(); // Wait for preceding operation to complete
@@ -76,7 +76,7 @@ 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 = (((uint16_t)inputBuffer[1]<<8) | inputBuffer[0]) | _portMode;
+      _portInputState = ((uint16_t)inputBuffer[1]<<8) | inputBuffer[0];
    else  
      _portInputState = 0xffff;
  }
--- a/IO_PCA9555.h
+++ b/IO_PCA9555.h
@@ -1,112 +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_pca9555_h
-#define io_pca9555_h
-
-#include "IO_GPIOBase.h"
-#include "FSH.h"
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-/*
- * IODevice subclass for PCA9555 16-bit I/O expander (NXP & Texas Instruments).
- */
- 
-class PCA9555 : public GPIOBase<uint16_t> {
-public:
-  static void create(VPIN vpin, int nPins, uint8_t I2CAddress, int interruptPin=-1) {
-    new PCA9555(vpin, min(nPins,16), I2CAddress, interruptPin);
-  }
-  
-  // Constructor
-  PCA9555(VPIN vpin, int nPins, uint8_t I2CAddress, int interruptPin=-1) 
-    : GPIOBase<uint16_t>((FSH *)F("PCA9555"), vpin, nPins, I2CAddress, interruptPin) 
-  {
-    requestBlock.setRequestParams(_I2CAddress, inputBuffer, sizeof(inputBuffer),
-      outputBuffer, sizeof(outputBuffer));
-    outputBuffer[0] = REG_INPUT_P0;
-  }
-
-private:
-  void _writeGpioPort() override {
-    I2CManager.write(_I2CAddress, 3, REG_OUTPUT_P0, _portOutputState, _portOutputState>>8);
-  }
-  void _writePullups() override {
-    // Do nothing, pull-ups are always in place for input ports
-    // This function is here for HAL GPIOBase API compatibilitiy
-      
-  }
-  void _writePortModes() override {
-    // Write 0 to REG_CONF_P0 & REG_CONF_P1 for in-use pins that are outputs, 1 for others.
-    // PCA9555 & TCA9555, Interrupt is always enabled for raising and falling edge
-    uint16_t temp = ~(_portMode & _portInUse);
-    I2CManager.write(_I2CAddress, 3, REG_CONF_P0, temp, temp>>8);    
-  }
-  void _readGpioPort(bool immediate) override {
-    if (immediate) {
-      uint8_t buffer[2];
-      I2CManager.read(_I2CAddress, buffer, 2, 1, REG_INPUT_P0);
-      _portInputState = ((uint16_t)buffer[1]<<8) | buffer[0];
-      /* PCA9555 Int bug fix, from PCA9555 datasheet: "must change command byte to something besides 00h 
-       * after a Read operation to the PCA9555 device or before reading from 
-       * another device"
-       * Recommended solution, read from REG_OUTPUT_P0, then do nothing with the received data
-       * Issue not seen during testing, uncomment if needed 
-       */
-      //I2CManager.read(_I2CAddress, buffer, 2, 1, REG_OUTPUT_P0);
-    } else {
-      // Queue new request
-      requestBlock.wait(); // Wait for preceding operation to complete
-      // Issue new request to read GPIO register
-      I2CManager.queueRequest(&requestBlock);
-    }
-  }
-  // 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 = ((uint16_t)inputBuffer[1]<<8) | inputBuffer[0];
-    else  
-      _portInputState = 0xffff;
-  }
-
-  void _setupDevice() override {
-    // HAL API calls
-    _writePortModes();
-    _writePullups();
-    _writeGpioPort();
-  }
- 
-  uint8_t inputBuffer[2];
-  uint8_t outputBuffer[1];
- 
-
-  enum {
-    REG_INPUT_P0 = 0x00,
-    REG_INPUT_P1 = 0x01,
-    REG_OUTPUT_P0 = 0x02,
-    REG_OUTPUT_P1 = 0x03,
-    REG_POL_INV_P0 = 0x04,
-    REG_POL_INV_P1 = 0x05,
-    REG_CONF_P0 = 0x06,
-    REG_CONF_P1 = 0x07,    
-  };
-
-};
-
-#endif
--- a/IO_PCA9685.cpp
+++ b/IO_PCA9685.cpp
@@ -31,14 +31,15 @@ static const byte MODE1_AI=0x20;      /**< Auto-Increment enabled */
 static const byte MODE1_RESTART=0x80; /**< Restart enabled */

 static const float FREQUENCY_OSCILLATOR=25000000.0; /** Accurate enough for our purposes  */
+static const uint8_t PRESCALE_50HZ = (uint8_t)(((FREQUENCY_OSCILLATOR / (50.0 * 4096.0)) + 0.5) - 1);
 static const uint32_t MAX_I2C_SPEED = 1000000L; // PCA9685 rated up to 1MHz I2C clock speed

 // Predeclare helper function
 static void writeRegister(byte address, byte reg, byte value);

 // Create device driver instance.
-void PCA9685::create(VPIN firstVpin, int nPins, I2CAddress i2cAddress, uint16_t frequency) {
-  if (checkNoOverlap(firstVpin, nPins,i2cAddress)) new PCA9685(firstVpin, nPins, i2cAddress, frequency);
+void PCA9685::create(VPIN firstVpin, int nPins, uint8_t I2CAddress) {
+  if (checkNoOverlap(firstVpin, nPins,I2CAddress)) new PCA9685(firstVpin, nPins, I2CAddress);
 }

 // Configure a port on the PCA9685.
@@ -46,7 +47,7 @@ bool PCA9685::_configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, i
  if (configType != CONFIGURE_SERVO) return false;
  if (paramCount != 5) return false;
  #ifdef DIAG_IO
-  DIAG(F("PCA9685 Configure VPIN:%u Apos:%d Ipos:%d Profile:%d Duration:%d state:%d"), 
+  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]);
  #endif

@@ -72,14 +73,10 @@ bool PCA9685::_configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, i
 }

 // Constructor
-PCA9685::PCA9685(VPIN firstVpin, int nPins, I2CAddress i2cAddress, uint16_t frequency) {
+PCA9685::PCA9685(VPIN firstVpin, int nPins, uint8_t I2CAddress) {
  _firstVpin = firstVpin;
-    _nPins = (nPins > 16) ? 16 : nPins;
-  _I2CAddress = i2cAddress;
-  // Calculate prescaler value for PWM clock
-  if (frequency > 1526) frequency = 1526;
-  else if (frequency < 24) frequency = 24;
-  prescaler = FREQUENCY_OSCILLATOR / 4096 / frequency;
+  _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++)
@@ -101,7 +98,7 @@ void PCA9685::_begin() {
  // Initialise I/O module here.
  if (I2CManager.exists(_I2CAddress)) {
    writeRegister(_I2CAddress, PCA9685_MODE1, MODE1_SLEEP | MODE1_AI);    
-    writeRegister(_I2CAddress, PCA9685_PRESCALE, prescaler);
+    writeRegister(_I2CAddress, PCA9685_PRESCALE, PRESCALE_50HZ);   // 50Hz clock, 20ms pulse period.
    writeRegister(_I2CAddress, PCA9685_MODE1, MODE1_AI);
    writeRegister(_I2CAddress, PCA9685_MODE1, MODE1_RESTART | MODE1_AI);
    // In theory, we should wait 500us before sending any other commands to each device, to allow
@@ -118,7 +115,7 @@ void PCA9685::_begin() {
 // For this function, the configured profile is used.
 void PCA9685::_write(VPIN vpin, int value) {
  #ifdef DIAG_IO
-  DIAG(F("PCA9685 Write VPIN:%u Value:%d"), vpin, value);
+  DIAG(F("PCA9685 Write Vpin:%d Value:%d"), vpin, value);
  #endif
  int pin = vpin - _firstVpin;
  if (value) value = 1;
@@ -145,7 +142,7 @@ void PCA9685::_write(VPIN vpin, int value) {
 //            
 void PCA9685::_writeAnalogue(VPIN vpin, int value, uint8_t profile, uint16_t duration) {
  #ifdef DIAG_IO
-  DIAG(F("PCA9685 WriteAnalogue VPIN:%u Value:%d Profile:%d Duration:%d %S"), 
+  DIAG(F("PCA9685 WriteAnalogue Vpin:%d Value:%d Profile:%d Duration:%d %S"), 
    vpin, value, profile, duration, _deviceState == DEVSTATE_FAILED?F("DEVSTATE_FAILED"):F(""));
  #endif
  if (_deviceState == DEVSTATE_FAILED) return;
@@ -242,13 +239,13 @@ void PCA9685::updatePosition(uint8_t pin) {
 // between 0 and 4095 for the PWM mark-to-period ratio, with 4095 being 100%.
 void PCA9685::writeDevice(uint8_t pin, int value) {
  #ifdef DIAG_IO
-  DIAG(F("PCA9685 I2C:%s WriteDevice Pin:%d Value:%d"), _I2CAddress.toString(), pin, 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:%s failed %S"), _I2CAddress.toString(), I2CManager.getErrorMessage(status));
+    DIAG(F("PCA9685 I2C:x%x failed %S"), _I2CAddress, I2CManager.getErrorMessage(status));
  } else {
    // Set up new request.
    outputBuffer[0] = PCA9685_FIRST_SERVO + 4 * pin;
@@ -262,7 +259,7 @@ void PCA9685::writeDevice(uint8_t pin, int value) {

 // Display details of this device.
 void PCA9685::_display() {
-  DIAG(F("PCA9685 I2C:%s Configured on Vpins:%u-%u %S"), _I2CAddress.toString(), (int)_firstVpin, 
+  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(""));
 }

@@ -275,5 +272,5 @@ static void writeRegister(byte address, byte reg, byte value) {
 // The profile below is in the range 0-100% and should be combined with the desired limits
 // of the servo set by _activePosition and _inactivePosition.  The profile is symmetrical here,
 // i.e. the bounce is the same on the down action as on the up action.  First entry isn't used.
-const uint8_t FLASH PCA9685::_bounceProfile[30] = 
+const byte FLASH PCA9685::_bounceProfile[30] = 
    {0,2,3,7,13,33,50,83,100,83,75,70,65,60,60,65,74,84,100,83,75,70,70,72,75,80,87,92,97,100};
--- a/IO_PCA9685pwm.h
+++ b/IO_PCA9685pwm.h
@@ -1,170 +0,0 @@
-/*
- *  © 2023, 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/>.
- */
-
-/* 
- * This driver performs the basic interface between the HAL and an 
- * I2C-connected PCA9685 16-channel PWM module.  When requested, it 
- * commands the device to set the PWM mark-to-period ratio accordingly.
- * The call to IODevice::writeAnalogue(vpin, value) specifies the
- * desired value in the range 0-4095 (0=0% and 4095=100%).
- * 
- * This driver can be used for simple servo control by writing values between
- * about 102 and 450 (extremes of movement for 9g micro servos) or 150 to 250
- * for a more restricted range (corresponding to 1.5ms to 2.5ms pulse length).
- * A value of zero will switch off the servo.  To create the device, use
- * the following syntax:
- * 
- * PCA9685_basic::create(vpin, npins, i2caddress);
- * 
- * For LED control, a value of 0 is fully off, and 4095 is fully on.  It is
- * recommended, to reduce flicker of LEDs, that the frequency be configured
- * to a value higher than the default of 50Hz.  To do this, create the device
- * as follows, for a frequency of 200Hz.:
- * 
- * PCA9685_basic::create(vpin, npins, i2caddress, 200);
- * 
- */
-
-#ifndef PCA9685_BASIC_H
-#define PCA9685_BASIC_H
-
-#include "IODevice.h"
-#include "I2CManager.h"
-#include "DIAG.h"
-
-/*
- * IODevice subclass for PCA9685 16-channel PWM module.
- */
- 
-class PCA9685pwm : public IODevice {
-public:
-  // Create device driver instance.
-  static void create(VPIN firstVpin, int nPins, I2CAddress i2cAddress, uint16_t frequency = 50) {
-    if (checkNoOverlap(firstVpin, nPins, i2cAddress)) new PCA9685pwm(firstVpin, nPins, i2cAddress, frequency);
-  }
-
-private:
-  
-  // structures for setting up non-blocking writes to PWM controller
-  I2CRB requestBlock;
-  uint8_t outputBuffer[5];
-  uint16_t prescaler;
-
-  // REGISTER ADDRESSES
-  const uint8_t PCA9685_MODE1=0x00;      // Mode Register 
-  const uint8_t PCA9685_FIRST_SERVO=0x06;  /** low uint8_t first PWM register ON*/
-  const uint8_t PCA9685_PRESCALE=0xFE;     /** Prescale register for PWM output frequency */
-  // MODE1 bits
-  const uint8_t MODE1_SLEEP=0x10;   /**< Low power mode. Oscillator off */
-  const uint8_t MODE1_AI=0x20;      /**< Auto-Increment enabled */
-  const uint8_t MODE1_RESTART=0x80; /**< Restart enabled */
-
-  const uint32_t FREQUENCY_OSCILLATOR=25000000; /** Accurate enough for our purposes  */
-  const uint8_t PRESCALE_50HZ = (uint8_t)(((FREQUENCY_OSCILLATOR / (50.0 * 4096.0)) + 0.5) - 1);
-  const uint32_t MAX_I2C_SPEED = 1000000L; // PCA9685 rated up to 1MHz I2C clock speed
-
-  // Constructor
-  PCA9685pwm(VPIN firstVpin, int nPins, I2CAddress i2cAddress, uint16_t frequency) {
-    _firstVpin = firstVpin;
-    _nPins = (nPins>16) ? 16 : nPins;
-    _I2CAddress = i2cAddress;
-    if (frequency > 1526) frequency = 1526;
-    else if (frequency < 24) frequency = 24;
-    prescaler = FREQUENCY_OSCILLATOR / 4096 / frequency;
-    addDevice(this);
-
-    // Initialise structure used for setting pulse rate
-    requestBlock.setWriteParams(_I2CAddress, outputBuffer, sizeof(outputBuffer));
-  }
-
-  // Device-specific initialisation
-  void _begin() override {
-    I2CManager.begin();
-    I2CManager.setClock(1000000); // Nominally able to run up to 1MHz on I2C
-            // In reality, other devices including the Arduino will limit 
-            // the clock speed to a lower rate.
-
-    // Initialise I/O module here.
-    if (I2CManager.exists(_I2CAddress)) {
-      writeRegister(_I2CAddress, PCA9685_MODE1, MODE1_SLEEP | MODE1_AI);
-      writeRegister(_I2CAddress, PCA9685_PRESCALE, prescaler);
-      writeRegister(_I2CAddress, PCA9685_MODE1, MODE1_AI);
-      writeRegister(_I2CAddress, PCA9685_MODE1, MODE1_RESTART | MODE1_AI);
-      // 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 writeAnalogue function, invoked from IODevice::writeAnalogue().
-  //            
-  void _writeAnalogue(VPIN vpin, int value, uint8_t param1, uint16_t param2) override {
-    (void)param1; (void)param2;  // suppress compiler warning
-    #ifdef DIAG_IO
-    DIAG(F("PCA9685pwm WriteAnalogue VPIN:%u Value:%d %S"), 
-      vpin, value, _deviceState == DEVSTATE_FAILED?F("DEVSTATE_FAILED"):F(""));
-    #endif
-    if (_deviceState == DEVSTATE_FAILED) return;
-    int pin = vpin - _firstVpin;
-    if (value > 4095) value = 4095;
-    else if (value < 0) value = 0;
-
-    writeDevice(pin, value);
-  }
-
-  // Display details of this device.
-  void _display() override {
-    DIAG(F("PCA9685pwm I2C:%s Configured on Vpins:%u-%u %S"), _I2CAddress.toString(), (int)_firstVpin, 
-      (int)_firstVpin+_nPins-1, (_deviceState==DEVSTATE_FAILED) ? F("OFFLINE") : F(""));
-  }
-
-  // writeDevice (helper function) takes a pin in range 0 to _nPins-1 within the device, and a value
-  // between 0 and 4095 for the PWM mark-to-period ratio, with 4095 being 100%.
-  void writeDevice(uint8_t pin, int value) {
-    #ifdef DIAG_IO
-    DIAG(F("PCA9685pwm I2C:%s WriteDevice Pin:%d Value:%d"), _I2CAddress.toString(), pin, value);
-    #endif
-    // Wait for previous request to complete
-    uint8_t status = requestBlock.wait();
-    if (status != I2C_STATUS_OK) {
-      _deviceState = DEVSTATE_FAILED;
-      DIAG(F("PCA9685pwm I2C:%s failed %S"), _I2CAddress.toString(), 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);
-    }
-  }
-
-  // Internal helper function for this device
-  static void writeRegister(I2CAddress address, uint8_t reg, uint8_t value) {
-    I2CManager.write(address, 2, reg, value);
-  }
-
-};
-
-#endif
--- a/IO_PCF8574.h
+++ b/IO_PCF8574.h
@@ -43,22 +43,20 @@

 class PCF8574 : public GPIOBase<uint8_t> {
 public:
-  static void create(VPIN firstVpin, uint8_t nPins, I2CAddress i2cAddress, int interruptPin=-1) {
-    if (checkNoOverlap(firstVpin, nPins, i2cAddress)) new PCF8574(firstVpin, nPins, i2cAddress, interruptPin);
+  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);
  }

 private:
-  PCF8574(VPIN firstVpin, uint8_t nPins, I2CAddress i2cAddress, int interruptPin=-1)
-    : GPIOBase<uint8_t>((FSH *)F("PCF8574"), firstVpin, nPins, i2cAddress, interruptPin) 
+  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) 
  {
    requestBlock.setReadParams(_I2CAddress, inputBuffer, 1);
  }
  
-  // The PCF8574 handles inputs by applying a weak pull-up when output is driven to '1'.
-  // The pin state is driven '1' if the pin is an input, or if it is an output set to 1.
-  // Unused pins are driven '0'.
+  // 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) & _portInUse);
+    I2CManager.write(_I2CAddress, 1, _portOutputState | ~_portMode);
  }

  // The PCF8574 handles inputs by applying a weak pull-up when output is driven to '1'.
@@ -66,8 +64,9 @@ private:
  // and enable pull-up.
  void _writePullups() override { }

+  // The pin state is '1' if the pin is an input or if it is an output set to 1.  Zero otherwise. 
  void _writePortModes() override {
-    _writeGpioPort();
+    I2CManager.write(_I2CAddress, 1, _portOutputState | ~_portMode);
  }

  // In immediate mode, _readGpioPort reads the device GPIO port and updates _portInputState accordingly.
@@ -77,7 +76,7 @@ private:
    if (immediate) {
      uint8_t buffer[1];
      I2CManager.read(_I2CAddress, buffer, 1);
-      _portInputState = buffer[0] | _portMode;
+      _portInputState = buffer[0];
    } else {
      requestBlock.wait(); // Wait for preceding operation to complete
      // Issue new request to read GPIO register
@@ -88,7 +87,7 @@ 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] | _portMode;
+      _portInputState = inputBuffer[0];
    else  
      _portInputState = 0xff; 
  }
--- a/IO_PCF8575.h
+++ b/IO_PCF8575.h
@@ -1,109 +0,0 @@
-/*
- *  © 2023, Paul Antoine, and Discord user @ADUBOURG
- *  © 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 PCF8575 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_PCF8575_H
-#define IO_PCF8575_H
-
-#include "IO_GPIOBase.h"
-#include "FSH.h"
-
-class PCF8575 : public GPIOBase<uint16_t> {
-public:
-  static void create(VPIN firstVpin, uint8_t nPins, I2CAddress i2cAddress, int interruptPin=-1) {
-    if (checkNoOverlap(firstVpin, nPins, i2cAddress)) new PCF8575(firstVpin, nPins, i2cAddress, interruptPin);
-  }
-
-private:
-  PCF8575(VPIN firstVpin, uint8_t nPins, I2CAddress i2cAddress, int interruptPin=-1)
-    : GPIOBase<uint16_t>((FSH *)F("PCF8575"), firstVpin, nPins, i2cAddress, interruptPin)
-  {
-    requestBlock.setReadParams(_I2CAddress, inputBuffer, sizeof(inputBuffer));
-  }
-  
-  // The PCF8575 handles inputs by applying a weak pull-up when output is driven to '1'.
-  // The pin state is driven '1' if the pin is an input, or if it is an output set to 1.
-  // Unused pins are driven '0'.
-  void _writeGpioPort() override {
-    uint16_t bits = (_portOutputState | ~_portMode) & _portInUse;
-    I2CManager.write(_I2CAddress, 2, bits, bits>>8);
-  }
-
-  // The PCF8575 handles inputs by applying a weak pull-up when output is driven to '1'.
-  // Therefore, writing '1' in _writePortModes is enough to set the module to input mode 
-  // and enable pull-up.
-  void _writePullups() override { }
-
-  // The pin state is '1' if the pin is an input or if it is an output set to 1.  Zero otherwise. 
-  void _writePortModes() override {
-    _writeGpioPort();
-  }
-
-  // In immediate mode, _readGpioPort reads the device GPIO port and updates _portInputState accordingly.
-  //  When not in immediate mode, it initiates a request using the request block and returns.
-  //  When the request completes, _processCompletion finishes the operation.
-  void _readGpioPort(bool immediate) override {
-    if (immediate) {
-      uint8_t buffer[2];
-      I2CManager.read(_I2CAddress, buffer, 2);
-      _portInputState = (((uint16_t)buffer[1]<<8) | buffer[0]) | _portMode;
-    } else {
-      requestBlock.wait(); // Wait for preceding operation to complete
-      // Issue new request to read GPIO register
-      I2CManager.queueRequest(&requestBlock);
-    }
-  }
-
-  // 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 = (((uint16_t)inputBuffer[1]<<8) | inputBuffer[0]) | _portMode;
-    else  
-      _portInputState = 0xffff;
-  }
-
-  // Set up device ports
-  void _setupDevice() override { 
-    _writePortModes();
-    _writeGpioPort();
-    _writePullups();
-  }
- 
-  uint8_t inputBuffer[2];
-};
-
-#endif
--- a/IO_RotaryEncoder.h
+++ b/IO_RotaryEncoder.h
@@ -1,5 +1,4 @@
 /*
- *  © 2023, Peter Cole. All rights reserved.
 *  © 2022, Peter Cole. All rights reserved.
 *
 *  This file is part of EX-CommandStation
@@ -29,23 +28,9 @@
 * ONCHANGE(vpin) - flag when the rotary encoder position has changed from the previous position
 * IFRE(vpin, position) - test to see if specified rotary encoder position has been received
 *
-* Feedback can also be sent to the rotary encoder by using 2 Vpins, and sending a SET()/RESET() to the second Vpin.
+* Further to this, feedback can be sent to the rotary encoder by using 2 Vpins, and sending a SET()/RESET() to the second Vpin.
 * A SET(vpin) will flag that a turntable (or anything else) is in motion, and a RESET(vpin) that the motion has finished.
 *
-* In addition, defining a third Vpin will allow a position number to be sent so that when an EXRAIL automation or some other
-* activity has moved a turntable, the position can be reflected in the rotary encoder software. This can be accomplished
-* using the EXRAIL SERVO(vpin, position, profile) command, where:
-* - vpin = the third defined Vpin (any other is ignored)
-* - position = the defined position in the DCC-EX Rotary Encoder software, 0 (Home) to 255
-* - profile = Must be defined as per the SERVO() command, but is ignored as it has no relevance
-*
-* Defining in myAutomation.h requires the device driver to be included in addition to the HAL() statement. Examples:
-*
-* #include "IO_RotaryEncoder.h"
-* HAL(RotaryEncoder, 700, 1, 0x70)    // Define single Vpin, no feedback or position sent to rotary encoder software
-* HAL(RotaryEncoder, 700, 2, 0x70)    // Define two Vpins, feedback only sent to rotary encoder software
-* HAL(RotaryEncoder, 700, 3, 0x70)    // Define three Vpins, can send feedback and position update to rotary encoder software
-*
 * Refer to the documentation for further information including the valid activities and examples.
 */

@@ -59,132 +44,82 @@

 class RotaryEncoder : public IODevice {
 public:
-  
-  static void create(VPIN firstVpin, int nPins, I2CAddress i2cAddress) {
-    if (checkNoOverlap(firstVpin, nPins, i2cAddress)) new RotaryEncoder(firstVpin, nPins, i2cAddress);
+  // Constructor
+  RotaryEncoder(VPIN firstVpin, int nPins, uint8_t I2CAddress){
+    _firstVpin = firstVpin;
+    _nPins = nPins;
+    _I2CAddress = I2CAddress;
+    addDevice(this);
+  }
+  static void create(VPIN firstVpin, int nPins, uint8_t I2CAddress) {
+    if (checkNoOverlap(firstVpin, nPins, I2CAddress)) new RotaryEncoder(firstVpin, nPins, I2CAddress);
  }

 private:
-  // Constructor
-  RotaryEncoder(VPIN firstVpin, int nPins, I2CAddress i2cAddress){
-    _firstVpin = firstVpin;
-    _nPins = nPins;
-    if (_nPins > 3) {
-      _nPins = 3;
-      DIAG(F("RotaryEncoder WARNING:%d vpins defined, only 3 supported"), _nPins);
-    }
-    _I2CAddress = i2cAddress;
-    addDevice(this);
-  }
-
  // Initiate the device
  void _begin() {
-    uint8_t _status;
-    // Attempt to initilalise device
    I2CManager.begin();
    if (I2CManager.exists(_I2CAddress)) {
-      // Send RE_RDY, must receive RE_RDY to be online
-      _sendBuffer[0] = RE_RDY;
-      _status = I2CManager.read(_I2CAddress, _rcvBuffer, 1, _sendBuffer, 1);
-      if (_status == I2C_STATUS_OK) {
-        if (_rcvBuffer[0] == RE_RDY) {
-          _sendBuffer[0] = RE_VER;
-          if (I2CManager.read(_I2CAddress, _versionBuffer, 3, _sendBuffer, 1) == I2C_STATUS_OK) {
-            _majorVer = _versionBuffer[0];
-            _minorVer = _versionBuffer[1];
-            _patchVer = _versionBuffer[2];
-          }
-        } else {
-          DIAG(F("RotaryEncoder I2C:%s garbage received: %d"), _I2CAddress.toString(), _rcvBuffer[0]);
-          _deviceState = DEVSTATE_FAILED;
-          return;
-        }
-      } else {
-        DIAG(F("RotaryEncoder I2C:%s ERROR connecting"), _I2CAddress.toString());
-        _deviceState = DEVSTATE_FAILED;
-        return;
-      }
+      byte _getVersion[1] = {RE_VER};
+      I2CManager.read(_I2CAddress, _versionBuffer, 3, _getVersion, 1);
+      _majorVer = _versionBuffer[0];
+      _minorVer = _versionBuffer[1];
+      _patchVer = _versionBuffer[2];
+      _buffer[0] = RE_OP;
+      I2CManager.write(_I2CAddress, _buffer, 1);
 #ifdef DIAG_IO
      _display();
 #endif
    } else {
-      DIAG(F("RotaryEncoder I2C:%s device not found"), _I2CAddress.toString());
-      _deviceState = DEVSTATE_FAILED;
+        _deviceState = DEVSTATE_FAILED;
    }
  }

  void _loop(unsigned long currentMicros) override {
-    if (_deviceState == DEVSTATE_FAILED) return;  // Return if device has failed
-    if (_i2crb.isBusy()) return;                  // Return if I2C operation still in progress
-
-    if (currentMicros - _lastPositionRead > _positionRefresh) {
-      _lastPositionRead = currentMicros;
-      _sendBuffer[0] = RE_READ;
-      I2CManager.read(_I2CAddress, _rcvBuffer, 1, _sendBuffer, 1, &_i2crb); // Read position from encoder
-      _position = _rcvBuffer[0];
-      // If EXRAIL is active, we need to trigger the ONCHANGE() event handler if it's in use
-#if defined(EXRAIL_ACTIVE)
+    I2CManager.read(_I2CAddress, _buffer, 1);
+    _position = _buffer[0];
+    // This here needs to have a change check, ie. position is a different value.
+  #if defined(EXRAIL_ACTIVE)
      if (_position != _previousPosition) {
        _previousPosition = _position;
-        RMFT2::changeEvent(_firstVpin, 1);
+        RMFT2::changeEvent(_firstVpin,1);
      } else {
-        RMFT2::changeEvent(_firstVpin, 0);
+        RMFT2::changeEvent(_firstVpin,0);
      }
-#endif
-    }
+  #endif
+    delayUntil(currentMicros + 100000);
  }

-  // Return the position sent by the rotary encoder software
+  // Device specific read function
  int _readAnalogue(VPIN vpin) override {
    if (_deviceState == DEVSTATE_FAILED) return 0;
    return _position;
  }

-  // Send the feedback value to the rotary encoder software
  void _write(VPIN vpin, int value) override {
    if (vpin == _firstVpin + 1) {
-      if (value != 0) value = 0x01;
-      byte _feedbackBuffer[2] = {RE_OP, (byte)value};
+      byte _feedbackBuffer[2] = {RE_OP, value};
      I2CManager.write(_I2CAddress, _feedbackBuffer, 2);
    }
  }
-
-  // Send a position update to the rotary encoder software
-  // To be valid, must be 0 to 255, and different to the current position
-  // If the current position is the same, it was initiated by the rotary encoder
-  void _writeAnalogue(VPIN vpin, int position, uint8_t profile, uint16_t duration) override {
-    if (vpin == _firstVpin + 2) {
-      if (position >= 0 && position <= 255 && position != _position) {
-        byte newPosition = position & 0xFF;
-        byte _positionBuffer[2] = {RE_MOVE, newPosition};
-        I2CManager.write(_I2CAddress, _positionBuffer, 2);
-      }
-    }
-  }
  
  void _display() override {
-    DIAG(F("Rotary Encoder I2C:%s v%d.%d.%d Configured on VPIN:%u-%d %S"), _I2CAddress.toString(), _majorVer, _minorVer, _patchVer,
+    DIAG(F("Rotary Encoder I2C:x%x v%d.%d.%d Configured on Vpin:%d-%d %S"), _I2CAddress, _majorVer, _minorVer, _patchVer,
      (int)_firstVpin, _firstVpin+_nPins-1, (_deviceState==DEVSTATE_FAILED) ? F("OFFLINE") : F(""));
  }

+  uint8_t _I2CAddress;
  int8_t _position;
  int8_t _previousPosition = 0;
  uint8_t _versionBuffer[3];
-  uint8_t _sendBuffer[1];
-  uint8_t _rcvBuffer[1];
+  uint8_t _buffer[1];
  uint8_t _majorVer = 0;
  uint8_t _minorVer = 0;
  uint8_t _patchVer = 0;
-  I2CRB _i2crb;
-  unsigned long _lastPositionRead = 0;
-  const unsigned long _positionRefresh = 100000UL;    // Delay refreshing position for 100ms

  enum {
-    RE_RDY = 0xA0,   // Flag to check if encoder is ready for operation
-    RE_VER = 0xA1,   // Flag to retrieve rotary encoder software version
-    RE_READ = 0xA2,  // Flag to read the current position of the encoder
-    RE_OP = 0xA3,    // Flag for operation start/end, sent to when sending feedback on move start/end
-    RE_MOVE = 0xA4,  // Flag for sending a position update from the device driver to the encoder
+    RE_VER = 0xA0,   // Flag to retrieve rotary encoder version from the device
+    RE_OP = 0xA1,    // Flag for normal operation
  };

 };
--- a/IO_Servo.cpp
+++ b/IO_Servo.cpp
@@ -1,33 +0,0 @@
-/*
- *  © 2023, 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/>.
- */
-
-#include "IO_Servo.h"
-#include "FSH.h"
-
-// Profile for a bouncing signal or turnout
-// The profile below is in the range 0-100% and should be combined with the desired limits
-// of the servo set by _activePosition and _inactivePosition.  The profile is symmetrical here,
-// i.e. the bounce is the same on the down action as on the up action.  First entry isn't used.
-//
-// Note: This has been put into its own .CPP file to ensure that duplicates aren't created
-// if the IO_Servo.h library is #include'd in multiple source files.
-//
-const uint8_t FLASH Servo::_bounceProfile[30] = 
-    {0,2,3,7,13,33,50,83,100,83,75,70,65,60,60,65,74,84,100,83,75,70,70,72,75,80,87,92,97,100};
-
--- a/IO_Servo.h
+++ b/IO_Servo.h
@@ -1,298 +0,0 @@
-/*
- *  © 2023, 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/>.
- */
-
-/*
- * This device is a layered device which is designed to sit on top of another
- * device.  The underlying device class is expected to accept writeAnalogue calls 
- * which will normally cause some physical movement of something.  The device may be a servo, 
- * a motor or some other kind of positioner, and the something might be a turnout,
- * a semaphore signal or something else.  One user has used this capability for
- * moving a figure along the platform on their layout!
- * 
- * Example of use:
- *    In myHal.cpp, 
- * 
- * #include "IO_Servo.h"
- * ...
- * PCA9685::create(100,16,0x40);   // First create the hardware interface device
- * Servo::create(300,16,100);    // Then create the higher level device which 
- *                               // references pins 100-115 or a subset of them.
- * 
- * Then any reference to pins 300-315 will cause the servo driver to send output
- * PWM commands to the corresponding PCA9685 driver pins 100-115.  The PCA9685 driver may
- * be substituted with any other driver which provides analogue output 
- * capability, e.g. EX-IOExpander devices, as long as they are capable of interpreting 
- * the writeAnalogue() function calls.
- */
-
-#include "IODevice.h"
-
-#ifndef IO_SERVO_H
-#define IO_SERVO_H
-
-#include "I2CManager.h"
-#include "DIAG.h"
-
-class Servo : IODevice {
-
-public: 
-  enum ProfileType : uint8_t {
-    Instant = 0,  // Moves immediately between positions (if duration not specified)
-    UseDuration = 0, // Use specified duration
-    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.
-  };
-
-  // Create device driver instance.
-  static void create(VPIN firstVpin, int nPins, VPIN firstSlavePin=VPIN_NONE) {
-    new Servo(firstVpin, nPins, firstSlavePin);
-  }
-
-private:
-  VPIN _firstSlavePin;
-  IODevice *_slaveDevice = NULL;
-
-  struct ServoData {
-    uint16_t activePosition : 12; // Config parameter
-    uint16_t inactivePosition : 12; // Config parameter
-    uint16_t currentPosition : 12;
-    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
-  
-  struct ServoData *_servoData [16];
-
-  static const uint8_t _catchupSteps = 5; // number of steps to wait before switching servo off
-  static const uint8_t FLASH _bounceProfile[30];
-
-  const unsigned int refreshInterval = 50; // refresh every 50ms
-
-
-  // Configure a port on the Servo.
-  bool _configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, int params[]) {
-    if (_deviceState == DEVSTATE_FAILED) return false;
-    if (configType != CONFIGURE_SERVO) return false;
-    if (paramCount != 5) return false;
-    #ifdef DIAG_IO
-    DIAG(F("Servo: Configure VPIN:%u Apos:%d Ipos:%d Profile:%d Duration:%d state:%d"), 
-      vpin, params[0], params[1], params[2], params[3], params[4]);
-    #endif
-
-    int8_t pin = vpin - _firstVpin;
-    struct ServoData *s = _servoData[pin];
-    if (s == NULL) { 
-      _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->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);
-    } 
-    return true;
-  }
-
-  // Constructor
-  Servo(VPIN firstVpin, int nPins, VPIN firstSlavePin = VPIN_NONE) {
-    _firstVpin = firstVpin;
-    _nPins = (nPins > 16) ? 16 : nPins;
-    if (firstSlavePin == VPIN_NONE)
-      _firstSlavePin = firstVpin;
-    else
-      _firstSlavePin = firstSlavePin;
-
-    // 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;
-
-    // Get reference to slave device.
-    _slaveDevice = findDevice(_firstSlavePin);
-    if (!_slaveDevice) {
-      DIAG(F("Servo: Slave device not found on Vpins %u-%u"), 
-        _firstSlavePin, _firstSlavePin+_nPins-1);
-      _deviceState = DEVSTATE_FAILED;
-    }      
-    if (_slaveDevice != findDevice(_firstSlavePin+_nPins-1)) {
-      DIAG(F("Servo: Slave device does not cover all Vpins %u-%u"), 
-        _firstSlavePin, _firstSlavePin+_nPins-1);
-      _deviceState = DEVSTATE_FAILED;
-    }
-
-    addDevice(this, _slaveDevice); // Link device ahead of slave device to intercept requests
-  }
-
-  // Device-specific initialisation
-  void _begin() override {
-    #if defined(DIAG_IO)
-    _display();
-    #endif
-  }
-
-  // Device-specific write function, invoked from IODevice::write().  
-  // For this function, the configured profile is used.
-  void _write(VPIN vpin, int value) override {
-    if (_deviceState == DEVSTATE_FAILED) return;
-    #ifdef DIAG_IO
-    DIAG(F("Servo Write VPIN:%u Value:%d"), vpin, value);
-    #endif
-    int pin = vpin - _firstVpin;
-    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);     
-    }
-  }
-
-  // Device-specific writeAnalogue function, invoked from IODevice::writeAnalogue().
-  // Profile is as follows:
-  //  Bit 7:     0=Set output to 0% to power off servo motor when finished
-  //             1=Keep output at final position (better with LEDs, which will stay lit)
-  //  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.
-  // Duration is in deciseconds (tenths of a second) and defaults to 0.  
-  //            
-  void _writeAnalogue(VPIN vpin, int value, uint8_t profile, uint16_t duration) override {
-    #ifdef DIAG_IO
-    DIAG(F("Servo: WriteAnalogue VPIN:%u Value:%d Profile:%d Duration:%d %S"), 
-      vpin, value, profile, duration, _deviceState == DEVSTATE_FAILED?F("DEVSTATE_FAILED"):F(""));
-    #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)
-    }
-
-    // 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->stepNumber = 0;
-    s->toPosition = value;
-    s->fromPosition = s->currentPosition;
-  }
-
-  // _read returns true if the device is currently in executing an animation, 
-  //  changing the output over a period of time.
-  int _read(VPIN vpin) override {
-    if (_deviceState == DEVSTATE_FAILED) return 0;
-    int pin = vpin - _firstVpin;
-    struct ServoData *s = _servoData[pin];
-    if (s == NULL) 
-      return false; // No structure means no animation!
-    else
-      return (s->stepNumber < s->numSteps);
-  }
-
-  void _loop(unsigned long currentMicros) override {
-    if (_deviceState == DEVSTATE_FAILED) return;
-    for (int pin=0; pin<_nPins; pin++) {
-      updatePosition(pin);
-    }
-    delayUntil(currentMicros + refreshInterval * 1000UL);
-  }
-
-  // Private function to reposition servo
-  // TODO: Could calculate step number from elapsed time, to allow for erratic loop timing.
-  void updatePosition(uint8_t pin) {
-    struct ServoData *s = _servoData[pin];
-    if (s == NULL) return; // No pin configuration/state data
-
-    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;
-    }
-
-    if (s->stepNumber < s->numSteps) {
-      // Animation in progress, reposition servo
-      s->stepNumber++;
-      if ((s->currentProfile & ~NoPowerOff) == Bounce) {
-        // Retrieve step positions from array in flash
-        uint8_t profileValue = GETFLASH(&_bounceProfile[s->stepNumber]);
-        s->currentPosition = map(profileValue, 0, 100, s->fromPosition, s->toPosition);
-      } else {
-        // All other profiles - calculate step by linear interpolation between from and to positions.
-        s->currentPosition = map(s->stepNumber, 0, s->numSteps, s->fromPosition, s->toPosition);
-      }
-      // Send servo command to output driver
-      _slaveDevice->_writeAnalogue(_firstSlavePin+pin, s->currentPosition);
-    } else if (s->stepNumber < s->numSteps + _catchupSteps) {
-      // 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) {
-  #ifdef IO_SWITCH_OFF_SERVO
-      if ((s->currentProfile & NoPowerOff) == 0) {
-        // Wait has finished, so switch off output driver to avoid servo buzz.
-        _slaveDevice->_writeAnalogue(_firstSlavePin+pin, 0);
-      }
-  #endif
-      s->numSteps = 0;  // Done now.
-    }
-  }
-
-  // Display details of this device.
-  void _display() override {
-    DIAG(F("Servo Configured on Vpins:%u-%u, slave pins:%d-%d %S"),
-      (int)_firstVpin, (int)_firstVpin+_nPins-1,
-      (int)_firstSlavePin, (int)_firstSlavePin+_nPins-1,
-      (_deviceState==DEVSTATE_FAILED) ? F("OFFLINE") : F(""));
-  }
-};
-
-#endif
--- a/IO_TouchKeypad.h
+++ b/IO_TouchKeypad.h
@@ -1,134 +0,0 @@
-/*
- *  © 2023, 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/>.
- */
-
-/* 
- * Driver for capacitative touch-pad based on the TTP229-B chip with serial 
- * (not I2C) output.  The touchpad has 16 separate pads in a 4x4 matrix, 
- * numbered 1-16.  The communications with the pad are via a clock signal sent
- * from the controller to the device, and a data signal sent back by the device.
- * The pins clockPin and dataPin must be local pins, not external (GPIO Expander)
- * pins.
- * 
- * To use, 
- *    TouchKeypad::create(firstVpin, 16, clockPin, dataPin);
- * 
- * NOTE: Most of these keypads ship with only 8 pads enabled.  To enable all
- * sixteen pads, locate the area of the board labelled P1 (four pairs of 
- * holes labelled 1 to 4 from the left); solder a jumper link between the pair 
- * labelled 3 (connected to pin TP2 on the chip).  When this link is connected,
- * the pins OUT1 to OUT8 are not used but all sixteen touch pads are operational.
- * 
- * TODO: Allow a list of datapins to be provided so that multiple keypads can
- * be read simultaneously by the one device driver and the one shared clock signal.
- * As it stands, we can configure multiple driver instances, one for each keypad, 
- * and it will work fine.  The clock will be driven to all devices but only one 
- * driver will be reading the responses from its corresponding device at a time.
- */
-
-#ifndef IO_TOUCHKEYPAD_H
-#define IO_TOUCHKEYPAD_H
-
-#include "IODevice.h"
-
-class TouchKeypad : public IODevice {
-private:
-  // Here we define the device-specific variables.  
-  uint16_t _inputStates = 0;
-  VPIN _clockPin;
-  VPIN _dataPin;
-
-public:
-  //  Static function to handle create calls.
-  static void create(VPIN firstVpin, int nPins, VPIN clockPin, VPIN dataPin) {
-    if (checkNoOverlap(firstVpin,nPins)) new TouchKeypad(firstVpin, nPins, clockPin, dataPin);
-  } 
-
-protected:
-  // Constructor. 
-  TouchKeypad(VPIN firstVpin, int nPins, VPIN clockPin, VPIN dataPin) {
-    _firstVpin = firstVpin;
-    _nPins = (nPins > 16) ? 16 : nPins;  // Maximum of 16 pads per device
-    _clockPin = clockPin;
-    _dataPin = dataPin;
-
-    addDevice(this);
-  }
-
-  // Device-specific initialisation
-  void _begin() override {
-#if defined(DIAG_IO)
-    _display();
-#endif
-    // Set clock pin as output, initially high, and data pin as input.  
-    // Enable pullup on the input so that the default (not connected) state is 
-    // 'keypad not pressed'.
-    ArduinoPins::fastWriteDigital(_clockPin, 1);
-    pinMode(_clockPin, OUTPUT);
-    pinMode(_dataPin, INPUT_PULLUP); // Force defined state when no connection
-  }
-  
-  // Device-specific read function.
-  int _read(VPIN vpin) {
-    if (vpin < _firstVpin || vpin >= _firstVpin + _nPins) return 0;
-
-    // Return a value for the specified vpin.
-    return _inputStates & (1<<(vpin-_firstVpin)) ? 1 : 0;
-  }
-
-  // Loop function to do background scanning of the keyboard.
-  // The TTP229 device requires clock pulses to be sent to it,
-  // and the data bits can be read on the rising edge of the clock.
-  // By default the clock and data are inverted (active-low).
-  // A gap of more  than 2ms is advised between successive read
-  // cycles, we wait for 100ms between reads of the keyboard as this
-  // provide a good enough response time.
-  // Maximum clock frequency is 512kHz, so put a 1us delay
-  // between clock transitions.
-  //
-  void _loop(unsigned long currentMicros) {
-
-    // Clock 16 bits from the device
-    uint16_t data = 0, maskBit = 0x01;
-    for (uint8_t pad=0; pad<16; pad++) {
-      ArduinoPins::fastWriteDigital(_clockPin, 0);
-      delayMicroseconds(1);
-      ArduinoPins::fastWriteDigital(_clockPin, 1);
-      data |= (ArduinoPins::fastReadDigital(_dataPin) ? 0 : maskBit);
-      maskBit <<= 1;
-      delayMicroseconds(1);
-    }
-    _inputStates = data;
-#ifdef DIAG_IO
-    static uint16_t lastData = 0;
-    if (data != lastData) DIAG(F("KeyPad: %x"), data);
-    lastData = data;
-#endif
-    delayUntil(currentMicros + 100000); // read every 100ms
-  }
-
-  // Display information about the device, and perhaps its current condition (e.g. active, disabled etc).
-  void _display() {
-    DIAG(F("TouchKeypad Configured on Vpins:%u-%u SCL=%d SDO=%d"), (int)_firstVpin, 
-      (int)_firstVpin+_nPins-1, _clockPin, _dataPin);
-  }
-
-
-};
-
-#endif // IO_TOUCHKEYPAD_H
--- a/IO_VL53L0X.h
+++ b/IO_VL53L0X.h
@@ -42,17 +42,14 @@
 * 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,
- * setting XSHUT to HIGH to turn that module on, then writing that module's desired I2C address.
+ * 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.  The process is described in ST Microelectronics application
- * note AN4846.
+ * using a distinct I2C address.
 * 
- * WARNING:  If the device's XSHUT pin is not connected, then it may be prone to noise, 
- * and the device may reset spontaneously or when handled and the device will stop responding
- * on its allocated address.  If you're not using XSHUT, then tie it to +5V via a resistor 
- * (should be tied to +2.8V strictly). Some manufacturers (Adafruit and Polulu for example)
- * include a pull-up on the module, but others don't.
+ * 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:
 * 
@@ -73,8 +70,7 @@
 *       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.  The digital output may be an Arduino pin or an
- *       I/O extender pin.
+ *       XSHUT terminal on the module.
 * 
 * Example:
 *   In mySetup function within mySetup.cpp:
@@ -97,6 +93,7 @@

 class VL53L0X : public IODevice {
 private: 
+  uint8_t _i2cAddress;
  uint16_t _ambient;
  uint16_t _distance;
  uint16_t _signal;
@@ -104,23 +101,20 @@ private:
  uint16_t _offThreshold;
  VPIN _xshutPin;
  bool _value;
-  uint8_t _nextState = STATE_INIT;
+  uint8_t _nextState = 0;
  I2CRB _rb;
  uint8_t _inBuffer[12];
  uint8_t _outBuffer[2];
-  static bool _addressConfigInProgress;
-
  // State machine states.
  enum : uint8_t {
-    STATE_INIT,
-    STATE_RESTARTMODULE,
-    STATE_CONFIGUREADDRESS,
-    STATE_CONFIGUREDEVICE,
-    STATE_INITIATESCAN,
-    STATE_CHECKSTATUS,
-    STATE_GETRESULTS,
-    STATE_DECODERESULTS,
-    STATE_FAILED,
+    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
@@ -135,15 +129,15 @@ private:


  public:
-  static void create(VPIN firstVpin, int nPins, I2CAddress i2cAddress, uint16_t onThreshold, uint16_t offThreshold, VPIN xshutPin = VPIN_NONE) {
+  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, I2CAddress i2cAddress, uint16_t onThreshold, uint16_t offThreshold, VPIN xshutPin = VPIN_NONE) {
+  VL53L0X(VPIN firstVpin, int nPins, uint8_t i2cAddress, uint16_t onThreshold, uint16_t offThreshold, VPIN xshutPin = VPIN_NONE) {
    _firstVpin = firstVpin;
-    _nPins = (nPins > 3) ? 3 : nPins;
-    _I2CAddress = i2cAddress;
+    _nPins = min(nPins, 3);
+    _i2cAddress = i2cAddress;
    _onThreshold = onThreshold;
    _offThreshold = offThreshold;
    _xshutPin = xshutPin;
@@ -151,108 +145,81 @@ protected:
    addDevice(this);
  }
  void _begin() override {
-    // If there's only one device, then the XSHUT pin need not be connected.  However, 
-    //  the device will not respond on its default address if it has 
-    //  already been changed.  Therefore, we skip the address configuration if the 
-    //  desired address is already responding on the I2C bus.
-    _nextState = STATE_INIT;
-    _addressConfigInProgress = false;
+    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:
-        if (I2CManager.exists(_I2CAddress)) {
-          // Device already present on the nominated address, so skip the address initialisation.
-          _nextState = STATE_CONFIGUREDEVICE;
-        } else {
-          // On first entry to loop, reset this module by pulling XSHUT low.  Each module
-          // will be addressed in turn, until all are in the reset state.
-          // If no XSHUT pin is configured, then only one device is supported.
-          if (_xshutPin != VPIN_NONE) IODevice::write(_xshutPin, 0);
-          _nextState = STATE_RESTARTMODULE;
-          delayUntil(currentMicros+10000);
-        }
-        break;
-      case STATE_RESTARTMODULE:
-        // On second entry, set XSHUT pin high to allow this module to restart.
-        // I've observed that the device tends to randomly reset if the XSHUT 
-        // pin is set high from a 5V arduino, even through a pullup resistor.  
-        // Assume that there will be a pull-up on the XSHUT pin to +2.8V as
-        // recommended in the device datasheet.  Then we only need to
-        // turn our output pin high-impedence (by making it an input) and the
-        // on-board pullup will do its job.
-        // Ensure XSHUT is set for only one module at a time by using a
-        // shared flag accessible to all device instances.
-        if (!_addressConfigInProgress) {
-          _addressConfigInProgress = true;
-          // Configure XSHUT pin (if connected) to bring the module out of sleep mode.
-          if (_xshutPin != VPIN_NONE) IODevice::configureInput(_xshutPin, false);
-          // Allow the module time to restart
-          delayUntil(currentMicros+10000);
-          _nextState = STATE_CONFIGUREADDRESS;
-        }
+        // 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.
-        {
-          #if defined(I2C_EXTENDED_ADDRESS)
-          // Add subbus reference for desired address to the device default address.
-          I2CAddress defaultAddress = {_I2CAddress, VL53L0X_I2C_DEFAULT_ADDRESS};
-          status = I2CManager.write(defaultAddress, 2, VL53L0X_REG_I2C_SLAVE_DEVICE_ADDRESS, _I2CAddress.deviceAddress());
-          #else
-          status = I2CManager.write(VL53L0X_I2C_DEFAULT_ADDRESS, 2, VL53L0X_REG_I2C_SLAVE_DEVICE_ADDRESS, _I2CAddress);
-          #endif
-          if (status != I2C_STATUS_OK) {
-            reportError(status);
-          }
-        }
-        delayUntil(currentMicros+10000);
+        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:
-        // Allow next VL53L0X device to be configured
-        _addressConfigInProgress = false;
-        // Now check if device address has been set.
-        if (I2CManager.exists(_I2CAddress)) {
+        // On next entry, check if device address has been set.
+        if (I2CManager.exists(_i2cAddress)) {
          #ifdef DIAG_IO
          _display();
          #endif
          // Set 2.8V mode
-          status = write_reg(VL53L0X_CONFIG_PAD_SCL_SDA__EXTSUP_HV, 
+          write_reg(VL53L0X_CONFIG_PAD_SCL_SDA__EXTSUP_HV, 
            read_reg(VL53L0X_CONFIG_PAD_SCL_SDA__EXTSUP_HV) | 0x01);
-          if (status != I2C_STATUS_OK) {
-            reportError(status);
-          } else
-            _nextState = STATE_INITIATESCAN;
        } else {
-          DIAG(F("VL53L0X I2C:%s device not responding"), _I2CAddress.toString());
+          DIAG(F("VL53L0X I2C:x%x device not responding"), _i2cAddress);
          _deviceState = DEVSTATE_FAILED;
-          _nextState = STATE_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);
+        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) {
-          reportError(status);
+          DIAG(F("VL53L0X I2C:x%x Error:%d %S"), _i2cAddress, status, I2CManager.getErrorMessage(status));
+          _deviceState = DEVSTATE_FAILED;
+          _value = false;
        } else
-          _nextState = STATE_GETRESULTS;
+          _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);
+        I2CManager.read(_i2cAddress, _inBuffer, 12, _outBuffer, 1, &_rb);
+        _nextState = 3;
        delayUntil(currentMicros + 5000); // Allow 5ms to get data
        _nextState = STATE_DECODERESULTS;
        break;
@@ -273,28 +240,15 @@ protected:
            else if (_distance > _offThreshold) 
              _value = false;
          }
-          // Completed. Restart scan on next loop entry.
-          _nextState = STATE_INITIATESCAN;
-        } else {
-          reportError(status);
        }
-        break;
-      case STATE_FAILED:
-        // Do nothing.
-        delayUntil(currentMicros+1000000UL);
+        // Completed. Restart scan on next loop entry.
+        _nextState = STATE_INITIATESCAN;
        break;
      default:
        break;
    }
  }

-  // Function to report a failed I2C operation.
-  void reportError(uint8_t status) {
-    DIAG(F("VL53L0X I2C:%s Error:%d %S"), _I2CAddress.toString(), status, I2CManager.getErrorMessage(status));
-    _deviceState = DEVSTATE_FAILED;
-    _value = false;
-  }
-
  // 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;
@@ -319,8 +273,8 @@ protected:
  }

  void _display() override {
-    DIAG(F("VL53L0X I2C:%s Configured on Vpins:%u-%u On:%dmm Off:%dmm %S"),
-      _I2CAddress.toString(), _firstVpin, _firstVpin+_nPins-1, _onThreshold, _offThreshold,
+    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(""));
  }
  
@@ -334,15 +288,13 @@ private:
    uint8_t outBuffer[2];
    outBuffer[0] = reg;
    outBuffer[1] = data;
-    return I2CManager.write(_I2CAddress, outBuffer, 2);
+    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);
+    I2CManager.read(_i2cAddress, _inBuffer, 1, &reg, 1);
    return _inBuffer[0];
  }
 };

-bool VL53L0X::_addressConfigInProgress = false;
-
 #endif // IO_VL53L0X_h
--- a/IO_duinoNodes.h
+++ b/IO_duinoNodes.h
@@ -55,7 +55,6 @@ public:
    pinMode(_clockPin,OUTPUT);
    pinMode(_dataPin,_pinMap?INPUT_PULLUP:OUTPUT);
    _display();
-    if (!_pinMap) _loopOutput();
  }

 // loop called by HAL supervisor 
@@ -122,7 +121,7 @@ void _loopOutput()  {
  }

  void _display() override {
-      DIAG(F("IO_duinoNodes %SPUT Configured on Vpins:%u-%u shift=%d"), 
+      DIAG(F("IO_duinoNodes %SPUT Configured on VPins:%d-%d shift=%d"), 
      _pinMap?F("IN"):F("OUT"),
      (int)_firstVpin, 
      (int)_firstVpin+_nPins-1, _nShiftBytes*8);
--- a/LCDDisplay.cpp
+++ b/LCDDisplay.cpp
@@ -0,0 +1,167 @@
+/*
+ *  © 2021, Chris Harlow, 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/>.
+ */
+
+// CAUTION: the device dependent parts of this class are created in the .ini
+// using LCD_Implementation.h
+
+/* The strategy for drawing the screen is as follows.
+ *  1) There are up to eight rows of text to be displayed.
+ *  2) Blank rows of text are ignored.
+ *  3) If there are more non-blank rows than screen lines,
+ *     then all of the rows are displayed, with the rest of the
+ *     screen being blank.
+ *  4) If there are fewer non-blank rows than screen lines,
+ *     then a scrolling strategy is adopted so that, on each screen
+ *     refresh, a different subset of the rows is presented.
+ *  5) On each entry into loop2(), a single operation is sent to the 
+ *     screen; this may be a position command or a character for
+ *     display.  This spreads the onerous work of updating the screen
+ *     and ensures that other loop() functions in the application are
+ *     not held up significantly.  The exception to this is when 
+ *     the loop2() function is called with force=true, where 
+ *     a screen update is executed to completion.  This is normally
+ *     only done during start-up.
+ *  The scroll mode is selected by defining SCROLLMODE as 0, 1 or 2
+ *  in the config.h.
+ *  #define SCROLLMODE 0 is scroll continuous (fill screen if poss),
+ *  #define SCROLLMODE 1 is by page (alternate between pages),
+ *  #define SCROLLMODE 2 is by row (move up 1 row at a time).
+
+ */
+
+#include "LCDDisplay.h"
+
+void LCDDisplay::clear() {
+  clearNative();
+  for (byte row = 0; row < MAX_LCD_ROWS; row++) rowBuffer[row][0] = '\0';
+  topRow = -1;  // loop2 will fill from row 0
+}
+
+void LCDDisplay::setRow(byte line) {
+  hotRow = line;
+  hotCol = 0;
+}
+
+size_t LCDDisplay::write(uint8_t b) {
+  if (hotRow >= MAX_LCD_ROWS || hotCol >= MAX_LCD_COLS) return -1;
+  rowBuffer[hotRow][hotCol] = b;
+  hotCol++;
+  rowBuffer[hotRow][hotCol] = 0;
+  return 1;
+}
+
+void LCDDisplay::loop() {
+  if (!lcdDisplay) return;
+  lcdDisplay->loop2(false);
+}
+
+LCDDisplay *LCDDisplay::loop2(bool force) {
+  if (!lcdDisplay) return NULL;
+
+  // If output device is busy, don't do anything on this loop
+  //  This avoids blocking while waiting for the device to complete.
+  if (isBusy()) return NULL;  
+
+  unsigned long currentMillis = millis();
+
+  if (!force) {
+    // See if we're in the time between updates
+    if ((currentMillis - lastScrollTime) < LCD_SCROLL_TIME)
+      return NULL;
+  } else {
+    // force full screen update from the beginning.
+    rowFirst = -1;
+    rowNext = 0;
+    bufferPointer = 0;
+    done = false;
+    slot = 0;
+  }
+
+  do {
+    if (bufferPointer == 0) {
+      // Find a line of data to write to the screen.
+      if (rowFirst < 0) rowFirst = rowNext;
+      skipBlankRows();
+      if (!done) {
+        // Non-blank line found, so copy it.
+        for (uint8_t i = 0; i < sizeof(buffer); i++)
+          buffer[i] = rowBuffer[rowNext][i];
+      } else
+        buffer[0] = '\0';  // Empty line
+      setRowNative(slot);  // Set position for display
+      charIndex = 0;
+      bufferPointer = &buffer[0];
+
+    } else {
+
+      // Write next character, or a space to erase current position.
+      char ch = *bufferPointer;
+      if (ch) {
+        writeNative(ch);
+        bufferPointer++;
+      } else
+        writeNative(' ');
+
+      if (++charIndex >= MAX_LCD_COLS) {
+        // Screen slot completed, move to next slot on screen
+        slot++;
+        bufferPointer = 0;
+        if (!done) {
+          moveToNextRow();
+          skipBlankRows();
+        }
+      }
+
+      if (slot >= lcdRows) {
+        // Last slot finished, reset ready for next screen update.
+#if SCROLLMODE==2
+        if (!done) {
+          // On next refresh, restart one row on from previous start.
+          rowNext = rowFirst;
+          moveToNextRow();
+          skipBlankRows();
+        }
+#endif
+        done = false;
+        slot = 0;
+        rowFirst = -1;
+        lastScrollTime = currentMillis;
+        return NULL;
+      }
+    }
+  } while (force);
+
+  return NULL;
+}
+
+void LCDDisplay::moveToNextRow() {
+  rowNext = (rowNext + 1) % MAX_LCD_ROWS;
+#if SCROLLMODE == 1
+  // Finished if we've looped back to row 0
+  if (rowNext == 0) done = true;
+#else
+  // Finished if we're back to the first one shown
+  if (rowNext == rowFirst) done = true;
+#endif
+}
+
+void LCDDisplay::skipBlankRows() {
+  while (!done && rowBuffer[rowNext][0] == 0)
+    moveToNextRow();
+}
--- a/LCDDisplay.h
+++ b/LCDDisplay.h
@@ -16,15 +16,15 @@
 *  You should have received a copy of the GNU General Public License
 *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
 */
-#ifndef Display_h
-#define Display_h
+#ifndef LCDDisplay_h
+#define LCDDisplay_h
 #include <Arduino.h>
 #include "defines.h"
 #include "DisplayInterface.h"

 // Allow maximum message length to be overridden from config.h
-#if !defined(MAX_MSG_SIZE)
-#define MAX_MSG_SIZE 20 
+#if !defined(MAX_MSG_SIZE) 
+#define MAX_MSG_SIZE 20
 #endif

 // Set default scroll mode (overridable in config.h)
@@ -32,46 +32,50 @@
 #define SCROLLMODE 1
 #endif

-// This class is created in Display_Implementation.h
+// This class is created in LCDisplay_Implementation.h

-class Display : public DisplayInterface {
-public:
-  Display(DisplayDevice *deviceDriver);
-  static const int MAX_CHARACTER_ROWS = 8;
-  static const int MAX_CHARACTER_COLS = MAX_MSG_SIZE;
-  static const long DISPLAY_SCROLL_TIME = 3000;  // 3 seconds
+class LCDDisplay : public DisplayInterface {
+ public:
+  LCDDisplay() {};
+  static const int MAX_LCD_ROWS = 8;
+  static const int MAX_LCD_COLS = MAX_MSG_SIZE;
+  static const long LCD_SCROLL_TIME = 3000;  // 3 seconds

-private:
-  DisplayDevice *_deviceDriver;
+  // Internally handled functions
+  static void loop();
+  LCDDisplay* loop2(bool force) override;
+  void setRow(byte line) override;
+  void clear() override;
+
+  size_t write(uint8_t b) override;
+
+protected:
+  uint8_t lcdRows;
+  uint8_t lcdCols;
+
+ private:
+  void moveToNextRow();
+  void skipBlankRows();
+
+  // Relay functions to the live driver in the subclass
+  virtual void clearNative() = 0;
+  virtual void setRowNative(byte line) = 0;
+  virtual size_t writeNative(uint8_t b) = 0;
+  virtual bool isBusy() = 0;

  unsigned long lastScrollTime = 0;
-  uint8_t hotRow = 0;
-  uint8_t hotCol = 0;
-  uint8_t slot = 0;
-  uint8_t rowFirst = 0;
-  uint8_t rowCurrent = 0;
-  uint8_t charIndex = 0;
-  char buffer[MAX_CHARACTER_COLS + 1];
+  int8_t hotRow = 0;
+  int8_t hotCol = 0;
+  int8_t topRow = 0;
+  int8_t slot = 0;
+  int8_t rowFirst = -1;
+  int8_t rowNext = 0;
+  int8_t charIndex = 0;
+  char buffer[MAX_LCD_COLS + 1];
  char* bufferPointer = 0;
-  bool noMoreRowsToDisplay = false;
-  uint16_t numScreenRows;
-  uint16_t numScreenColumns = MAX_CHARACTER_COLS;
-
-  char rowBuffer[MAX_CHARACTER_ROWS][MAX_CHARACTER_COLS+1];
-
-public:
-  void begin() override;  
-  void _clear() override;
-  void _setRow(uint8_t line) override;
-  size_t _write(uint8_t b) override;
-  void _refresh() override;
-  void _displayLoop() override;
-  Display *loop2(bool force);
-  bool findNonBlankRow();
-  bool isCurrentRowBlank();
-  void moveToNextRow();
-  uint8_t countNonBlankRows();
+  bool done = false;

+  char rowBuffer[MAX_LCD_ROWS][MAX_LCD_COLS + 1];
 };

 #endif
--- a/Display_Implementation.h
+++ b/Display_Implementation.h
@@ -27,34 +27,27 @@

 #ifndef LCD_Implementation_h
 #define LCD_Implementation_h
-#include "DisplayInterface.h"
+#include "LCDDisplay.h"
 #include "SSD1306Ascii.h"
 #include "LiquidCrystal_I2C.h"
  

-// Implement the Display shim class as a singleton.
-// The DisplayInterface class implements a display handler with no code (null device);
-// The Display class sub-classes DisplayInterface to provide the common display code;
-// Then Display class talks to the specific device type classes:
+// Implement the LCDDisplay shim class as a singleton.
+// The DisplayInterface class implements a displayy handler with no code (null device);
+// The LCDDisplay class sub-classes DisplayInterface to provide the common display code;
+// Then LCDDisplay class is subclassed to the specific device type classes:
 //    SSD1306AsciiWire for I2C OLED driver with SSD1306 or SH1106 controllers;
 //    LiquidCrystal_I2C for I2C LCD driver for HD44780 with PCF8574 'backpack'.

 #if defined(OLED_DRIVER)
-  #define DISPLAY_START(xxx) { \
-    DisplayInterface *t = new Display(new SSD1306AsciiWire(OLED_DRIVER)); \
-    t->begin(); \
-    xxx; \
-    t->refresh(); \
-  } 
+  #define CONDITIONAL_LCD_START for (DisplayInterface * dummy=new SSD1306AsciiWire(OLED_DRIVER);dummy!=NULL; dummy=dummy->loop2(true))
  
 #elif defined(LCD_DRIVER)
-  #define DISPLAY_START(xxx) { \
-    DisplayInterface *t = new Display(new LiquidCrystal_I2C(LCD_DRIVER)); \
-    t->begin(); \
-    xxx;  \
-    t->refresh();}
-#else
-  #define DISPLAY_START(xxx) {}
+  #define CONDITIONAL_LCD_START for (DisplayInterface * dummy=new LiquidCrystal_I2C(LCD_DRIVER);dummy!=NULL; dummy=dummy->loop2(true))

+#else
+  // Create null display handler just in case someone calls lcdDisplay->something without checking if lcdDisplay is NULL!
+  #define CONDITIONAL_LCD_START { new DisplayInterface(); }
 #endif
+
 #endif // LCD_Implementation_h
--- a/LiquidCrystal_I2C.cpp
+++ b/LiquidCrystal_I2C.cpp
@@ -41,28 +41,27 @@
 // can't assume that its in that state when a sketch starts (and the
 // LiquidCrystal constructor is called).

-LiquidCrystal_I2C::LiquidCrystal_I2C(I2CAddress lcd_Addr, uint8_t lcd_cols,
+LiquidCrystal_I2C::LiquidCrystal_I2C(uint8_t lcd_Addr, uint8_t lcd_cols,
                                     uint8_t lcd_rows) {
  _Addr = lcd_Addr;
-  lcdRows = lcd_rows;  // Number of character rows (typically 2 or 4).
-  lcdCols = lcd_cols;  // Number of character columns (typically 16 or 20)
-  _backlightval = 0;
- }
+  lcdRows = lcd_rows;
+  lcdCols = lcd_cols;

-bool LiquidCrystal_I2C::begin() {
+  _backlightval = 0;

  I2CManager.begin();
  I2CManager.setClock(100000L);    // PCF8574 is spec'd to 100kHz.

-  if (I2CManager.exists(_Addr)) {
-    DIAG(F("%dx%d LCD configured on I2C:%s"), (int)lcdCols, (int)lcdRows, _Addr.toString());
+  if (I2CManager.exists(lcd_Addr)) {
+    DIAG(F("%dx%d LCD configured on I2C:x%x"), (int)lcd_cols, (int)lcd_rows, (int)lcd_Addr);
    _displayfunction = LCD_4BITMODE | LCD_1LINE | LCD_5x8DOTS;
+    begin();
    backlight();
-  } else {
-    DIAG(F("LCD not found on I2C:%s"), _Addr.toString());
-    return false;
+    lcdDisplay = this;
  }
+}

+void LiquidCrystal_I2C::begin() {
  if (lcdRows > 1) {
    _displayfunction |= LCD_2LINE;
  }
@@ -80,15 +79,15 @@ bool LiquidCrystal_I2C::begin() {

  // we start in 8bit mode, try to set 4 bit mode
  write4bits(0x03);
-  delayMicroseconds(5000);  // wait min 4.1ms
+  delayMicroseconds(4500);  // wait min 4.1ms

  // second try
  write4bits(0x03);
-  delayMicroseconds(5000);  // wait min 4.1ms
+  delayMicroseconds(4500);  // wait min 4.1ms

  // third go!
  write4bits(0x03);
-  delayMicroseconds(5000);
+  delayMicroseconds(150);

  // finally, set to 4-bit interface
  write4bits(0x02);
@@ -100,23 +99,26 @@ bool LiquidCrystal_I2C::begin() {
  _displaycontrol = LCD_DISPLAYON | LCD_CURSOROFF | LCD_BLINKOFF;
  display();

+  // clear it off
+  clear();
+
  // Initialize to default text direction (for roman languages)
  _displaymode = LCD_ENTRYLEFT | LCD_ENTRYSHIFTDECREMENT;

  // set the entry mode
  command(LCD_ENTRYMODESET | _displaymode);

-  return true;
+  setRowNative(0);
 }

 /********** high level commands, for the user! */
 void LiquidCrystal_I2C::clearNative() {
  command(LCD_CLEARDISPLAY);  // clear display, set cursor position to zero
-  delayMicroseconds(2000);    // this command takes 1.52ms but allow plenty
+  delayMicroseconds(2000);    // this command takes 1.52ms
 }

 void LiquidCrystal_I2C::setRowNative(byte row) {
-  uint8_t row_offsets[] = {0x00, 0x40, 0x14, 0x54};
+  int row_offsets[] = {0x00, 0x40, 0x14, 0x54};
  if (row >= lcdRows) {
    row = lcdRows - 1;  // we count rows starting w/0
  }
@@ -144,10 +146,6 @@ size_t LiquidCrystal_I2C::writeNative(uint8_t value) {
  return 1;
 }

-bool LiquidCrystal_I2C::isBusy() { 
-  return rb.isBusy();
-}
-
 /*********** mid level commands, for sending data/cmds */

 inline void LiquidCrystal_I2C::command(uint8_t value) { 
@@ -194,12 +192,11 @@ void LiquidCrystal_I2C::send(uint8_t value, uint8_t mode) {
  uint8_t lownib = ((value & 0x0f) << BACKPACK_DATA_BITS) | mode;
  // Send both nibbles
  uint8_t len = 0;
-  rb.wait();
  outputBuffer[len++] = highnib|En;
  outputBuffer[len++] = highnib;
  outputBuffer[len++] = lownib|En;
  outputBuffer[len++] = lownib;
-  I2CManager.write(_Addr, outputBuffer, len, &rb);  // Write command asynchronously
+  I2CManager.write(_Addr, outputBuffer, len);  // Write command synchronously
 }

 // write 4 data bits to the HD44780 LCD controller.
@@ -209,16 +206,14 @@ void LiquidCrystal_I2C::write4bits(uint8_t value) {
  // I2C clock cycle time of 2.5us at 400kHz. Data is clocked in to the
  // HD44780 on the trailing edge of the Enable pin.
  uint8_t len = 0;
-  rb.wait();
  outputBuffer[len++] = _data|En;
  outputBuffer[len++] = _data;
-  I2CManager.write(_Addr, outputBuffer, len, &rb);  // Write command asynchronously
+  I2CManager.write(_Addr, outputBuffer, len);  // Write command synchronously
 }

 // 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) {
-  rb.wait();
  outputBuffer[0] = value | _backlightval;
-  I2CManager.write(_Addr, outputBuffer, 1, &rb);  // Write command asynchronously
+  I2CManager.write(_Addr, outputBuffer, 1);  // Write command synchronously
 }
--- a/LiquidCrystal_I2C.h
+++ b/LiquidCrystal_I2C.h
@@ -22,7 +22,7 @@
 #define LiquidCrystal_I2C_h

 #include <Arduino.h>
-#include "Display.h"
+#include "LCDDisplay.h"
 #include "I2CManager.h"

 // commands
@@ -62,38 +62,33 @@
 #define Rw (1 << BACKPACK_Rw_BIT)  // Read/Write bit
 #define Rs (1 << BACKPACK_Rs_BIT)  // Register select bit

-class LiquidCrystal_I2C : public DisplayDevice {
+class LiquidCrystal_I2C : public LCDDisplay {
 public:
-  LiquidCrystal_I2C(I2CAddress lcd_Addr,uint8_t lcd_cols,uint8_t lcd_rows);
-  bool begin() override;
+  LiquidCrystal_I2C(uint8_t lcd_Addr,uint8_t lcd_cols,uint8_t lcd_rows);
+  void begin();
  void clearNative() override;
  void setRowNative(byte line) override;
  size_t writeNative(uint8_t c) override;
-  // I/O is synchronous, so if this is called we're not busy!
-  bool isBusy() override; 
  
  void display();
  void noBacklight();
  void backlight();
  
  void command(uint8_t);
-  uint16_t getNumCols() { return lcdCols; }
-  uint16_t getNumRows() { return lcdRows; }
-

 private:
  void send(uint8_t, uint8_t);
  void write4bits(uint8_t);
  void expanderWrite(uint8_t);
-  uint8_t lcdCols=0, lcdRows=0;
-  I2CAddress _Addr;
+  uint8_t _Addr;
  uint8_t _displayfunction;
  uint8_t _displaycontrol;
  uint8_t _displaymode;
-  uint8_t _backlightval = 0;
+  uint8_t _backlightval;

  uint8_t outputBuffer[4];
-  I2CRB rb;
+  // I/O is synchronous, so if this is called we're not busy!
+  bool isBusy() override { return false; } 
 };

 #endif
--- a/MotorDriver.cpp
+++ b/MotorDriver.cpp
@@ -1,8 +1,8 @@
 /*
- *  © 2022-2023 Paul M Antoine
+ *  © 2022 Paul M Antoine
 *  © 2021 Mike S
 *  © 2021 Fred Decker
- *  © 2020-2023 Harald Barth
+ *  © 2020-2022 Harald Barth
 *  © 2020-2021 Chris Harlow
 *  All rights reserved.
 *  
@@ -27,16 +27,19 @@
 #include "DCCTimer.h"
 #include "DIAG.h"

-unsigned long MotorDriver::globalOverloadStart = 0;
+#if defined(ARDUINO_ARCH_ESP32)
+#include "ESP32-fixes.h"
+#endif
+
+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, int16_t brake_pin,
-                         byte current_pin, float sense_factor, unsigned int trip_milliamps, int16_t fault_pin) {
-  const FSH * warnString = F("** WARNING **");
-
+MotorDriver::MotorDriver(int16_t 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;
@@ -72,74 +75,35 @@ MotorDriver::MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, i
    dualSignal=true;
    getFastPin(F("SIG2"),signalPin2,fastSignalPin2);
    pinMode(signalPin2, OUTPUT);
-
-    fastSignalPin2.shadowinout = NULL;
-    if (HAVE_PORTA(fastSignalPin2.inout == &PORTA)) {
-      DIAG(F("Found PORTA pin %d"),signalPin2);
-      fastSignalPin2.shadowinout = fastSignalPin2.inout;
-      fastSignalPin2.inout = &shadowPORTA;
-    }
-    if (HAVE_PORTB(fastSignalPin2.inout == &PORTB)) {
-      DIAG(F("Found PORTB pin %d"),signalPin2);
-      fastSignalPin2.shadowinout = fastSignalPin2.inout;
-      fastSignalPin2.inout = &shadowPORTB;
-    }
-    if (HAVE_PORTC(fastSignalPin2.inout == &PORTC)) {
-      DIAG(F("Found PORTC pin %d"),signalPin2);
-      fastSignalPin2.shadowinout = fastSignalPin2.inout;
-      fastSignalPin2.inout = &shadowPORTC;
-    }
  }
  else dualSignal=false; 
  
+  brakePin=brake_pin;
  if (brake_pin!=UNUSED_PIN){
    invertBrake=brake_pin < 0;
-    if (invertBrake)
-      brake_pin = 0-brake_pin;
-    if (brake_pin > MAX_PIN)
-      DIAG(F("%S Brake pin %d > %d"), warnString, brake_pin, MAX_PIN);
-    brakePin=(byte)brake_pin;
+    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
-  } else {
-    brakePin=UNUSED_PIN;
  }
+  else brakePin=UNUSED_PIN;
  
  currentPin=current_pin;
  if (currentPin!=UNUSED_PIN) {
-    int ret = ADCee::init(currentPin);
-    if (ret < -1010) { // XXX give value a name later
-      DIAG(F("ADCee::init error %d, disable current pin %d"), ret, currentPin);
-      currentPin = UNUSED_PIN;
-    }
+    senseOffset = ADCee::init(currentPin);
  }
-  senseOffset=0; // value can not be obtained until waveform is activated

-  if (fault_pin != UNUSED_PIN) {
-    invertFault=fault_pin < 0;
-    if (invertFault)
-      fault_pin =  0-fault_pin;
-    if (fault_pin > MAX_PIN)
-      DIAG(F("%S Fault pin %d > %d"), warnString, fault_pin, MAX_PIN);
-    faultPin=(byte)fault_pin;
-    DIAG(F("Fault pin = %d invert %d"), faultPin, invertFault);
+  faultPin=fault_pin;
+  if (faultPin != UNUSED_PIN) {
    getFastPin(F("FAULT"),faultPin, 1 /*input*/, fastFaultPin);
    pinMode(faultPin, INPUT);
-  } else {
-      faultPin=UNUSED_PIN;
  }

  // This conversion performed at compile time so the remainder of the code never needs
  // float calculations or libraray code. 
  senseFactorInternal=sense_factor * senseScale; 
  tripMilliamps=trip_milliamps;
-#ifdef MAX_CURRENT
-  if (MAX_CURRENT > 0 && MAX_CURRENT < tripMilliamps)
-    tripMilliamps = MAX_CURRENT;
-#endif
-  rawCurrentTripValue=mA2raw(tripMilliamps);
+  rawCurrentTripValue=mA2raw(trip_milliamps);

  if (rawCurrentTripValue + senseOffset > ADCee::ADCmax()) {
    // This would mean that the values obtained from the ADC never
@@ -154,16 +118,21 @@ MotorDriver::MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, i
  }

  if (currentPin==UNUSED_PIN) 
-    DIAG(F("%S No current or short detection"), warnString);
+    DIAG(F("** WARNING ** No current or short detection"));
  else  {
-    DIAG(F("Pin %d Max %dmA (%d)"), currentPin, raw2mA(rawCurrentTripValue), rawCurrentTripValue);
+    DIAG(F("CurrentPin=A%d, Offset=%d, TripValue=%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() {
@@ -172,25 +141,27 @@ bool MotorDriver::isPWMCapable() {


 void MotorDriver::setPower(POWERMODE mode) {
-  if (powerMode == mode) return;
-  //DIAG(F("Track %c POWERMODE=%d"), trackLetter, (int)mode);
-  lastPowerChange[(int)mode] = micros();
-  if (mode == POWERMODE::OVERLOAD)
-    globalOverloadStart = lastPowerChange[(int)mode];
-  bool on=(mode==POWERMODE::ON || mode ==POWERMODE::ALERT);
+  bool on=mode==POWERMODE::ON;
  if (on) {
-    // when switching a track On, we need to check the crrentOffset with the pin OFF
-    if (powerMode==POWERMODE::OFF && currentPin!=UNUSED_PIN) {
-        senseOffset = ADCee::read(currentPin);
-        DIAG(F("Track %c sensOffset=%d"),trackLetter,senseOffset);
-    }
-
+    noInterrupts();
    IODevice::write(powerPin,invertPower ? LOW : HIGH);
+    interrupts();
+    if (DCinuse)
+      setDCSignal(curSpeedCode);
    if (isProgTrack)
      DCCWaveform::progTrack.clearResets();
  }
  else {
+      noInterrupts();
      IODevice::write(powerPin,invertPower ? HIGH : LOW);
+      interrupts();
+      if (DCinuse) {
+	// remember current (DC) speed
+	// but set PWM to zero/stop
+	byte s = curSpeedCode;
+	setDCSignal(128);
+	curSpeedCode = s;
+      }
  }
  powerMode=mode; 
 }
@@ -217,8 +188,8 @@ bool MotorDriver::canMeasureCurrent() {
  return currentPin!=UNUSED_PIN;
 }
 /*
- * Return the current reading as pin reading 0 to max resolution (1024 or 4096).
- * If the fault pin is activated return a negative current to show active fault pin.
+ * Return the current reading as pin reading 0 to 1023. If the fault
+ * pin is activated return a negative current to show active fault pin.
 * As there is no -0, cheat a little and return -1 in that case.
 * 
 * senseOffset handles the case where a shield returns values above or below 
@@ -230,17 +201,12 @@ int MotorDriver::getCurrentRaw(bool fromISR) {
  (void)fromISR;
  if (currentPin==UNUSED_PIN) return 0; 
  int current;
-  current = ADCee::read(currentPin, fromISR);
-  // here one can diag raw value
-  // if (fromISR == false) DIAG(F("%c: %d"), trackLetter, current);
-  current = current-senseOffset;     // adjust with offset
+  current = ADCee::read(currentPin, fromISR)-senseOffset;
  if (current<0) current=0-current;
-  // current >= 0 here, we use negative current as fault pin flag
-  if ((faultPin != UNUSED_PIN) && powerPin) {
-    if (invertFault ? isHIGH(fastFaultPin) : isLOW(fastFaultPin))
+  if ((faultPin != UNUSED_PIN)  && isLOW(fastFaultPin) && powerMode==POWERMODE::ON)
      return (current == 0 ? -1 : -current);
-  }
  return current;
+   
 }

 #ifdef ANALOG_READ_INTERRUPT
@@ -278,7 +244,6 @@ void MotorDriver::startCurrentFromHW() {
 #endif //ANALOG_READ_INTERRUPT

 #if defined(ARDUINO_ARCH_ESP32)
-#ifdef VARIABLE_TONES
 uint16_t taurustones[28] = { 165, 175, 196, 220,
 			     247, 262, 294, 330,
 			     349, 392, 440, 494,
@@ -287,69 +252,65 @@ uint16_t taurustones[28] = { 165, 175, 196, 220,
 			     330, 284, 262, 247,
 			     220, 196, 175, 165 };
 #endif
-#endif
 void MotorDriver::setDCSignal(byte speedcode) {
-  if (brakePin == UNUSED_PIN)
-    return;
-  switch(brakePin) {
+  curSpeedCode = speedcode;
+  DCinuse = true;
+
 #if defined(ARDUINO_AVR_UNO)
-    // Not worth doin something here as:
-    // If we are on pin 9 or 10 we are on Timer1 and we can not touch Timer1 as that is our DCC source.
-    // If we are on pin 5 or 6 we are on Timer 0 ad we can not touch Timer0 as that is millis() etc.
-    // We are most likely not on pin 3 or 11 as no known motor shield has that as brake.
+  if (powerPin == 3 || powerPin == 11)
+    TCCR2B = (TCCR2B & B11111000) | B00000110; // D3, D11: set divisor on timer 2 to result in (approx) 122.55Hz
 #endif
 #if defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560)
+// As timer 0 is the system timer, we leave it alone
+//TCCR0B = (TCCR0B & B11111000) | B00000100; // D4, D13    : 122 or 244Hz?
+// As we use timer 1 for DCC we leave it alone
+//TCCR1B = (TCCR1B & B11111000) | B00000100; // D11, D12   : 122Hz
+  switch(powerPin) {
  case 9:
  case 10:
-    // Timer2 (is differnet)
-    TCCR2A = (TCCR2A & B11111100) | B00000001; // set WGM1=0 and WGM0=1 phase correct PWM
-    TCCR2B = (TCCR2B & B11110000) | B00000110; // set WGM2=0 ; set divisor on timer 2 to 1/256 for 122.55Hz
-    //DIAG(F("2 A=%x B=%x"), TCCR2A, TCCR2B);
+    TCCR2B = (TCCR2B & B11111000) | B00000110; // D9, D10    : 122Hz
+    break;
+  case 2:
+  case 3:
+  case 5:
+    TCCR3B = (TCCR3B & B11111000) | B00000100; // D2, D3, D5 : 122Hz but maxcount and thus divisor differs
    break;
  case 6:
  case 7:
  case 8:
-    // Timer4
-    TCCR4A = (TCCR4A & B11111100) | B00000001; // set WGM0=1 and WGM1=0 for normal PWM 8-bit
-    TCCR4B = (TCCR4B & B11100000) | B00000100; // set WGM2=0 and WGM3=0 for normal PWM 8 bit and div 1/256 for 122.55Hz
+    TCCR4B = (TCCR4B & B11111000) | B00000100; // D6, D7, D8 : 122Hz but maxcount and thus divisor differs
    break;
-  case 46:
-  case 45:
  case 44:
-    // Timer5
-    TCCR5A = (TCCR5A & B11111100) | B00000001; // set WGM0=1 and WGM1=0 for normal PWM 8-bit
-    TCCR5B = (TCCR5B & B11100000) | B00000100; // set WGM2=0 and WGM3=0 for normal PWM 8 bit and div 1/256 for 122.55Hz
-    break;
-#endif
-  default:
+  case 45:
+  case 46:
+    TCCR5B = (TCCR5B & B11111000) | B00000100; // D44,D45,D46: 122Hz but maxcount and thus divisor differs
    break;
  }
+#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;
+  byte pwmratio;
 #if defined(ARDUINO_ARCH_ESP32)
  {
    int f = 131;
-#ifdef VARIABLE_TONES
    if (tSpeed > 2) {
      if (tSpeed <= 58) {
 	f = taurustones[ (tSpeed-2)/2 ] ;
      }
    }
-#endif
-    DCCTimer::DCCEXanalogWriteFrequency(brakePin, f); // set DC PWM frequency to 100Hz XXX May move to setup
+    DCCEXanalogWriteFrequency(powerPin, f); // set DC PWM frequency to 100Hz XXX May move to setup
  }
 #endif
-  if (tSpeed <= 1) brake = 255;
-  else if (tSpeed >= 127) brake = 0;
-  else  brake = 2 * (128-tSpeed);
-  if (invertBrake)
-    brake=255-brake;
+  if (tSpeed <= 1) pwmratio = 0;
+  else if (tSpeed >= 127) pwmratio = 255;
+  else  pwmratio = 2 * tSpeed;
+  if (invertPower)
+    pwmratio =255-pwmratio;
 #if defined(ARDUINO_ARCH_ESP32)
-  DCCTimer::DCCEXanalogWrite(brakePin,brake);
+  DCCEXanalogWrite(powerPin,pwmratio);
 #else
-  analogWrite(brakePin,brake);
+  analogWrite(powerPin,pwmratio);
 #endif
  //DIAG(F("DCSignal %d"), speedcode);
  if (HAVE_PORTA(fastSignalPin.shadowinout == &PORTA)) {
@@ -376,60 +337,7 @@ void MotorDriver::setDCSignal(byte speedcode) {
    interrupts();
  }
 }
-void MotorDriver::throttleInrush(bool on) {
-  if (brakePin == UNUSED_PIN)
-    return;
-  if ( !(trackMode & (TRACK_MODE_MAIN | TRACK_MODE_PROG | TRACK_MODE_EXT)))
-    return;
-  byte duty = on ? 208 : 0;
-  if (invertBrake)
-    duty = 255-duty;
-#if defined(ARDUINO_ARCH_ESP32)
-  if(on) {
-    DCCTimer::DCCEXanalogWrite(brakePin,duty);
-    DCCTimer::DCCEXanalogWriteFrequency(brakePin, 62500);
-  } else {
-    ledcDetachPin(brakePin);
-  }
-#else
-  if(on){
-    switch(brakePin) {
-#if defined(ARDUINO_AVR_UNO)
-      // Not worth doin something here as:
-      // If we are on pin 9 or 10 we are on Timer1 and we can not touch Timer1 as that is our DCC source.
-      // If we are on pin 5 or 6 we are on Timer 0 ad we can not touch Timer0 as that is millis() etc.
-      // We are most likely not on pin 3 or 11 as no known motor shield has that as brake.
-#endif
-#if defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560)
-    case 9:
-    case 10:
-      // Timer2 (is different)
-      TCCR2A = (TCCR2A & B11111100) | B00000011; // set WGM0=1 and WGM1=1 for fast PWM
-      TCCR2B = (TCCR2B & B11110000) | B00000001; // set WGM2=0 and prescaler div=1 (max)
-      DIAG(F("2 A=%x B=%x"), TCCR2A, TCCR2B);
-      break;
-    case 6:
-    case 7:
-    case 8:
-      // Timer4
-      TCCR4A = (TCCR4A & B11111100) | B00000001; // set WGM0=1 and WGM1=0 for fast PWM 8-bit
-      TCCR4B = (TCCR4B & B11100000) | B00001001; // set WGM2=1 and WGM3=0 for fast PWM 8 bit and div=1 (max)
-      break;
-    case 46:
-    case 45:
-    case 44:
-      // Timer5
-      TCCR5A = (TCCR5A & B11111100) | B00000001; // set WGM0=1 and WGM1=0 for fast PWM 8-bit
-      TCCR5B = (TCCR5B & B11100000) | B00001001; // set WGM2=1 and WGM3=0 for fast PWM 8 bit and div=1 (max)
-      break;
-#endif
-    default:
-      break;
-    }
-  }
-  analogWrite(brakePin,duty);
-#endif
-}
+
 unsigned int MotorDriver::raw2mA( int raw) {
  //DIAG(F("%d = %d * %d / %d"), (int32_t)raw * senseFactorInternal / senseScale, raw, senseFactorInternal, senseScale);
  return (int32_t)raw * senseFactorInternal / senseScale;
@@ -458,170 +366,64 @@ void  MotorDriver::getFastPin(const FSH* type,int pin, bool input, FASTPIN & res
    // DIAG(F(" port=0x%x, inoutpin=0x%x, isinput=%d, mask=0x%x"),port, result.inout,input,result.maskHIGH);
 }

-///////////////////////////////////////////////////////////////////////////////////////////
-// checkPowerOverload(useProgLimit, trackno)
-// bool useProgLimit: Trackmanager knows if this track is in prog mode or in main mode
-// byte trackno: trackmanager knows it's number (could be skipped?)
-//
-// Short ciruit handling strategy:
-//
-// There are the following power states: ON ALERT OVERLOAD OFF
-// OFF state is only changed to/from manually. Power is on
-// during ON and ALERT. Power is off during OVERLOAD and OFF.
-// The overload mechanism changes between the other states like
-//
-// ON -1-> ALERT -2-> OVERLOAD -3-> ALERT -4-> ON
-// or
-// ON -1-> ALERT -4-> ON
-//
-// Times are in class MotorDriver (MotorDriver.h).
-//
-// 1. ON to ALERT:
-// Transition on fault pin condition or current overload
-//
-// 2. ALERT to OVERLOAD:
-// Transition happens if different timeouts have elapsed.
-// If only the fault pin is active, timeout is
-// POWER_SAMPLE_IGNORE_FAULT_LOW (100ms)
-// If only overcurrent is detected, timeout is
-// POWER_SAMPLE_IGNORE_CURRENT (100ms)
-// If fault pin and overcurrent are active, timeout is
-// POWER_SAMPLE_IGNORE_FAULT_HIGH (5ms)
-// Transition to OVERLOAD turns off power to the affected
-// output (unless fault pins are shared)
-// If the transition conditions are not fullfilled,
-// transition according to 4 is tested.
-//
-// 3. OVERLOAD to ALERT
-// Transiton happens when timeout has elapsed, timeout
-// is named power_sample_overload_wait. It is started
-// at POWER_SAMPLE_OVERLOAD_WAIT (40ms) at first entry
-// to OVERLOAD and then increased by a factor of 2
-// at further entries to the OVERLOAD condition. This
-// happens until POWER_SAMPLE_RETRY_MAX (10sec) is reached.
-// power_sample_overload_wait is reset by a poweroff or
-// a POWER_SAMPLE_ALL_GOOD (5sec) period during ON.
-// After timeout power is turned on again and state
-// goes back to ALERT.
-//
-// 4. ALERT to ON
-// Transition happens by watching the current and fault pin
-// samples during POWER_SAMPLE_ALERT_GOOD (20ms) time. If
-// values have been good during that time, transition is
-// made back to ON. Note that even if state is back to ON,
-// the power_sample_overload_wait time is first reset
-// later (see above).
-//
-// The time keeping is handled by timestamps lastPowerChange[]
-// which are set by each power change and by lastBadSample which
-// keeps track if conditions during ALERT have been good enough
-// to go back to ON. The time differences are calculated by
-// microsSinceLastPowerChange().
-//
-
 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: {
-    lastPowerMode = POWERMODE::OFF;
-    power_sample_overload_wait = POWER_SAMPLE_OVERLOAD_WAIT;
-    break;
-  }
-
-  case POWERMODE::ON: {
-    lastPowerMode = POWERMODE::ON;
-    bool cF = checkFault();
-    bool cC = checkCurrent(useProgLimit);
-    if(cF || cC ) {
-      if (cC) {
-	unsigned int mA=raw2mA(lastCurrent);
-	DIAG(F("TRACK %c ALERT %s %dmA"), trackno + 'A',
-	     cF ? "FAULT" : "",
-	     mA);
+    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 {
-	DIAG(F("TRACK %c ALERT FAULT"), trackno + 'A');
+        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;
      }
-      setPower(POWERMODE::ALERT);
      break;
-    }
-    // all well
-    if (microsSinceLastPowerChange(POWERMODE::ON) > POWER_SAMPLE_ALL_GOOD) {
-      power_sample_overload_wait = POWER_SAMPLE_OVERLOAD_WAIT;
-    }
-    break;
-  }
-
-  case POWERMODE::ALERT: {
-    // set local flags that handle how much is output to diag (do not output duplicates)
-    bool notFromOverload = (lastPowerMode != POWERMODE::OVERLOAD);
-    bool powerModeChange = (powerMode != lastPowerMode);
-    unsigned long now = micros();
-    if (powerModeChange)
-      lastBadSample = now;
-    lastPowerMode = POWERMODE::ALERT;
-    // check how long we have been in this state
-    unsigned long mslpc = microsSinceLastPowerChange(POWERMODE::ALERT);
-    if(checkFault()) {
-      throttleInrush(true);
-      lastBadSample = now;
-      unsigned long timeout = checkCurrent(useProgLimit) ? POWER_SAMPLE_IGNORE_FAULT_HIGH : POWER_SAMPLE_IGNORE_FAULT_LOW;
-      if ( mslpc < timeout) {
-	if (powerModeChange)
-	  DIAG(F("TRACK %c FAULT PIN (%M ignore)"), trackno + 'A', timeout);
-	break;
-      }
-      DIAG(F("TRACK %c FAULT PIN detected after %4M. Pause %4M)"), trackno + 'A', mslpc, power_sample_overload_wait);
-      throttleInrush(false);
-      setPower(POWERMODE::OVERLOAD);
-      break;
-    }
-    if (checkCurrent(useProgLimit)) {
-      lastBadSample = now;
-      if (mslpc < POWER_SAMPLE_IGNORE_CURRENT) {
-	if (powerModeChange) {
-	  unsigned int mA=raw2mA(lastCurrent);
-	  DIAG(F("TRACK %c CURRENT (%M ignore) %dmA"), trackno + 'A', POWER_SAMPLE_IGNORE_CURRENT, mA);
-	}
-	break;
-      }
-      unsigned int mA=raw2mA(lastCurrent);
-      unsigned int maxmA=raw2mA(tripValue);
-      DIAG(F("TRACK %c POWER OVERLOAD %4dmA (max %4dmA) detected after %4M. Pause %4M"),
-	   trackno + 'A', mA, maxmA, mslpc, power_sample_overload_wait);
-      throttleInrush(false);
-      setPower(POWERMODE::OVERLOAD);
-      break;
-    }
-    // all well
-    unsigned long goodtime = micros() - lastBadSample;
-    if (goodtime > POWER_SAMPLE_ALERT_GOOD) {
-      if (true || notFromOverload) { // we did a RESTORE message XXX
-	unsigned int mA=raw2mA(lastCurrent);
-	DIAG(F("TRACK %c NORMAL (after %M/%M) %dmA"), trackno + 'A', goodtime, mslpc, mA);
-      }
-      throttleInrush(false);
+    case POWERMODE::OVERLOAD:
+      // Try setting it back on after the OVERLOAD_WAIT
      setPower(POWERMODE::ON);
-    }
-    break;
-  }
-
-  case POWERMODE::OVERLOAD: {
-    lastPowerMode = POWERMODE::OVERLOAD;
-    unsigned long mslpc = (commonFaultPin ? (micros() - globalOverloadStart) : microsSinceLastPowerChange(POWERMODE::OVERLOAD));
-    if (mslpc > power_sample_overload_wait) {
-      // adjust next wait time
-      power_sample_overload_wait *= 2;
-      if (power_sample_overload_wait > POWER_SAMPLE_RETRY_MAX)
-	power_sample_overload_wait = POWER_SAMPLE_RETRY_MAX;
-      // power on test
-      DIAG(F("TRACK %c POWER RESTORE (after %4M)"), trackno + 'A', mslpc);
-      setPower(POWERMODE::ALERT);
-    }
-    break;
-  }
-
-  default:
-    break;
+      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.
  }
 }
--- a/MotorDriver.h
+++ b/MotorDriver.h
@@ -27,10 +27,6 @@
 #include "IODevice.h"
 #include "DCCTimer.h"

-// use powers of two so we can do logical and/or on the track modes in if clauses.
-enum TRACK_MODE : byte {TRACK_MODE_NONE = 1, TRACK_MODE_MAIN = 2, TRACK_MODE_PROG = 4,
-                        TRACK_MODE_DC = 8, TRACK_MODE_DCX = 16, TRACK_MODE_EXT = 32};
-
 #define setHIGH(fastpin)  *fastpin.inout |= fastpin.maskHIGH
 #define setLOW(fastpin)   *fastpin.inout &= fastpin.maskLOW
 #define isHIGH(fastpin)   (*fastpin.inout & fastpin.maskHIGH)
@@ -78,9 +74,8 @@ enum TRACK_MODE : byte {TRACK_MODE_NONE = 1, TRACK_MODE_MAIN = 2, TRACK_MODE_PRO
 // Virtualised Motor shield 1-track hardware Interface

 #ifndef UNUSED_PIN     // sync define with the one in MotorDrivers.h
-#define UNUSED_PIN 255 // inside uint8_t
+#define UNUSED_PIN 127 // inside int8_t
 #endif
-#define MAX_PIN 254

 class pinpair {
 public:
@@ -111,13 +106,13 @@ extern volatile portreg_t shadowPORTA;
 extern volatile portreg_t shadowPORTB;
 extern volatile portreg_t shadowPORTC;

-enum class POWERMODE : byte { OFF, ON, OVERLOAD, ALERT };
+enum class POWERMODE : byte { OFF, ON, OVERLOAD };

 class MotorDriver {
  public:
    
-    MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, int16_t brake_pin, 
-                byte current_pin, float senseFactor, unsigned int tripMilliamps, int16_t fault_pin);
+    MotorDriver(int16_t 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
@@ -149,28 +144,29 @@ class MotorDriver {
    };
    inline pinpair getSignalPin() { return pinpair(signalPin,signalPin2); };
    void setDCSignal(byte speedByte);
-    void throttleInrush(bool on);
    inline void detachDCSignal() {
 #if defined(__arm__)
-      pinMode(brakePin, OUTPUT);
+      pinMode(powerPin, OUTPUT);
 #elif defined(ARDUINO_ARCH_ESP32)
-      ledcDetachPin(brakePin);
+      ledcDetachPin(powerPin);
 #else
      setDCSignal(128);
 #endif
+      DCinuse = false;
    };
    int  getCurrentRaw(bool fromISR=false);
    unsigned int raw2mA( int raw);
    unsigned int mA2raw( unsigned int mA);
-    inline bool brakeCanPWM() {
+    inline bool powerPinCanPWM() {
 #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)));
+#ifdef digitalPinHasPWM
+      return digitalPinHasPWM(powerPin);
 #else
-      return (brakePin<14 && brakePin >1);
+#warning No good digitalPinHasPWM doing approximation
+      return (powerPin<14 && powerPin >1);
 #endif //digitalPinToTimer
 #endif //ESP32/ARM
    }
@@ -180,10 +176,7 @@ class MotorDriver {
    bool isPWMCapable();
    bool canMeasureCurrent();
    bool trackPWM = false; // this track uses PWM timer to generate the DCC waveform
-    bool commonFaultPin = false; // This is a stupid motor shield which has only a common fault pin for both outputs
-    inline byte setCommonFaultPin() {
-      return commonFaultPin = true;
-    }
+    static bool commonFaultPin; // This is a stupid motor shield which has only a common fault pin for both outputs
    inline byte getFaultPin() {
 	return faultPin;
    }
@@ -191,56 +184,22 @@ class MotorDriver {
      isProgTrack = on;
    }
    void checkPowerOverload(bool useProgLimit, byte trackno);
-    inline void setTrackLetter(char c) {
-      trackLetter = c;
-    };
-    // this returns how much time has passed since the last power change. If it
-    // was really long ago (approx > 52min) advance counter approx 35 min so that
-    // we are at 18 minutes again. Times for 32 bit unsigned long.
-    inline unsigned long microsSinceLastPowerChange(POWERMODE mode) {
-      unsigned long now = micros();
-      unsigned long diff = now - lastPowerChange[(int)mode];
-      if (diff > (1UL << (7 *sizeof(unsigned long)))) // 2^(4*7)us = 268.4 seconds
-        lastPowerChange[(int)mode] = now - 30000000UL;           // 30 seconds ago
-      return diff;
-    };
 #ifdef ANALOG_READ_INTERRUPT
    bool sampleCurrentFromHW();
    void startCurrentFromHW();
 #endif
-  inline void setMode(TRACK_MODE m) {
-    trackMode = m;
-  };
-  inline TRACK_MODE getMode() {
-    return trackMode;
-  };
  private:
-    char trackLetter = '?';
    bool isProgTrack = false; // tells us if this is a prog track
    void  getFastPin(const FSH* type,int pin, bool input, FASTPIN & result);
-    inline void  getFastPin(const FSH* type,int pin, FASTPIN & result) {
+    void  getFastPin(const FSH* type,int pin, FASTPIN & result) {
 	getFastPin(type, pin, 0, result);
-    };
-    // side effect sets lastCurrent and tripValue
-    inline bool checkCurrent(bool useProgLimit) {
-      tripValue= useProgLimit?progTripValue:getRawCurrentTripValue();
-      lastCurrent = getCurrentRaw();
-      if (lastCurrent < 0)
-	lastCurrent = -lastCurrent;
-      return lastCurrent >= tripValue;
-    };
-    // side effect sets lastCurrent
-    inline bool checkFault() {
-      lastCurrent = getCurrentRaw();
-      return lastCurrent < 0;
-    };
+    }
    VPIN powerPin;
    byte signalPin, signalPin2, currentPin, faultPin, brakePin;
    FASTPIN 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
-    bool invertFault;       // fault pin passed as negative means pin is inverted
    
    // Raw to milliamp conversion factors avoiding float data types.
    // Milliamps=rawADCreading * sensefactorInternal / senseScale
@@ -254,14 +213,10 @@ class MotorDriver {
    int rawCurrentTripValue;
    // current sampling
    POWERMODE powerMode;
-    POWERMODE lastPowerMode;
-    unsigned long lastPowerChange[4];         // timestamp in microseconds
-    unsigned long lastBadSample;              // timestamp in microseconds
-    // used to sync restore time when common Fault pin detected
-    static unsigned long globalOverloadStart; // timestamp in microseconds
+    unsigned long lastSampleTaken;
+    unsigned int sampleDelay;
    int progTripValue;
-    int  lastCurrent; //temp value
-    int  tripValue;   //temp value
+    int  lastCurrent;
 #ifdef ANALOG_READ_INTERRUPT
    volatile unsigned long sampleCurrentTimestamp;
    volatile uint16_t sampleCurrent;
@@ -269,28 +224,17 @@ class MotorDriver {
    int maxmA;
    int tripmA;

-    // Times for overload management. Unit: microseconds.
-    // Base for wait time until power is turned on again
-    static const unsigned long POWER_SAMPLE_OVERLOAD_WAIT =     40000UL;
-    // Time after we consider all faults old and forgotten
-    static const unsigned long POWER_SAMPLE_ALL_GOOD =        5000000UL;
-    // Time after which we consider a ALERT over 
-    static const unsigned long POWER_SAMPLE_ALERT_GOOD =        20000UL;
-    // How long to ignore fault pin if current is under limit
-    static const unsigned long POWER_SAMPLE_IGNORE_FAULT_LOW = 100000UL;
-    // How long to ignore fault pin if current is higher than limit
-    static const unsigned long POWER_SAMPLE_IGNORE_FAULT_HIGH =  5000UL;
-    // How long to wait between overcurrent and turning off
-    static const unsigned long POWER_SAMPLE_IGNORE_CURRENT  =  100000UL;
-    // Upper limit for retry period
-    static const unsigned long POWER_SAMPLE_RETRY_MAX =      10000000UL;
+    // 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;
-    TRACK_MODE trackMode = TRACK_MODE_NONE; // we assume track not assigned at startup
-
+    bool DCinuse = false;
+    byte curSpeedCode = 0;
 };
 #endif
--- a/MotorDrivers.h
+++ b/MotorDrivers.h
@@ -1,7 +1,7 @@
 /*
- *  © 2022-2023 Paul M. Antoine
+ *  © 2022 Paul M. Antoine
 *  © 2021 Fred Decker
- *  © 2020-2023 Harald Barth
+ *  © 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.
@@ -36,7 +36,7 @@
 // custom defines in config.h.

 #ifndef UNUSED_PIN     // sync define with the one in MotorDriver.h
-#define UNUSED_PIN 255 // inside uint8_t
+#define UNUSED_PIN 127 // inside int8_t
 #endif

 // The MotorDriver definition is:
@@ -60,8 +60,7 @@
 // Arduino STANDARD Motor Shield, used on different architectures:

 #if defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_STM32)
-// Standard Motor Shield definition for 3v3 processors (other than the ESP32)
-// Setup for SAMD21 Sparkfun DEV board MUST use Arduino Motor Shield R3 (MUST be R3
+// 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
@@ -71,27 +70,15 @@
 #define SAMD_STANDARD_MOTOR_SHIELD STANDARD_MOTOR_SHIELD
 #define STM32_STANDARD_MOTOR_SHIELD STANDARD_MOTOR_SHIELD

-// EX 8874 based shield connected to a 3V3 system with 12-bit (4096) ADC
-#define EX8874_SHIELD F("EX8874"), \
- new MotorDriver( 3, 12, UNUSED_PIN, 9, A0, 1.27, 5000, A4), \
- new MotorDriver(11, 13, UNUSED_PIN, 8, A1, 1.27, 5000, A5)
-
-
 #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 A2 and A3 as A0 and A1 are wired in a way so that
+// 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*/, 35/*A2*/, 0.70, 1500, UNUSED_PIN), \
- new MotorDriver(23/*11*/, 18/*13*/, UNUSED_PIN, 12/*8*/, 34/*A3*/, 0.70, 1500, UNUSED_PIN)
-
-// EX 8874 based shield connected to a 3.3V system (like ESP32) and 12bit (4096) ADC
-// numbers are GPIO numbers. comments are UNO form factor shield pin numbers
-#define EX8874_SHIELD F("EX8874"),\
- new MotorDriver(25/* 3*/, 19/*12*/, UNUSED_PIN, 13/*9*/, 35/*A2*/, 1.27, 5000, 36 /*A4*/), \
- new MotorDriver(23/*11*/, 18/*13*/, UNUSED_PIN, 12/*8*/, 34/*A3*/, 1.27, 5000, 39 /*A5*/)
+#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.
@@ -101,12 +88,6 @@
 #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)
-
-// EX 8874 based shield connected to a 5V system (like Arduino) and 10bit (1024) ADC
-#define EX8874_SHIELD F("EX8874"), \
- new MotorDriver( 3, 12, UNUSED_PIN, 9, A0, 5.08, 5000, A4), \
- new MotorDriver(11, 13, UNUSED_PIN, 8, A1, 5.08, 5000, A5)
-
 #endif

 // Pololu Motor Shield
--- a/Doc/CommandStation-EX-Arch-v1-0.svg
+++ b/Doc/CommandStation-EX-Arch-v1-0.svg
@@ -485,10 +485,10 @@
 				<text x="32.86" y="598.05" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Accessories <v:newlineChar/><tspan
 							x="30.42" dy="1.2em" class="st5">(</tspan>Output.cpp)</text>			</g>
 		</a>
-		<a xlink:href="https://github.com/DCC-EX/CommandStation-EX/blob/master/Display.cpp">
+		<a xlink:href="https://github.com/DCC-EX/CommandStation-EX/blob/master/LCDDisplay.cpp">
 			<g id="shape14-81" v:mID="14" v:groupContext="shape" v:layerMember="0" transform="translate(288,-116.156)">
 				<title>Process.14</title>
-				<desc>Other Utilities (Display.cpp)</desc>
+				<desc>Other Utilities (LCDDisplay.cpp)</desc>
 				<v:custProps>
 					<v:cp v:nameU="Cost" v:lbl="Cost" v:prompt="" v:type="7" v:format="@" v:sortKey="" v:invis="false"
 							v:ask="false" v:langID="1033" v:cal="0"/>
@@ -522,7 +522,7 @@
 				</g>
 				<rect x="0" y="580.5" width="90" height="31.5" rx="13.5" ry="13.5" class="st3"/>
 				<text x="19.29" y="593.55" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Other Utilities<v:newlineChar/><tspan
-							x="14.29" dy="1.2em" class="st5">(</tspan>Display.cpp)</text>			</g>
+							x="14.29" dy="1.2em" class="st5">(</tspan>LCDDisplay.cpp)</text>			</g>
 		</a>
 		<g id="shape3-88" v:mID="3" v:groupContext="shape" v:layerMember="1" transform="translate(108,-443.812)">
 			<title>Dynamic connector</title>
--- a/Release_Notes/CommandRef.md
+++ b/Release_Notes/CommandRef.md
@@ -1,197 +0,0 @@
-This file is being used to consolidate the command reference information. 
-
-General points:
-  - Commands below have a single character opcode and parameters.
-  Even <JA> is actually read as <J A> 
-  - Keyword parameters are shown in upper case but may be entered in mixed case.
-  - value parameters are decimal numeric (unless otherwise noted)
-  - [something]  indicates its optional.
-  - Not all commands have a response, and broadcasts mean that not all responses come from the last commands that you have issued.
-   
-Startup status
-<s> Return status like
-    <iDCC-EX V-4.2.22 / MEGA / STANDARD_MOTOR_SHIELD G-devel-202302281422Z>
-    also returns defined turnout list:
-    <H id 1|0>   1=thrown
-
-Track power management. After power commands a power state is broadcast to all throttles.
-
-<1>                Power on all
-<1 MAIN|PROG|JOIN> Power on MAIN or PROG track
-<1 JOIN>           Power on MAIN and PROG track but send main track data on both.
-<0>                Power off all tracks 
-<0 MAIN|PROG>      Power off main or prog track
-
-Basic manual loco control
-<t locoid speed direction>  Throttle loco. 
-    speed in JMRI-form  (-1=ESTOP, 0=STOP, 1..126 = DCC speeds 2..127)
-    direction 1=forward, 0=reverse
-    For response see broadcast <l>
-
-<F locoid function 1|0>     Set loco function 1=ON, 0-OFF
-    For response see broadcast <l>
-
-<!>  emergency stop all locos
-<T id 0|1|T|C>  Control turnout id, 0=C=Closed, 1=T=Thrown
-       response broadcast <H id 0|1>
-
-
-DCC accessory control
-<a address subaddress activate [onoff]>
-<a linearaddress activate> 
-
-
-Turnout definition
-Note: Turnouts are best defined in myAutomation.h where a turnout description can also be provided ( refer to EXRAIL documentation) or by using these commands in a mySetup.h file. 
-
-<T id SERVO vpin thrown closed profile>
-<T id VPIN vpin>
-<T id DCC addr subaddr>
-<T id DCC linearaddr>
-   Valid commands respond with <O>
-
-Direct pin manipulation (replaces <Z commands, no predefinition required)
-<z vpin>     Set pin HIGH
-<z -vpin>    Set pin LOW
-<z vpin value> Set pin analog value
-<z vpin value profile> Set pin analog with profile
-<z vpin value profile duration> set pin analog with profile and value
-
-
-Sensors (Used by JMRI, not required by EXRAIL)
-<S id vpin pullup> define a sensor to be monitored.
-   Responses <Q id> and <q id> as sensor changes  
-
-Decoder programming - main track
-<w cab cv value> POM write value to cv on loco
-<b cab cv bit value> POM write bit to cv on loco
-
-Decoder Programming - prog track
-<W cabid>  Clear consist and write new cab id (includes long/short settings)
-           Responds <W cabid> or <W -1> for error
-<W cv value> Write value to cv
-
-<V cv predictedValue> Read cv value, much faster if prediction is correct. 
-<V cv bit predictedValue>      Read CV bit
-
-<R>         Read drive-away loco id. (May be a consist id)
-<D ACK ON|OFF>
-<D ACK LIMIT|MIN|MAX|RETRY value>
-<D PROGBOOST>
-
-Advanced DCC control
-<M  packet.... >
-<P  packet ...>
-<f map1 map2 [map3]>
-<#>
-<->
-<- cabid>
-<D CABS>
-<D SPEED28>
-<D SPEED128>
-
-
-EEPROM commands
-These commands exist for
-backwards JMRI compatibility. 
-You are strongly discouraged from maintaining your configuration settings in EEPROM.    
-<E>
-<e>
-<D EEPROM>
-<T>
-<T id>
-<S>
-<S id>
-<Z>
-<Z id>
-
-Diagnostic commands
-<D CMD ON|OFF>
-<D WIFI ON|OFF>
-<D ETHERNET ON|OFF>
-<D WIT ON|OFF>
-<D LCN ON|OFF>
-<D EXRAIL ON|OFF>
-<D RESET>
-<D SERVO|ANOUT vpin position [profile]>
-<D ANIN vpin>
-<D HAL SHOW>
-<D HAL RESET>
-<+ cmd>
-<+>
-<Q>
-
-User defined filter commands
-<U ....>
-<u ....>
-
-Track Management
-<=>
-<= track DCC|PROG|OFF>
-<= track DC|DCX cabid>
-<JG>
-<JI>
-
-
-Turntable interface
-<D TT vpin steps [activity]>
-
-Fast clock interface
-<JC>
-<JC mins rate>
-
-
-Advanced Throttle access to features
-<t cab>
-<JA>
-<JA id>
-<JR>
-<JR id>
-<JT>
-<JT id>
-
-*******************
-EXRAIL Commands
-*******************
-
-</>
-</PAUSE>
-</RESUME>
-</START cab sequence>
-</START sequence>
-</KILL taskid>
-</KILL ALL>
-</RESERVE|FREE blockid>
-</LATCH|UNLATCH latchid>
-</RED|AMBER|GREEN signalid>
-
-Obsolete commands/formats
-<c>
-<t ignored cab speed direction> 
-<T id vpin thrown closed>
-<T id addr subaddr>
-<B cv bit value obsolete obsolete>
-<R cv obsolete obsolete>
-<W cv value obsolete obsolete>
-<R cv>            V command is much faster if prediction is correct.
-<B cv bit value>  V command is much faster if prediction is correct.
-<Z id vpin active> (use <z)  Define an output pin that JMRI can set by id 
-<Z id activate>    (use <z)  Activate an output pin by id
-
-
-Broadcast responses
-Note: broadcasts are sent to all throttles when appropriate (usually because something has changed)
-
-<p0>
-<p1>
-<p1 MAIN|PROG|JOIN>
-
-<l cab slot dccspeed functionmap>
-<H id 1|0>
-<jC mmmm speed>
-
-Diagnostic responses
-These are not meant to be software readable. They contain diagnostic information for programmers to identify issues.
-<X> 
-<*  ... *>
-
--- a/RingStream.cpp
+++ b/RingStream.cpp
@@ -83,7 +83,7 @@ size_t RingStream::printFlash(const FSH * flashBuffer) {

 // Establish the actual length of the progmem string.
 char * flash=(char *)flashBuffer;
-int16_t plength=STRLEN_P(flash);
+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
--- a/SSD1306Ascii.cpp
+++ b/SSD1306Ascii.cpp
@@ -143,69 +143,56 @@ const uint8_t FLASH SSD1306AsciiWire::SH1106_132x64init[] = {
 // SSD1306AsciiWire Method Definitions
 //------------------------------------------------------------------------------
 
-// Auto-detect address
-SSD1306AsciiWire::SSD1306AsciiWire(int width, int height) 
-  : SSD1306AsciiWire(0, width, height) { }
-
-// Constructor with explicit address
-SSD1306AsciiWire::SSD1306AsciiWire(I2CAddress address, int width, int height) {
-  m_i2cAddr = address;
+// Constructor
+SSD1306AsciiWire::SSD1306AsciiWire(int width, int height) {
  m_displayWidth = width;
  m_displayHeight = height;
-  // Set size in characters
-  m_charsPerColumn = m_displayHeight / fontHeight;
-  m_charsPerRow = (m_displayWidth+fontWidth-1) / fontWidth; // Round up
-}
-
-bool SSD1306AsciiWire::begin() {
-  I2CManager.begin();
-  I2CManager.setClock(400000L);  // Set max supported I2C speede
-
-  if (m_i2cAddr == 0) {
-    // Probe for I2C device on 0x3c and 0x3d.
-    for (uint8_t address = 0x3c; address <= 0x3d; address++) {
-      if (I2CManager.exists(address)) {
-        m_i2cAddr = address;
-        break;
-      }
-    }
-    if (m_i2cAddr == 0)
-      DIAG(F("OLED display not found"));
-  }
-
+  // Set size in characters in base class
+  lcdRows = height / 8;
+  lcdCols = width / 6;
  m_col = 0;
  m_row = 0;
  m_colOffset = 0;

-  if (m_displayWidth==132 && m_displayHeight==64) {
-    // SH1106 display.  This uses 128x64 centered within a 132x64 OLED.
-    m_colOffset = 2;
-    I2CManager.write_P(m_i2cAddr, SH1106_132x64init, sizeof(SH1106_132x64init));
-  } else if (m_displayWidth==128 && (m_displayHeight==64 || m_displayHeight==32)) {
-    // SSD1306 or SSD1309 128x64 or 128x32
-    I2CManager.write_P(m_i2cAddr, Adafruit128xXXinit, sizeof(Adafruit128xXXinit));
-    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
-  } else {
-    DIAG(F("OLED configuration option not recognised"));
-    return false;
+  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);
+      // Set singleton address
+      lcdDisplay = this;
+      clear();
+      return;
+    }
  }
-  // Device found
-  DIAG(F("%dx%d OLED display configured on I2C:%s"), m_displayWidth, m_displayHeight, m_i2cAddr.toString());
-  return true;
+  DIAG(F("OLED display not found"));
 }

 /* Clear screen by writing blank pixels. */
 void SSD1306AsciiWire::clearNative() {
-  const int maxBytes = sizeof(blankPixels) - 1;  // max number of pixel columns (bytes) per transmission
+  const int maxBytes = sizeof(blankPixels);  // max number of bytes sendable over Wire
  for (uint8_t r = 0; r <= m_displayHeight/8 - 1; r++) {
    setRowNative(r);   // Position at start of row to be erased
-    for (uint8_t c = 0; c < m_displayWidth; c += maxBytes) {
-      uint8_t len = m_displayWidth-c;  // Number of pixel columns remaining
-      if (len > maxBytes) len = maxBytes;
-      I2CManager.write_P(m_i2cAddr, blankPixels, len+1);  // Write command + 'len' blank columns
+    for (uint8_t c = 0; c <= m_displayWidth - 1; c += maxBytes-1) {
+      uint8_t len = min(m_displayWidth-c, maxBytes-1) + 1;
+      I2CManager.write_P(m_i2cAddr, blankPixels, len);  // Write a number of blank columns
    }
  }
 }
@@ -236,6 +223,11 @@ void SSD1306AsciiWire::setRowNative(uint8_t line) {
 size_t SSD1306AsciiWire::writeNative(uint8_t ch) {
  const uint8_t* base = m_font;

+  if (ch < m_fontFirstChar || ch >= (m_fontFirstChar + m_fontCharCount))
+    return 0;
+  // Check if character would be partly or wholly off the display
+  if (m_col + fontWidth > m_displayWidth)
+    return 0;
 #if defined(NOLOWERCASE)
  // Adjust if lowercase is missing
  if (ch >= 'a') {
@@ -245,12 +237,6 @@ size_t SSD1306AsciiWire::writeNative(uint8_t ch) {
      ch -= 26; // Allow for missing lowercase letters
  }
 #endif
-  if (ch < m_fontFirstChar || ch >= (m_fontFirstChar + m_fontCharCount))
-    return 0;
-  // Check if character would be partly or wholly off the display
-  if (m_col + fontWidth > m_displayWidth)
-    return 0;
-
  ch -= m_fontFirstChar;
  base += fontWidth * ch;
  // Before using buffer, wait for last request to complete
@@ -259,261 +245,127 @@ size_t SSD1306AsciiWire::writeNative(uint8_t ch) {
  outputBuffer[0] = 0x40;     // set SSD1306 controller to data mode
  uint8_t bufferPos = 1;
  // Copy character pixel columns
-  for (uint8_t i = 0; i < fontWidth; i++) {
-    if (m_col++ < m_displayWidth) 
-      outputBuffer[bufferPos++] = GETFLASH(base++);
-  }
+  for (uint8_t i = 0; i < fontWidth; i++) 
+    outputBuffer[bufferPos++] = GETFLASH(base++);
+  // Add blank pixels between letters
+  for (uint8_t i = 0; i < letterSpacing; i++) 
+    outputBuffer[bufferPos++] = 0;

  // Write the data to I2C display
  I2CManager.write(m_i2cAddr, outputBuffer, bufferPos, &requestBlock);
+  m_col += fontWidth + letterSpacing;
  return 1;
 }


 //------------------------------------------------------------------------------

-// Font characters, 6x8 pixels, starting at 0x20.
+// Font characters, 5x7 pixels, 0x61 characters starting at 0x20.
 // Lower case characters optionally omitted.
-const uint8_t FLASH SSD1306AsciiWire::System6x8[] = {
+const uint8_t FLASH SSD1306AsciiWire::System5x7[] = {

    // Fixed width; char width table not used !!!!
+    // or with lowercase character omitted.

    // font data
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // (space) (20)
-    0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,  // ! (21)
-    0x00, 0x07, 0x00, 0x07, 0x00, 0x00,  // "
-    0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,  // #
-    0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,  // $
-    0x23, 0x13, 0x08, 0x64, 0x62, 0x00,  // %
-    0x36, 0x49, 0x55, 0x22, 0x50, 0x00,  // &
-    0x00, 0x05, 0x03, 0x00, 0x00, 0x00,  // '
-    0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,  // (
-    0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,  // )
-    0x08, 0x2A, 0x1C, 0x2A, 0x08, 0x00,  // *
-    0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,  // +
-    0x00, 0x50, 0x30, 0x00, 0x00, 0x00,  // ,
-    0x08, 0x08, 0x08, 0x08, 0x08, 0x00,  // -
-    0x00, 0x60, 0x60, 0x00, 0x00, 0x00,  // .
-    0x20, 0x10, 0x08, 0x04, 0x02, 0x00,  // / (47)
-    0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,  // 0 (48)
-    0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,  // 1
-    0x42, 0x61, 0x51, 0x49, 0x46, 0x00,  // 2
-    0x21, 0x41, 0x45, 0x4B, 0x31, 0x00,  // 3
-    0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,  // 4
-    0x27, 0x45, 0x45, 0x45, 0x39, 0x00,  // 5
-    0x3C, 0x4A, 0x49, 0x49, 0x30, 0x00,  // 6
-    0x01, 0x71, 0x09, 0x05, 0x03, 0x00,  // 7
-    0x36, 0x49, 0x49, 0x49, 0x36, 0x00,  // 8
-    0x06, 0x49, 0x49, 0x29, 0x1E, 0x00,  // 9 (57)
-    0x00, 0x36, 0x36, 0x00, 0x00, 0x00,  // :
-    0x00, 0x56, 0x36, 0x00, 0x00, 0x00,  // ;
-    0x00, 0x08, 0x14, 0x22, 0x41, 0x00,  // <
-    0x14, 0x14, 0x14, 0x14, 0x14, 0x00,  // =
-    0x41, 0x22, 0x14, 0x08, 0x00, 0x00,  // >
-    0x02, 0x01, 0x51, 0x09, 0x06, 0x00,  // ?
-    0x32, 0x49, 0x79, 0x41, 0x3E, 0x00,  // @ (64)
-    0x7E, 0x11, 0x11, 0x11, 0x7E, 0x00,  // A (65)
-    0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,  // B
-    0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,  // C
-    0x7F, 0x41, 0x41, 0x22, 0x1C, 0x00,  // D
-    0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,  // E
-    0x7F, 0x09, 0x09, 0x01, 0x01, 0x00,  // F
-    0x3E, 0x41, 0x41, 0x51, 0x32, 0x00,  // G
-    0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,  // H
-    0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,  // I
-    0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,  // J
-    0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,  // K
-    0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,  // L
-    0x7F, 0x02, 0x04, 0x02, 0x7F, 0x00,  // M
-    0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,  // N
-    0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,  // O
-    0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,  // P
-    0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,  // Q
-    0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,  // R
-    0x46, 0x49, 0x49, 0x49, 0x31, 0x00,  // S
-    0x01, 0x01, 0x7F, 0x01, 0x01, 0x00,  // T
-    0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,  // U
-    0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,  // V
-    0x7F, 0x20, 0x18, 0x20, 0x7F, 0x00,  // W
-    0x63, 0x14, 0x08, 0x14, 0x63, 0x00,  // X
-    0x03, 0x04, 0x78, 0x04, 0x03, 0x00,  // Y
-    0x61, 0x51, 0x49, 0x45, 0x43, 0x00,  // Z (90)
-    0x00, 0x00, 0x7F, 0x41, 0x41, 0x00,  // [
-    0x02, 0x04, 0x08, 0x10, 0x20, 0x00,  // "\"
-    0x41, 0x41, 0x7F, 0x00, 0x00, 0x00,  // ]
-    0x04, 0x02, 0x01, 0x02, 0x04, 0x00,  // ^
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x00,  // _
-    0x00, 0x01, 0x02, 0x04, 0x00, 0x00,  // ' (96)
+    0x00, 0x00, 0x00, 0x00, 0x00,  // (space)
+    0x00, 0x00, 0x5F, 0x00, 0x00,  // !
+    0x00, 0x07, 0x00, 0x07, 0x00,  // "
+    0x14, 0x7F, 0x14, 0x7F, 0x14,  // #
+    0x24, 0x2A, 0x7F, 0x2A, 0x12,  // $
+    0x23, 0x13, 0x08, 0x64, 0x62,  // %
+    0x36, 0x49, 0x55, 0x22, 0x50,  // &
+    0x00, 0x05, 0x03, 0x00, 0x00,  // '
+    0x00, 0x1C, 0x22, 0x41, 0x00,  // (
+    0x00, 0x41, 0x22, 0x1C, 0x00,  // )
+    0x08, 0x2A, 0x1C, 0x2A, 0x08,  // *
+    0x08, 0x08, 0x3E, 0x08, 0x08,  // +
+    0x00, 0x50, 0x30, 0x00, 0x00,  // ,
+    0x08, 0x08, 0x08, 0x08, 0x08,  // -
+    0x00, 0x60, 0x60, 0x00, 0x00,  // .
+    0x20, 0x10, 0x08, 0x04, 0x02,  // /
+    0x3E, 0x51, 0x49, 0x45, 0x3E,  // 0
+    0x00, 0x42, 0x7F, 0x40, 0x00,  // 1
+    0x42, 0x61, 0x51, 0x49, 0x46,  // 2
+    0x21, 0x41, 0x45, 0x4B, 0x31,  // 3
+    0x18, 0x14, 0x12, 0x7F, 0x10,  // 4
+    0x27, 0x45, 0x45, 0x45, 0x39,  // 5
+    0x3C, 0x4A, 0x49, 0x49, 0x30,  // 6
+    0x01, 0x71, 0x09, 0x05, 0x03,  // 7
+    0x36, 0x49, 0x49, 0x49, 0x36,  // 8
+    0x06, 0x49, 0x49, 0x29, 0x1E,  // 9
+    0x00, 0x36, 0x36, 0x00, 0x00,  // :
+    0x00, 0x56, 0x36, 0x00, 0x00,  // ;
+    0x00, 0x08, 0x14, 0x22, 0x41,  // <
+    0x14, 0x14, 0x14, 0x14, 0x14,  // =
+    0x41, 0x22, 0x14, 0x08, 0x00,  // >
+    0x02, 0x01, 0x51, 0x09, 0x06,  // ?
+    0x32, 0x49, 0x79, 0x41, 0x3E,  // @
+    0x7E, 0x11, 0x11, 0x11, 0x7E,  // A
+    0x7F, 0x49, 0x49, 0x49, 0x36,  // B
+    0x3E, 0x41, 0x41, 0x41, 0x22,  // C
+    0x7F, 0x41, 0x41, 0x22, 0x1C,  // D
+    0x7F, 0x49, 0x49, 0x49, 0x41,  // E
+    0x7F, 0x09, 0x09, 0x01, 0x01,  // F
+    0x3E, 0x41, 0x41, 0x51, 0x32,  // G
+    0x7F, 0x08, 0x08, 0x08, 0x7F,  // H
+    0x00, 0x41, 0x7F, 0x41, 0x00,  // I
+    0x20, 0x40, 0x41, 0x3F, 0x01,  // J
+    0x7F, 0x08, 0x14, 0x22, 0x41,  // K
+    0x7F, 0x40, 0x40, 0x40, 0x40,  // L
+    0x7F, 0x02, 0x04, 0x02, 0x7F,  // M
+    0x7F, 0x04, 0x08, 0x10, 0x7F,  // N
+    0x3E, 0x41, 0x41, 0x41, 0x3E,  // O
+    0x7F, 0x09, 0x09, 0x09, 0x06,  // P
+    0x3E, 0x41, 0x51, 0x21, 0x5E,  // Q
+    0x7F, 0x09, 0x19, 0x29, 0x46,  // R
+    0x46, 0x49, 0x49, 0x49, 0x31,  // S
+    0x01, 0x01, 0x7F, 0x01, 0x01,  // T
+    0x3F, 0x40, 0x40, 0x40, 0x3F,  // U
+    0x1F, 0x20, 0x40, 0x20, 0x1F,  // V
+    0x7F, 0x20, 0x18, 0x20, 0x7F,  // W
+    0x63, 0x14, 0x08, 0x14, 0x63,  // X
+    0x03, 0x04, 0x78, 0x04, 0x03,  // Y
+    0x61, 0x51, 0x49, 0x45, 0x43,  // Z
+    0x00, 0x00, 0x7F, 0x41, 0x41,  // [
+    0x02, 0x04, 0x08, 0x10, 0x20,  // "\"
+    0x41, 0x41, 0x7F, 0x00, 0x00,  // ]
+    0x04, 0x02, 0x01, 0x02, 0x04,  // ^
+    0x40, 0x40, 0x40, 0x40, 0x40,  // _
+    0x00, 0x01, 0x02, 0x04, 0x00,  // `
 #ifndef NOLOWERCASE
-    0x20, 0x54, 0x54, 0x54, 0x78, 0x00,  // a (97)
-    0x7F, 0x48, 0x44, 0x44, 0x38, 0x00,  // b
-    0x38, 0x44, 0x44, 0x44, 0x20, 0x00,  // c
-    0x38, 0x44, 0x44, 0x48, 0x7F, 0x00,  // d
-    0x38, 0x54, 0x54, 0x54, 0x18, 0x00,  // e
-    0x08, 0x7E, 0x09, 0x01, 0x02, 0x00,  // f
-    0x08, 0x14, 0x54, 0x54, 0x3C, 0x00,  // g
-    0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,  // h
-    0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,  // i
-    0x20, 0x40, 0x44, 0x3D, 0x00, 0x00,  // j
-    0x00, 0x7F, 0x10, 0x28, 0x44, 0x00,  // k
-    0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,  // l
-    0x7C, 0x04, 0x18, 0x04, 0x78, 0x00,  // m
-    0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,  // n
-    0x38, 0x44, 0x44, 0x44, 0x38, 0x00,  // o
-    0x7C, 0x14, 0x14, 0x14, 0x08, 0x00,  // p
-    0x08, 0x14, 0x14, 0x18, 0x7C, 0x00,  // q
-    0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,  // r
-    0x48, 0x54, 0x54, 0x54, 0x20, 0x00,  // s
-    0x04, 0x3F, 0x44, 0x40, 0x20, 0x00,  // t
-    0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,  // u
-    0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,  // v
-    0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,  // w
-    0x44, 0x28, 0x10, 0x28, 0x44, 0x00,  // x
-    0x0C, 0x50, 0x50, 0x50, 0x3C, 0x00,  // y
-    0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,  // z (122)
+    0x20, 0x54, 0x54, 0x54, 0x78,  // a
+    0x7F, 0x48, 0x44, 0x44, 0x38,  // b
+    0x38, 0x44, 0x44, 0x44, 0x20,  // c
+    0x38, 0x44, 0x44, 0x48, 0x7F,  // d
+    0x38, 0x54, 0x54, 0x54, 0x18,  // e
+    0x08, 0x7E, 0x09, 0x01, 0x02,  // f
+    0x08, 0x14, 0x54, 0x54, 0x3C,  // g
+    0x7F, 0x08, 0x04, 0x04, 0x78,  // h
+    0x00, 0x44, 0x7D, 0x40, 0x00,  // i
+    0x20, 0x40, 0x44, 0x3D, 0x00,  // j
+    0x00, 0x7F, 0x10, 0x28, 0x44,  // k
+    0x00, 0x41, 0x7F, 0x40, 0x00,  // l
+    0x7C, 0x04, 0x18, 0x04, 0x78,  // m
+    0x7C, 0x08, 0x04, 0x04, 0x78,  // n
+    0x38, 0x44, 0x44, 0x44, 0x38,  // o
+    0x7C, 0x14, 0x14, 0x14, 0x08,  // p
+    0x08, 0x14, 0x14, 0x18, 0x7C,  // q
+    0x7C, 0x08, 0x04, 0x04, 0x08,  // r
+    0x48, 0x54, 0x54, 0x54, 0x20,  // s
+    0x04, 0x3F, 0x44, 0x40, 0x20,  // t
+    0x3C, 0x40, 0x40, 0x20, 0x7C,  // u
+    0x1C, 0x20, 0x40, 0x20, 0x1C,  // v
+    0x3C, 0x40, 0x30, 0x40, 0x3C,  // w
+    0x44, 0x28, 0x10, 0x28, 0x44,  // x
+    0x0C, 0x50, 0x50, 0x50, 0x3C,  // y
+    0x44, 0x64, 0x54, 0x4C, 0x44,  // z
 #endif
-    0x00, 0x08, 0x36, 0x41, 0x00, 0x00,  // { (123)
-    0x00, 0x00, 0x7F, 0x00, 0x00, 0x00,  // |
-    0x00, 0x41, 0x36, 0x08, 0x00, 0x00,  // }
-    0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,  // ->
-    0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,  // <- (127)
-#ifndef NO_EXTENDED_CHARACTERS
-// Extended characters - based on "DOS Western Europe" characters
-//   International characters not yet implemented.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented 0x80
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented 0x90
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x38, 0x44, 0xc6, 0x44, 0x20, 0x00,  // cent 0x9b
-    0x44, 0x6e, 0x59, 0x49, 0x62, 0x00,  // £ 0x9c
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented 0xa0
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x10, 0x28, 0x54, 0x28, 0x44, 0x00,  // <<
-    0x44, 0x28, 0x54, 0x28, 0x10, 0x00,  // >>
-    // Extended characters 176-180
-    0x92, 0x00, 0x49, 0x00, 0x24, 0x00,  // Light grey 0xb0
-    0xaa, 0x44, 0xaa, 0x11, 0xaa, 0x55,  // Mid grey 0xb1
-    0x6d, 0xff, 0xb6, 0xff, 0xdb, 0xff,  // Dark grey 0xb2
-    0x00, 0x00, 0x00, 0xff, 0x00, 0x00,  // Vertical line 0xb3
-    0x08, 0x08, 0x08, 0xff, 0x00, 0x00,  // Vertical line with left spur 0xb4
+    0x00, 0x08, 0x36, 0x41, 0x00,  // {
+    0x00, 0x00, 0x7F, 0x00, 0x00,  // |
+    0x00, 0x41, 0x36, 0x08, 0x00,  // }
+    0x08, 0x08, 0x2A, 0x1C, 0x08,  // ->
+    0x08, 0x1C, 0x2A, 0x08, 0x08,  // <-
+    0x00, 0x06, 0x09, 0x09, 0x06   // degree symbol

-    0x14, 0x14, 0x14, 0xff, 0x00, 0x00,  // Vertical line with double left spur 0xb5
-    0x08, 0x08, 0xff, 0x00, 0xff, 0x00,  // Double vertical line with single left spur
-    0x08, 0x08, 0xf8, 0x08, 0xf8, 0x00,  // Top right corner, single horiz, double vert
-    0x14, 0x14, 0x14, 0xfc, 0x00, 0x00,  // Top right corner, double horiz, single vert
-
-    // Extended characters 185-190
-    0x14, 0x14, 0xf7, 0x00, 0xff, 0x00,  // Double vertical line with double left spur 0xb9
-    0x00, 0x00, 0xff, 0x00, 0xff, 0x00,  // Double vertical line 0xba
-    0x14, 0x14, 0xf4, 0x04, 0xfc, 0x00,  // Double top right corner 0xbb
-    0x14, 0x14, 0x17, 0x10, 0x1f, 0x00,  // Double bottom right corner 0xbc
-    0x08, 0x08, 0x0f, 0x08, 0x0f, 0x00,  // Bottom right corner, single horiz, double vert 0xbd
-    0x14, 0x14, 0x14, 0x1f, 0x00, 0x00,  // Bottom right corner, double horiz, single vert 0xbe
-
-    // Extended characters 191-199
-    0x08, 0x08, 0x08, 0xf8, 0x00, 0x00,  // Top right corner 0xbf
-    0x00, 0x00, 0x00, 0x0f, 0x08, 0x08,  // Bottom left corner 0xc0
-    0x08, 0x08, 0x08, 0x0f, 0x08, 0x08,  // Horizontal line with upward spur 0xc1
-    0x08, 0x08, 0x08, 0xf8, 0x08, 0x08,  // Horizontal line with downward spur 0xc2
-    0x00, 0x00, 0x00, 0xff, 0x08, 0x08,  // Vertical line with right spur 0xc3
-    0x08, 0x08, 0x08, 0x08, 0x08, 0x08,  // Horizontal line 0xc4
-    0x08, 0x08, 0x08, 0xff, 0x08, 0x08,  // Cross 0xc5
-    0x00, 0x00, 0x00, 0xff, 0x14, 0x14,  // Vertical line double right spur 0xc6
-    0x00, 0x00, 0xff, 0x00, 0xff, 0x08,  // Double vertical line single right spur 0xc7
-
-    // Extended characters 200-206
-    0x00, 0x00, 0x1f, 0x10, 0x17, 0x14,  // Double bottom left corner 0xc8
-    0x00, 0x00, 0xfc, 0x04, 0xf4, 0x14,  // Double top left corner 0xc9
-    0x14, 0x14, 0x17, 0x10, 0x17, 0x14,  // Double horizontal with double upward spur 0xca
-    0x14, 0x14, 0xf4, 0x04, 0xf4, 0x14,  // Double horizontal with double downward spur 0xcb
-    0x00, 0x00, 0xff, 0x00, 0xf7, 0x14,  // Double vertical line with double right spur 0xcc
-    0x14, 0x14, 0x14, 0x14, 0x14, 0x14,  // Double horizontal line 0xcd
-    0x14, 0x14, 0xf7, 0x00, 0xf7, 0x14,  // Double cross 0xce
-
-    0x14, 0x14, 0x14, 0x17, 0x14, 0x14,  // Double horizontal line single upward spur 0xcf
-    0x08, 0x08, 0x0f, 0x08, 0x0f, 0x08,  // Horiz single line with double upward spur 0xd0
-    0x14, 0x14, 0x14, 0xf4, 0x14, 0x14,  // Horiz double line with single downward spur 0xd1
-    0x08, 0x08, 0xf8, 0x08, 0xf8, 0x08,  // Horiz single line with double downward spur 0xd2
-    0x00, 0x00, 0x0f, 0x08, 0x0f, 0x08,  // Bottom left corner, double vert single horiz 0xd3
-    0x00, 0x00, 0x00, 0x1f, 0x14, 0x14,  // Bottom left corner, single vert double horiz 0xd4
-    0x00, 0x00, 0x00, 0xfc, 0x14, 0x14,  // Top left corner, single vert double horiz 0xd5
-    0x00, 0x00, 0xf8, 0x08, 0xf8, 0x08,  // Top left corner, double vert single horiz 0xd6
-    0x08, 0x08, 0xff, 0x00, 0xff, 0x08,  // Cross, double vert single horiz 0xd7
-    0x14, 0x14, 0x14, 0xf7, 0x14, 0x14,  // Cross, single vert double horiz 0xd8
-
-    // Extended characters 217-223
-    0x08, 0x08, 0x08, 0x0f, 0x00, 0x00,  // Bottom right corner 0xd9
-    0x00, 0x00, 0x00, 0xf8, 0x08, 0x08,  // Top left corner 0xda
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff,  // Solid block 0xdb
-    0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,  // Bottom half block 0xdc
-    0xff, 0xff, 0xff, 0x00, 0x00, 0x00,  // Left half block 0xdd
-    0x00, 0x00, 0x00, 0xff, 0xff, 0xff,  // Right half block 0xde
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,  // Top half block 0xdf
-
-    0xf0, 0xf0, 0xf0, 0x00, 0x00, 0x00,  // Bottom Left block 0xe0
-    0x00, 0x00, 0x00, 0xf0, 0xf0, 0xf0,  // Bottom Right block
-    0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00,  // Top left block 
-    0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f,  // Top right block 0xe3
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented 0xf0
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // Not implemented
-    // Extended character 248
-    0x00, 0x06, 0x09, 0x09, 0x06, 0x00   // degree symbol 0xf8
-#endif
 };
-
-const uint8_t SSD1306AsciiWire::m_fontCharCount = sizeof(System6x8) / 6;
--- a/SSD1306Ascii.h
+++ b/SSD1306Ascii.h
@@ -23,28 +23,24 @@

 #include "Arduino.h"
 #include "FSH.h"
-#include "Display.h"
+#include "LCDDisplay.h"

 #include "I2CManager.h"
 #include "DIAG.h"
-#include "DisplayInterface.h"

 // Uncomment to remove lower-case letters to save 108 bytes of flash
 //#define NOLOWERCASE

-
-
 //------------------------------------------------------------------------------
 // Constructor
-class SSD1306AsciiWire : public DisplayDevice {
+class SSD1306AsciiWire : public LCDDisplay {
 public:

-  // Constructors
-  SSD1306AsciiWire(int width, int height); // Auto-detects I2C address
-  SSD1306AsciiWire(I2CAddress address, int width, int height);  
+  // Constructor
+  SSD1306AsciiWire(int width, int height);

  // Initialize the display controller.
-  bool begin();
+  void begin(uint8_t i2cAddr);

  // Clear the display and set the cursor to (0, 0).
  void clearNative() override;
@@ -56,8 +52,6 @@ class SSD1306AsciiWire : public DisplayDevice {
  size_t writeNative(uint8_t c) override;

  bool isBusy() override { return requestBlock.isBusy(); }
-  uint16_t getNumCols() { return m_charsPerRow; }
-  uint16_t getNumRows() { return m_charsPerColumn; }

 private:
  // Cursor column.
@@ -68,31 +62,26 @@ class SSD1306AsciiWire : public DisplayDevice {
  uint8_t m_displayWidth;
  // Display height.
  uint8_t m_displayHeight;
-  // Display width in characters
-  uint8_t m_charsPerRow;
-  // Display height in characters
-  uint8_t m_charsPerColumn;
  // Column offset RAM to SEG.
  uint8_t m_colOffset = 0;
  // Current font.
-  const uint8_t* const m_font = System6x8;
-  // Flag to prevent calling begin() twice
-  uint8_t m_initialised = false;
+  const uint8_t* const m_font = System5x7;

-  // Only fixed size 6x8 fonts in a 6x8 cell are supported.
-  static const uint8_t fontWidth = 6;
-  static const uint8_t fontHeight = 8;
+  // Only fixed size 5x7 fonts in a 6x8 cell are supported.
+  static const uint8_t fontWidth = 5;
+  static const uint8_t fontHeight = 7;
+  static const uint8_t letterSpacing = 1;
  static const uint8_t m_fontFirstChar = 0x20;
-  static const uint8_t m_fontCharCount;
+  static const uint8_t m_fontCharCount = 0x61;

-  I2CAddress m_i2cAddr = 0;
+  uint8_t m_i2cAddr;

  I2CRB requestBlock;
-  uint8_t outputBuffer[fontWidth+1];
+  uint8_t outputBuffer[fontWidth+letterSpacing+1];

  static const uint8_t blankPixels[];

-  static const uint8_t System6x8[];
+  static const uint8_t System5x7[];
  static const uint8_t FLASH Adafruit128xXXinit[];
  static const uint8_t FLASH SH1106_132x64init[];
 };
--- a/SerialManager.cpp
+++ b/SerialManager.cpp
@@ -87,9 +87,6 @@ void SerialManager::init() {
    delay(1000);
  }
 #endif
-#ifdef SABERTOOTH
-  Serial2.begin(9600, SERIAL_8N1, 16, 17); // GPIO 16 RXD2; GPIO 17 TXD2 on ESP32
-#endif
 }

 void SerialManager::broadcast(char * stringBuffer) {
--- a/StringFormatter.cpp
+++ b/StringFormatter.cpp
@@ -18,7 +18,7 @@
 */
 #include "StringFormatter.h"
 #include <stdarg.h>
-#include "DisplayInterface.h"
+#include "LCDDisplay.h"

 bool Diag::ACK=false;
 bool Diag::CMD=false;
@@ -45,17 +45,10 @@ void StringFormatter::lcd(byte row, const FSH* input...) {
  send2(&USB_SERIAL,input,args);
  send(&USB_SERIAL,F(" *>\n"));
  
-  DisplayInterface::setRow(row);    
+  if (!LCDDisplay::lcdDisplay) return;
+  LCDDisplay::lcdDisplay->setRow(row);    
  va_start(args, input);
-  send2(DisplayInterface::getDisplayHandler(),input,args);
-}
-
-void StringFormatter::lcd2(uint8_t display, byte row, const FSH* input...) {
-  va_list args;
-
-  DisplayInterface::setRow(display, row);    
-  va_start(args, input);
-  send2(DisplayInterface::getDisplayHandler(),input,args);
+  send2(LCDDisplay::lcdDisplay,input,args);
 }

 void StringFormatter::send(Print * stream, const FSH* input...) {
@@ -115,26 +108,7 @@ void StringFormatter::send2(Print * stream,const FSH* format, va_list args) {
      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((unsigned int)va_arg(args, unsigned int), HEX); break;
-      case 'X': stream->print((unsigned long)va_arg(args, unsigned long), HEX); break;
-      case 'M':
-      { // this prints a unsigned long microseconds time in readable format
-	unsigned long time = va_arg(args, long);
-	if (time >= 2000) {
-	  time = time / 1000;
-	  if (time >= 2000) {
-	    printPadded(stream, time/1000, formatWidth, formatLeft);
-	    stream->print(F("sec"));
-	  } else {
-	    printPadded(stream,time, formatWidth, formatLeft);
-	    stream->print(F("msec"));
-	  }
-	} else {
-	  printPadded(stream,time, formatWidth, formatLeft);
-	  stream->print(F("usec"));
-	}
-      }
-      break;
+      case 'x': stream->print(va_arg(args, int), HEX); break;
      //case 'f': stream->print(va_arg(args, double), 2); break;
      //format width prefix
      case '-': 
--- a/StringFormatter.h
+++ b/StringFormatter.h
@@ -21,7 +21,7 @@
 #include <Arduino.h>
 #include "FSH.h"
 #include "RingStream.h"
-#include "Display.h"
+#include "LCDDisplay.h"
 class Diag {
  public:
  static bool ACK;
@@ -46,7 +46,6 @@ class StringFormatter
    // DIAG support
    static void diag( const FSH* input...);
    static void lcd(byte row, const FSH* input...);
-    static void lcd2(uint8_t display, byte row, const FSH* input...);
    static void printEscapes(char * input);
    static void printEscape( char c);

--- a/TrackManager.cpp
+++ b/TrackManager.cpp
@@ -25,26 +25,24 @@
 #include "MotorDriver.h"
 #include "DCCTimer.h"
 #include "DIAG.h"
-#include"CommandDistributor.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 (track[t]->getMode()==findmode)	\
+            if (trackMode[t]==findmode) \
                track[t]->function;
-#ifndef DISABLE_PROG
+
 const int16_t HASH_KEYWORD_PROG = -29718;
-#endif
 const int16_t HASH_KEYWORD_MAIN = 11339;
 const int16_t HASH_KEYWORD_OFF = 22479;  
-const int16_t HASH_KEYWORD_NONE = -26550;
 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;
@@ -74,7 +72,7 @@ void TrackManager::sampleCurrent() {
    waiting = false;
    tr++;
    if (tr > lastTrack) tr = 0;
-    if (lastTrack < 2 || track[tr]->getMode() & TRACK_MODE_PROG) {
+    if (lastTrack < 2 || trackMode[tr] & TRACK_MODE_PROG) {
      return; // We could continue but for prog track we
              // rather do it in next interrupt beacuse
              // that gives us well defined sampling point.
@@ -85,7 +83,7 @@ void TrackManager::sampleCurrent() {
  if (!waiting) {
    // look for a valid track to sample or until we are around
    while (true) {
-      if (track[tr]->getMode() & ( TRACK_MODE_MAIN|TRACK_MODE_PROG|TRACK_MODE_DC|TRACK_MODE_DCX|TRACK_MODE_EXT )) {
+      if (trackMode[tr] & ( TRACK_MODE_MAIN|TRACK_MODE_PROG|TRACK_MODE_DC|TRACK_MODE_DCX|TRACK_MODE_EXT )) {
 	track[tr]->startCurrentFromHW();
 	// for scope debug track[1]->setBrake(1);
 	waiting = true;
@@ -117,32 +115,19 @@ void TrackManager::Setup(const FSH * shieldname,
    
    // Default the first 2 tracks (which may be null) and perform HA waveform check.
    setTrackMode(0,TRACK_MODE_MAIN);
-#ifndef DISABLE_PROG
    setTrackMode(1,TRACK_MODE_PROG);
-#else
-    setTrackMode(1,TRACK_MODE_MAIN);
-#endif
  
-  // Fault pin config for odd motor boards (example pololu)
-  FOR_EACH_TRACK(t) {
-    for (byte s=t+1;s<=lastTrack;s++) {
-      if (track[t]->getFaultPin() != UNUSED_PIN &&
-	  track[t]->getFaultPin() == track[s]->getFaultPin()) {
-	track[t]->setCommonFaultPin();
-	track[s]->setCommonFaultPin();
-	DIAG(F("Common Fault pin tracks %c and %c"), t+'A', s+'A');
-      }
-    }
-  }
-  DCC::setShieldName(shieldname);
+  // 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);
-         track[t]->setMode(TRACK_MODE_NONE);
-	 track[t]->setTrackLetter('A'+t);
         lastTrack=t;
     } 
 }
@@ -183,26 +168,21 @@ void TrackManager::setPROGSignal( bool on) {
 void TrackManager::setDCSignal(int16_t cab, byte speedbyte) {
  FOR_EACH_TRACK(t) {
    if (trackDCAddr[t]!=cab) continue;
-    if (track[t]->getMode()==TRACK_MODE_DC) track[t]->setDCSignal(speedbyte);
-    else if (track[t]->getMode()==TRACK_MODE_DCX) track[t]->setDCSignal(speedbyte ^ 128);
+    if (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 Mode=%d"),trackToSet+'A', mode);
-    // DC tracks require a motorDriver that can set brake!
-    if (mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX) {
-#if defined(ARDUINO_AVR_UNO)
-      DIAG(F("Uno has no PWM timers available for DC"));
-      return false;
-#endif
-      if (!track[trackToSet]->brakeCanPWM()) {
-	DIAG(F("Brake pin can't PWM: No DC"));
-	return false;
-      }
-    }
+    //DIAG(F("Track=%c"),trackToSet+'A');
+    // DC tracks require a motorDriver that can set power pin PWM
+    if ((mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX)
+         && !track[trackToSet]->powerPinCanPWM()) {
+             DIAG(F("Power pin can't PWM: No DC"));
+             return false; 
+         }

 #ifdef ARDUINO_ARCH_ESP32
    // remove pin from MUX matrix and turn it off
@@ -216,27 +196,21 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
      pinMode(p.invpin, OUTPUT); // gpio_reset_pin may reset to input
    }
 #endif
-#ifndef DISABLE_PROG
    if (mode==TRACK_MODE_PROG) {
-#else
-    if (false) {
-#endif
      // only allow 1 track to be prog
      FOR_EACH_TRACK(t)
-	if (track[t]->getMode()==TRACK_MODE_PROG && t != trackToSet) {
+	if (trackMode[t]==TRACK_MODE_PROG && t != trackToSet) {
 	  track[t]->setPower(POWERMODE::OFF);
-	  track[t]->setMode(TRACK_MODE_NONE);
+	  trackMode[t]=TRACK_MODE_OFF;
 	  track[t]->makeProgTrack(false);     // revoke prog track special handling
-    streamTrackState(NULL,t);
 	}
      track[trackToSet]->makeProgTrack(true); // set for prog track special handling
    } else {
      track[trackToSet]->makeProgTrack(false); // only the prog track knows it's type
    }
-    track[trackToSet]->setMode(mode);
+    trackMode[trackToSet]=mode;
    trackDCAddr[trackToSet]=dcAddr;
-    streamTrackState(NULL,trackToSet);
-
+    
    // When a track is switched, we must clear any side effects of its previous 
    // state, otherwise trains run away or just dont move.

@@ -244,7 +218,6 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
    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
@@ -260,7 +233,7 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
      // DC tracks must not have the DCC PWM switched on
      // so we globally turn it off if one of the PWM
      // capable tracks is now DC or DCX.
-      if (track[t]->getMode()==TRACK_MODE_DC || track[t]->getMode()==TRACK_MODE_DCX) {
+      if (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
@@ -268,7 +241,7 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
 	  track[t]->trackPWM=false; // this track sure can not run with PWM
 	  //DIAG(F("Track %c trackPWM 0 (not capable)"), t+'A');
 	}
-      } else if (track[t]->getMode()==TRACK_MODE_MAIN || track[t]->getMode()==TRACK_MODE_PROG) {
+      } else if (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;
@@ -306,7 +279,7 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr

 void TrackManager::applyDCSpeed(byte t) {
  uint8_t speedByte=DCC::getThrottleSpeedByte(trackDCAddr[t]);
-  if (track[t]->getMode()==TRACK_MODE_DCX)
+  if (trackMode[t]==TRACK_MODE_DCX)
    speedByte = speedByte ^ 128; // reverse direction bit
  track[t]->setDCSignal(speedByte);
 }
@@ -316,7 +289,36 @@ bool TrackManager::parseJ(Print *stream, int16_t params, int16_t p[])
    
    if (params==0) { // <=>  List track assignments
        FOR_EACH_TRACK(t)
-             streamTrackState(stream,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;
    }
    
@@ -328,13 +330,11 @@ bool TrackManager::parseJ(Print *stream, int16_t params, int16_t p[])
    if (params==2  && p[1]==HASH_KEYWORD_MAIN) // <= id MAIN>
        return setTrackMode(p[0],TRACK_MODE_MAIN);
    
-#ifndef DISABLE_PROG
    if (params==2  && p[1]==HASH_KEYWORD_PROG) // <= id PROG>
        return setTrackMode(p[0],TRACK_MODE_PROG);
-#endif
    
-    if (params==2  && (p[1]==HASH_KEYWORD_OFF || p[1]==HASH_KEYWORD_NONE)) // <= id OFF> <= id NONE>
-        return setTrackMode(p[0],TRACK_MODE_NONE);
+    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);
@@ -348,57 +348,23 @@ bool TrackManager::parseJ(Print *stream, int16_t params, int16_t p[])
    return false;
 }

-void TrackManager::streamTrackState(Print* stream, byte t) {
-  // null stream means send to commandDistributor for broadcast
-  if (track[t]==NULL) return;
-  auto format=F("");
-  switch(track[t]->getMode()) {
-  case TRACK_MODE_MAIN:
-      format=F("<= %c MAIN>\n");
-      break;
-#ifndef DISABLE_PROG
-  case TRACK_MODE_PROG:
-      format=F("<= %c PROG>\n");
-      break;
-#endif
-  case TRACK_MODE_NONE:
-      format=F("<= %c NONE>\n");
-      break;
-  case TRACK_MODE_EXT:
-      format=F("<= %c EXT>\n");
-      break;
-  case TRACK_MODE_DC:
-      format=F("<= %c DC %d>\n");
-      break;
-  case TRACK_MODE_DCX:
-      format=F("<= %c DCX %d>\n");
-      break;
-  default:
-      break; // unknown, dont care    
-  }
-  if (stream) StringFormatter::send(stream,format,'A'+t,trackDCAddr[t]);
-  else CommandDistributor::broadcastTrackState(format,'A'+t,trackDCAddr[t]);
-}
-
 byte TrackManager::nextCycleTrack=MAX_TRACKS;

 void TrackManager::loop() {
-    DCCWaveform::loop();
-#ifndef DISABLE_PROG
-    DCCACK::loop();
-#endif
+    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: track[nextCycleTrack]->getMode()==TRACK_MODE_PROG;
+    bool useProgLimit=dontLimitProg? false: trackMode[nextCycleTrack]==TRACK_MODE_PROG;
    motorDriver->checkPowerOverload(useProgLimit, nextCycleTrack);   
 }

 MotorDriver * TrackManager::getProgDriver() {
    FOR_EACH_TRACK(t)
-      if (track[t]->getMode()==TRACK_MODE_PROG) return track[t];
+        if (trackMode[t]==TRACK_MODE_PROG) return track[t];
    return NULL;
 } 

@@ -406,7 +372,7 @@ MotorDriver * TrackManager::getProgDriver() {
 std::vector<MotorDriver *>TrackManager::getMainDrivers() {
  std::vector<MotorDriver *>  v;
  FOR_EACH_TRACK(t)
-    if (track[t]->getMode()==TRACK_MODE_MAIN) v.push_back(track[t]);
+    if (trackMode[t]==TRACK_MODE_MAIN) v.push_back(track[t]);
  return v;
 }
 #endif
@@ -416,7 +382,7 @@ void TrackManager::setPower2(bool setProg,POWERMODE mode) {
    FOR_EACH_TRACK(t) {
        MotorDriver * driver=track[t]; 
        if (!driver) continue; 
-        switch (track[t]->getMode()) {
+        switch (trackMode[t]) {
            case TRACK_MODE_MAIN:
                if (setProg) break; 
                // toggle brake before turning power on - resets overcurrent error
@@ -429,7 +395,6 @@ void TrackManager::setPower2(bool setProg,POWERMODE mode) {
            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;  
@@ -444,7 +409,7 @@ void TrackManager::setPower2(bool setProg,POWERMODE mode) {
 	        driver->setBrake(false);
 		driver->setPower(mode);
 	        break;
-            case TRACK_MODE_NONE:
+            case TRACK_MODE_OFF:
                break;
        }
    }
@@ -452,39 +417,11 @@ void TrackManager::setPower2(bool setProg,POWERMODE mode) {
  
 POWERMODE TrackManager::getProgPower() {
    FOR_EACH_TRACK(t)
-      if (track[t]->getMode()==TRACK_MODE_PROG) 
-	return track[t]->getPower();
+        if (trackMode[t]==TRACK_MODE_PROG) 
+                return track[t]->getPower();
    return POWERMODE::OFF;   
  }
-
-void TrackManager::reportObsoleteCurrent(Print* stream) {
-  // This function is for backward JMRI compatibility only
-  // It reports the first track only, as main, regardless of track settings.
-  //  <c MeterName value C/V unit min max res warn>
-  int maxCurrent=track[0]->raw2mA(track[0]->getRawCurrentTripValue());
-  StringFormatter::send(stream, F("<c CurrentMAIN %d C Milli 0 %d 1 %d>\n"), 
-            track[0]->raw2mA(track[0]->getCurrentRaw(false)), maxCurrent, maxCurrent);                  
-}
-
-void TrackManager::reportCurrent(Print* stream) {
-    StringFormatter::send(stream,F("<jI"));
-    FOR_EACH_TRACK(t) {
-         StringFormatter::send(stream, F(" %d"),
-         (track[t]->getPower()==POWERMODE::OVERLOAD) ? -1 :
-            track[t]->raw2mA(track[t]->getCurrentRaw(false)));
-         }
-    StringFormatter::send(stream,F(">\n"));    
-}
-
-void TrackManager::reportGauges(Print* stream) {
-    StringFormatter::send(stream,F("<jG"));
-    FOR_EACH_TRACK(t) {
-         StringFormatter::send(stream, F(" %d"),
-            track[t]->raw2mA(track[t]->getRawCurrentTripValue()));
-         }
-    StringFormatter::send(stream,F(">\n"));    
-}
-
+   
 void TrackManager::setJoinRelayPin(byte joinRelayPin) {
  joinRelay=joinRelayPin;
  if (joinRelay!=UNUSED_PIN) {
@@ -497,7 +434,7 @@ void TrackManager::setJoin(bool joined) {
 #ifdef ARDUINO_ARCH_ESP32
  if (joined) {
    FOR_EACH_TRACK(t) {
-      if (track[t]->getMode()==TRACK_MODE_PROG) {
+      if (trackMode[t]==TRACK_MODE_PROG) {
 	tempProgTrack = t;
 	setTrackMode(t, TRACK_MODE_MAIN);
 	break;
--- a/TrackManager.h
+++ b/TrackManager.h
@@ -27,6 +27,10 @@
 #include "MotorDriver.h"
 // Virtualised Motor shield multi-track hardware Interface

+// use powers of two so we can do logical and/or on the track modes in if clauses.
+enum TRACK_MODE : byte {TRACK_MODE_OFF = 1, TRACK_MODE_MAIN = 2, TRACK_MODE_PROG = 4,
+                        TRACK_MODE_DC = 8, TRACK_MODE_DCX = 16, TRACK_MODE_EXT = 32};
+
 // 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;    
@@ -73,22 +77,10 @@ class TrackManager {
    static bool isJoined() { return progTrackSyncMain;}
    static void setJoinRelayPin(byte joinRelayPin);
    static void sampleCurrent();
-    static void reportGauges(Print* stream);
-    static void reportCurrent(Print* stream);
-    static void reportObsoleteCurrent(Print* stream); 
-    static void streamTrackState(Print* stream, byte t);
-
    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
-
-#ifdef DEBUG_ADC
-  public:
-#else
-  private:
-#endif
-    static MotorDriver* track[MAX_TRACKS];
-
+     static bool progTrackBoosted;   // true when prog track is not current limited
+    
  private:
    static void addTrack(byte t, MotorDriver* driver);
    static byte lastTrack;
@@ -96,6 +88,8 @@ class TrackManager {
    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
--- a/Turnouts.cpp
+++ b/Turnouts.cpp
@@ -110,40 +110,49 @@
  /* static */ bool Turnout::setClosedStateOnly(uint16_t id, bool closeFlag) {
    Turnout *tt = get(id);
    if (!tt) return false;
+    tt->_turnoutData.closed = closeFlag;
+
    // I know it says setClosedStateOnly, but we need to tell others
-    // that the state has changed too. But we only broadcast if there
-    // really has been a change.
-    if (tt->_turnoutData.closed != closeFlag) {
-      tt->_turnoutData.closed = closeFlag;
-      CommandDistributor::broadcastTurnout(id, closeFlag);
-    }
-#if defined(EXRAIL_ACTIVE)
-    RMFT2::turnoutEvent(id, closeFlag);
-#endif
+    //  that the state has changed too.
+    #if defined(EXRAIL_ACTIVE)
+      RMFT2::turnoutEvent(id, closeFlag);
+    #endif
+
+    CommandDistributor::broadcastTurnout(id, closeFlag);
    return true;
  }

-#define DIAG_IO
+
  // 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)
-    DIAG(F("Turnout(%d,%c)"), id, closeFlag ? 'c':'t');
-#endif
+  #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) {
-      tt->setClosedStateOnly(id, closeFlag);
+      
 #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);
 #endif
+
+    #if defined(EXRAIL_ACTIVE)
+      RMFT2::turnoutEvent(id, closeFlag);
+    #endif
+
+      // Send message to JMRI etc.
+      CommandDistributor::broadcastTurnout(id, closeFlag);
    }
    return ok;
  }
@@ -198,7 +207,7 @@
    }

 #ifdef EESTOREDEBUG
-    printAll(&USB_SERIAL);
+    printAll(&Serial);
 #endif
    return tt;
  }
@@ -250,7 +259,6 @@
      }
    }
    tt = (Turnout *)new ServoTurnout(id, vpin, thrownPosition, closedPosition, profile, closed);
-    DIAG(F("Turnout 0x%x size %d size %d"), tt, sizeof(Turnout),sizeof(struct TurnoutData));
    IODevice::writeAnalogue(vpin, closed ? closedPosition : thrownPosition, PCA9685::Instant);
    return tt;
 #else
@@ -290,6 +298,7 @@
 #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
@@ -387,6 +396,7 @@
    // 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;
  }

@@ -462,6 +472,7 @@

  bool VpinTurnout::setClosedInternal(bool close) {
    IODevice::write(_vpinTurnoutData.vpin, close);
+    _turnoutData.closed = close;
    return true;
  }

@@ -512,10 +523,7 @@
  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.
-    // but in this implementation it is updated in setClosedStateOnly() instead.
-    // If the LCN master updates this, setClosedStateOnly() and all setClosedInternal()
-    // have to be updated accordingly so that the closed flag is only set once.
+    // The _turnoutData.closed flag should be updated by a message from the LCN master, later.
    return true;
  }

--- a/Turnouts.h
+++ b/Turnouts.h
@@ -69,12 +69,10 @@ protected:
    uint16_t id;
  } _turnoutData;  // 3 bytes

-#ifndef DISABLE_EEPROM
  // 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;
-#endif

  // Pointer to next turnout on linked list.
  Turnout *_nextTurnout = 0;
--- a/WiThrottle.cpp
+++ b/WiThrottle.cpp
@@ -235,10 +235,6 @@ int WiThrottle::getLocoId(byte * cmd) {
 void WiThrottle::multithrottle(RingStream * stream, byte * cmd){ 
  char throttleChar=cmd[1];
  int locoid=getLocoId(cmd+3); // -1 for *
-  if (locoid > 10239 || locoid < -1) {
-    StringFormatter::send(stream, F("No valid DCC loco %d\n"), locoid);
-    return;
-  }
  byte * aval=cmd;
  while(*aval !=';' && *aval !='\0') aval++;
  if (*aval) aval+=2;  // skip ;>
@@ -531,13 +527,10 @@ void WiThrottle::sendRoster(Print* stream) {
  rosterSent=true;
 #ifdef EXRAIL_ACTIVE
  StringFormatter::send(stream,F("RL%d"), RMFT2::rosterNameCount);
-  for (int16_t r=0;;r++) {
+  for (int16_t r=0;r<RMFT2::rosterNameCount;r++) {
      int16_t cabid=GETHIGHFLASHW(RMFT2::rosterIdList,r*2);
-      if (cabid == INT16_MAX)
-	break;
-      if (cabid > 0)
-	StringFormatter::send(stream,F("]\\[%S}|{%d}|{%c"),
-			      RMFT2::getRosterName(cabid),cabid,cabid<128?'S':'L');
+      StringFormatter::send(stream,F("]\\[%S}|{%d}|{%c"),
+      RMFT2::getRosterName(cabid),cabid,cabid<128?'S':'L');
  }
  StringFormatter::send(stream,F("\n"));       
 #else
@@ -551,14 +544,14 @@ void WiThrottle::sendRoutes(Print* stream) {
    // first pass automations
    for (int ix=0;;ix+=2) {
        int16_t id =GETHIGHFLASHW(RMFT2::automationIdList,ix);
-        if (id==INT16_MAX) break;
+        if (id==0) break;
        const FSH * desc=RMFT2::getRouteDescription(id);
        StringFormatter::send(stream,F("]\\[A%d}|{%S}|{4"),id,desc);
    }
    // second pass routes.
    for (int ix=0;;ix+=2) {
        int16_t id=GETHIGHFLASHW(RMFT2::routeIdList,ix);
-        if (id==INT16_MAX) break;
+        if (id==0) break;
        const FSH * desc=RMFT2::getRouteDescription(id);
        StringFormatter::send(stream,F("]\\[R%d}|{%S}|{2"),id,desc);
    }
@@ -574,13 +567,9 @@ void WiThrottle::sendFunctions(Print* stream, byte loco) {
 	myLocos[loco].functionToggles=1<<2; // F2 (HORN)  is a non-toggle
        
 #ifdef EXRAIL_ACTIVE
-	const FSH * functionNames= RMFT2::getRosterFunctions(locoid);
-	if (functionNames == NULL) {
-	  // no roster entry for locoid, try to find default entry
-	  functionNames= RMFT2::getRosterFunctions(0);
-	}
-	if (functionNames == NULL) {
-	  // no default roster entry either, use non-exrail presets as above 
+	const char * functionNames=(char *) RMFT2::getRosterFunctions(locoid);
+	if (!functionNames) {
+	  // no roster, use non-exrail presets as above 
 	}
 	else if (GETFLASH(functionNames)=='\0') {
 	  // "" = Roster but no functions given
@@ -595,7 +584,7 @@ void WiThrottle::sendFunctions(Print* stream, byte loco) {
 	  fkeys=0;
 	  bool firstchar=true;
 	  for (int fx=0;;fx++) {
-	    char c=GETFLASH((char *)functionNames+fx);
+	    char c=GETFLASH(functionNames+fx);
 	    if (c=='\0') {
 	      fkeys++;
 	      break;
--- a/WifiESP32.cpp
+++ b/WifiESP32.cpp
@@ -1,7 +1,5 @@
 /*
-    © 2023 Paul M. Antoine
-    © 2021 Harald Barth
-    © 2023 Nathan Kellenicki
+    © 2021, Harald Barth.

    This file is part of CommandStation-EX

@@ -22,7 +20,6 @@
 #if defined(ARDUINO_ARCH_ESP32)
 #include <vector>
 #include "defines.h"
-#include "ESPmDNS.h"
 #include <WiFi.h>
 #include "esp_wifi.h"
 #include "WifiESP32.h"
@@ -108,18 +105,11 @@ void wifiLoop(void *){
 }
 #endif

-char asciitolower(char in) {
-  if (in <= 'Z' && in >= 'A')
-    return in - ('Z' - 'z');
-  return in;
-}
-
 bool WifiESP::setup(const char *SSid,
                    const char *password,
                    const char *hostname,
                    int port,
-                    const byte channel,
-                    const bool forceAP) {
+                    const byte channel) {
  bool havePassword = true;
  bool haveSSID = true;
  bool wifiUp = false;
@@ -147,8 +137,7 @@ bool WifiESP::setup(const char *SSid,
  if (strncmp(yourNetwork, password, 13) == 0 || strncmp("", password, 13) == 0)
    havePassword = false;

-  if (haveSSID && havePassword && !forceAP) {
-    WiFi.setHostname(hostname); // Strangely does not work unless we do it HERE!
+  if (haveSSID && havePassword) {
    WiFi.mode(WIFI_STA);
 #ifdef SERIAL_BT_COMMANDS
    WiFi.setSleep(true);
@@ -185,20 +174,16 @@ bool WifiESP::setup(const char *SSid,
      }
    }
  }
-  if (!haveSSID || forceAP) {
+  if (!haveSSID) {
    // prepare all strings
-    String strSSID(forceAP ? SSid : "DCCEX_");
-    String strPass(forceAP ? password : "PASS_");
-    if (!forceAP) {
-      String strMac = WiFi.macAddress();
-      strMac.remove(0,9);
-      strMac.replace(":","");
-      strMac.replace(":","");
-      // convert mac addr hex chars to lower case to be compatible with AT software
-      std::transform(strMac.begin(), strMac.end(), strMac.begin(), asciitolower);
-      strSSID.concat(strMac);
-      strPass.concat(strMac);
-    }
+    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
@@ -224,15 +209,6 @@ bool WifiESP::setup(const char *SSid,
    // no idea to go on
    return false;
  }
-
-  // Now Wifi is up, register the mDNS service
-  if(!MDNS.begin(hostname)) {
-    DIAG(F("Wifi setup failed to start mDNS"));
-  }
-  if(!MDNS.addService("withrottle", "tcp", 2560)) {
-    DIAG(F("Wifi setup failed to add withrottle service to mDNS"));
-  }
-
  server = new WiFiServer(port); // start listening on tcp port
  server->begin();
  // server started here
--- a/WifiESP32.h
+++ b/WifiESP32.h
@@ -1,6 +1,5 @@
 /*
- *  © 2021 Harald Barth
- *  © 2023 Nathan Kellenicki
+ *  © 2021, Harald Barth.
 *
 *  This file is part of CommandStation-EX
 *
@@ -32,8 +31,7 @@ public:
 		    const char *wifiPassword,
 		    const char *hostname,
 		    const int port,
-		    const byte channel,
-			const bool forceAP);
+		    const byte channel);
  static void loop();
 private:
 };
--- a/WifiInterface.cpp
+++ b/WifiInterface.cpp
@@ -2,7 +2,6 @@
 *  © 2021 Fred Decker
 *  © 2020-2022 Harald Barth
 *  © 2020-2022 Chris Harlow
- *  © 2023 Nathan Kellenicki
 *  All rights reserved.
 *
 *  This file is part of CommandStation-EX
@@ -53,32 +52,10 @@ Stream * WifiInterface::wifiStream;
 
 #if (defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560))
 #define NUM_SERIAL 3
-#define SERIAL1 Serial1
-#define SERIAL3 Serial3
-#endif
-
-#if defined(ARDUINO_ARCH_STM32)
-// Handle serial ports availability on STM32 for variants!
-// #undef NUM_SERIAL
-#if defined(ARDUINO_NUCLEO_F401RE) || defined(ARDUINO_NUCLEO_F411RE)
-#define NUM_SERIAL 3
-#define SERIAL1 Serial1
-#define SERIAL3 Serial6
-#elif defined(ARDUINO_NUCLEO_F446RE)
-#define NUM_SERIAL 3
-#define SERIAL1 Serial3
-#define SERIAL3 Serial5
-#elif defined(ARDUINO_NUCLEO_F413ZH) || defined(ARDUINO_NUCLEO_F429ZI) || defined(ARDUINO_NUCLEO_F446ZE) || defined(ARDUINO_NUCLEO_F412ZG)
-#define NUM_SERIAL 2
-#define SERIAL1 Serial6
-#else
-#warning This variant of Nucleo not yet explicitly supported
-#endif
 #endif

 #ifndef NUM_SERIAL
 #define NUM_SERIAL 1
-#define SERIAL1 Serial1
 #endif

 bool WifiInterface::setup(long serial_link_speed, 
@@ -86,8 +63,7 @@ bool WifiInterface::setup(long serial_link_speed,
                          const FSH *wifiPassword,
                          const FSH *hostname,
                          const int port,
-                          const byte channel,
-                          const bool forceAP) {
+                          const byte channel) {

  wifiSerialState wifiUp = WIFI_NOAT;

@@ -99,34 +75,27 @@ bool WifiInterface::setup(long serial_link_speed,
  (void) hostname;
  (void) port;
  (void) channel;
-  (void) forceAP;
 #endif  
-
-// See if the WiFi is attached to the first serial port
+  
 #if NUM_SERIAL > 0 && !defined(SERIAL1_COMMANDS)
-  SERIAL1.begin(serial_link_speed);
-  wifiUp = setup(SERIAL1, wifiESSID, wifiPassword, hostname, port, channel, forceAP);
+  Serial1.begin(serial_link_speed);
+  wifiUp = setup(Serial1, wifiESSID, wifiPassword, hostname, port, channel);
 #endif

 // Other serials are tried, depending on hardware.
-// Currently only the Arduino Mega 2560 has usable Serial2 (Nucleo-64 boards use Serial 2 for console!)
-#if defined(ARDUINO_AVR_MEGA2560)
 #if NUM_SERIAL > 1 && !defined(SERIAL2_COMMANDS)
  if (wifiUp == WIFI_NOAT)
  {
    Serial2.begin(serial_link_speed);
-    wifiUp = setup(Serial2, wifiESSID, wifiPassword, hostname, port, channel, forceAP);
+    wifiUp = setup(Serial2, wifiESSID, wifiPassword, hostname, port, channel);
  }
 #endif
-#endif
-
-// We guess here that in all architctures that have a Serial3
-// we can use it for our purpose.
+  
 #if NUM_SERIAL > 2 && !defined(SERIAL3_COMMANDS)
  if (wifiUp == WIFI_NOAT)
  {
-    SERIAL3.begin(serial_link_speed);
-    wifiUp = setup(SERIAL3, wifiESSID, wifiPassword, hostname, port, channel, forceAP);
+    Serial3.begin(serial_link_speed);
+    wifiUp = setup(Serial3, wifiESSID, wifiPassword, hostname, port, channel);
  }
 #endif

@@ -144,7 +113,7 @@ bool WifiInterface::setup(long serial_link_speed,
 }

 wifiSerialState WifiInterface::setup(Stream & setupStream,  const FSH* SSid, const FSH* password,
-				     const FSH* hostname,  int port, byte channel, bool forceAP) {
+				     const FSH* hostname,  int port, byte channel) {
  wifiSerialState wifiState;
  static uint8_t ntry = 0;
  ntry++;
@@ -153,21 +122,20 @@ wifiSerialState WifiInterface::setup(Stream & setupStream,  const FSH* SSid, con

  DIAG(F("++ Wifi Setup Try %d ++"), ntry);

-  wifiState = setup2( SSid, password, hostname,  port, channel, forceAP);
+  wifiState = setup2( SSid, password, hostname,  port, channel);

  if (wifiState == WIFI_NOAT) {
-    LCD(4, F("WiFi no AT chip"));
-    return wifiState;
+      DIAG(F("++ Wifi Setup NO AT ++"));
+      return wifiState;
  }
 
  if (wifiState == WIFI_CONNECTED) {
    StringFormatter::send(wifiStream, F("ATE0\r\n")); // turn off the echo 
-    checkForOK(200, true);
-    DIAG(F("WiFi CONNECTED"));
-    // LCD already shows IP
-  } else {
-    LCD(4,F("WiFi DISCON."));
+    checkForOK(200, true);      
  }
+
+    
+  DIAG(F("++ Wifi Setup %S ++"), wifiState == WIFI_CONNECTED ? F("CONNECTED") : F("DISCONNECTED"));
  return wifiState;
 }

@@ -177,7 +145,7 @@ wifiSerialState WifiInterface::setup(Stream & setupStream,  const FSH* SSid, con
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #endif
 wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
-				      const FSH* hostname, int port, byte channel, bool forceAP) {
+				      const FSH* hostname, int port, byte channel) {
  bool ipOK = false;
  bool oldCmd = false;

@@ -216,8 +184,8 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
  checkForOK(1000, true);                       // Not always OK, sometimes "no change"

  const char *yourNetwork = "Your network ";
-  if (STRNCMP_P(yourNetwork, (const char*)SSid, 13) == 0 || STRNCMP_P("", (const char*)SSid, 13) == 0) {
-    if (STRNCMP_P(yourNetwork, (const char*)password, 13) == 0) {
+  if (strncmp_P(yourNetwork, (const char*)SSid, 13) == 0 || strncmp_P("", (const char*)SSid, 13) == 0) {
+    if (strncmp_P(yourNetwork, (const char*)password, 13) == 0) {
      // If the source code looks unconfigured, check if the
      // ESP8266 is preconfigured in station mode.
      // We check the first 13 chars of the SSid and the password
@@ -230,7 +198,7 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
 	  if (!checkForOK(1000, F("0.0.0.0"), true,false))
 	      ipOK = true;
    }
-  } else if (!forceAP) {
+  } else {
      // SSID was configured, so we assume station (client) mode.
      if (oldCmd) {
 	      // AT command early version supports CWJAP/CWSAP
@@ -290,19 +258,14 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
  
    i=0;
    do {
-      if (!forceAP) {
-        if (STRNCMP_P(yourNetwork, (const char*)password, 13) == 0) {
-    // unconfigured
-          StringFormatter::send(wifiStream, F("AT+CWSAP%s=\"DCCEX_%s\",\"PASS_%s\",%d,4\r\n"),
-                                            oldCmd ? "" : "_CUR", macTail, macTail, channel);
-        } else {
-          // password configured by user
-          StringFormatter::send(wifiStream, F("AT+CWSAP%s=\"DCCEX_%s\",\"%S\",%d,4\r\n"), oldCmd ? "" : "_CUR",
-                                          macTail, password, channel);
-        }
+      if (strncmp_P(yourNetwork, (const char*)password, 13) == 0) {
+	// unconfigured
+        StringFormatter::send(wifiStream, F("AT+CWSAP%s=\"DCCEX_%s\",\"PASS_%s\",%d,4\r\n"),
+                                          oldCmd ? "" : "_CUR", macTail, macTail, channel);
      } else {
-        StringFormatter::send(wifiStream, F("AT+CWSAP%s=\"%S\",\"%S\",%d,4\r\n"),
-                                        oldCmd ? "" : "_CUR", SSid, password, channel);
+        // password configured by user
+       StringFormatter::send(wifiStream, F("AT+CWSAP%s=\"DCCEX_%s\",\"%S\",%d,4\r\n"), oldCmd ? "" : "_CUR",
+	                                       macTail, password, channel);
      }
    } while (!checkForOK(WIFI_CONNECT_TIMEOUT, true) && i++<2); // do twice if necessary but ignore failure as AP mode may still be ok
    if (i >= 2)
--- a/WifiInterface.h
+++ b/WifiInterface.h
@@ -1,7 +1,6 @@
 /*
 *  © 2020-2021 Chris Harlow
 *  © 2020, Harald Barth.
- *  © 2023 Nathan Kellenicki
 *  All rights reserved.
 *
 *  This file is part of CommandStation-EX
@@ -37,18 +36,17 @@ public:
                          const FSH *wifiPassword,
                          const FSH *hostname,
                          const int port,
-                          const byte channel,
-                          const bool forceAP);
+                          const byte channel);
  static void loop();
  static void ATCommand(HardwareSerial * stream,const byte *command);
  
 private:
  static wifiSerialState setup(Stream &setupStream, const FSH *SSSid, const FSH *password,
-                    const FSH *hostname, int port, byte channel, bool forceAP);
+                    const FSH *hostname, int port, byte channel);
  static Stream *wifiStream;
  static DCCEXParser parser;
  static wifiSerialState setup2(const FSH *SSSid, const FSH *password,
-                     const FSH *hostname, int port, byte channel, bool forceAP);
+                     const FSH *hostname, int port, byte channel);
  static bool checkForOK(const unsigned int timeout, bool echo, bool escapeEcho = true);
  static bool checkForOK(const unsigned int timeout, const FSH *waitfor, bool echo, bool escapeEcho = true);
  static bool connected;
--- a/config.example.h
+++ b/config.example.h
@@ -1,10 +1,9 @@
 /*
 *  © 2022 Paul M. Antoine
 *  © 2021 Neil McKechnie
- *  © 2020-2023 Harald Barth
+ *  © 2020-2021 Harald Barth
 *  © 2020-2021 Fred Decker
 *  © 2020-2021 Chris Harlow
- *  © 2023 Nathan Kellenicki
 *  
 *  This file is part of CommandStation-EX
 *
@@ -28,16 +27,6 @@ The configuration file for DCC-EX Command Station

 **********************************************************************/

-/////////////////////////////////////////////////////////////////////////////////////
-// If you want to add your own motor driver definition(s), add them here
-//   For example MY_SHIELD with display name "MINE":
-//   (remove comment start and end marker if you want to edit and use that)
-/* 
-#define MY_SHIELD F("MINE"), \
- new MotorDriver( 3, 12, UNUSED_PIN, 9, A0, 5.08, 3000, A4), \
- new MotorDriver(11, 13, UNUSED_PIN, 8, A1, 5.08, 1500, A5)
-*/
-
 /////////////////////////////////////////////////////////////////////////////////////
 //  NOTE: Before connecting these boards and selecting one in this software
 //        check the quick install guides!!! Some of these boards require a voltage
@@ -45,34 +34,19 @@ The configuration file for DCC-EX Command Station
 //        the correct resistor could damage the sense pin on your Arduino or destroy
 //        the device.
 //
-// DEFINE MOTOR_SHIELD_TYPE BELOW. THESE ARE EXAMPLES. FULL LIST IN MotorDrivers.h
+// DEFINE MOTOR_SHIELD_TYPE BELOW ACCORDING TO THE FOLLOWING TABLE:
 //
 //  STANDARD_MOTOR_SHIELD : Arduino Motor shield Rev3 based on the L298 with 18V 2A per channel
 //  POLOLU_MOTOR_SHIELD   : Pololu MC33926 Motor Driver (not recommended for prog track)
+//  POLOLU_TB9051FTG      : Pololu Dual TB9051FTG Motor Driver
 //  FUNDUMOTO_SHIELD      : Fundumoto Shield, no current sensing (not recommended, no short protection)
 //  FIREBOX_MK1           : The Firebox MK1                    
 //  FIREBOX_MK1S          : The Firebox MK1S
 //  IBT_2_WITH_ARDUINO    : Arduino Motor Shield for PROG and IBT-2 for MAIN
-//  EX8874_SHIELD         : DCC-EX TI DRV8874 based motor shield
 //   |
 //   +-----------------------v
 //
 #define MOTOR_SHIELD_TYPE STANDARD_MOTOR_SHIELD
-//
-/////////////////////////////////////////////////////////////////////////////////////
-//
-// If you want to restrict the maximum current LOWER than what your
-// motor shield can provide, you can do that here. For example if you
-// have a motor shield that can provide 5A and your power supply can
-// only provide 2.5A then you should restict the maximum current to
-// 2.25A (90% of 2.5A) so that DCC-EX does shut off the track before
-// your PS does shut DCC-EX. MAX_CURRENT is in mA so for this example
-// it would be 2250, adjust the number according to your PS. If your
-// PS has a higher rating than your motor shield you do not need this.
-// You can use this as well if you are cautious and your trains do not
-// need full current.
-// #define MAX_CURRENT 2250
-//
 /////////////////////////////////////////////////////////////////////////////////////
 //
 // The IP port to talk to a WIFI or Ethernet shield.
@@ -124,11 +98,6 @@ The configuration file for DCC-EX Command Station
 // this line exists or not. If you need to use an alternate channel (we recommend
 // using only 1,6, or 11) you may change it here.
 #define WIFI_CHANNEL 1
-//
-// WIFI_FORCE_AP: If you'd like to specify your own WIFI_SSID in AP mode, set this
-// true. Otherwise it is assumed that you'd like to connect to an existing network
-// with that SSID.
-#define WIFI_FORCE_AP false

 /////////////////////////////////////////////////////////////////////////////////////
 //
@@ -156,10 +125,10 @@ The configuration file for DCC-EX Command Station
 // define LCD_DRIVER for I2C address 0x27, 16 cols, 2 rows
 // #define LCD_DRIVER  0x27,16,2

-//OR define OLED_DRIVER width,height[,address] in pixels (address auto detected if not supplied)
+//OR define OLED_DRIVER width,height in pixels (address auto detected)
 // 128x32 or 128x64 I2C SSD1306-based devices are supported.
 // Use 132,64 for a SH1106-based I2C device with a 128x64 display.
-// #define OLED_DRIVER 0x3c,128,32
+// #define OLED_DRIVER 128,32

 // Define scroll mode as 0, 1 or 2
 //  *  #define SCROLLMODE 0 is scroll continuous (fill screen if poss),
@@ -172,7 +141,7 @@ The configuration file for DCC-EX Command Station
 //
 // If you do not need the EEPROM at all, you can disable all the code that saves
 // data in the EEPROM. You might want to do that if you are in a Arduino UNO
-// and want to use the EXRAIL automation. Otherwise you do not have enough RAM
+// and want to use the EX-RAIL automation. Otherwise you do not have enough RAM
 // to do that. Of course, then none of the EEPROM related commands work.
 //
 // EEPROM does not work on ESP32. So on ESP32, EEPROM will always be disabled,
@@ -180,17 +149,6 @@ The configuration file for DCC-EX Command Station
 //
 // #define DISABLE_EEPROM

-/////////////////////////////////////////////////////////////////////////////////////
-// DISABLE PROG
-//
-// If you do not need programming capability, you can disable all programming related
-// commands. You might want to do that if you are using an Arduino UNO and still want
-// to use EXRAIL automation, as the Uno is lacking in RAM and Flash to run both.
-// 
-// Note this disables all programming functionality, including EXRAIL.
-//
-// #define DISABLE_PROG
-
 /////////////////////////////////////////////////////////////////////////////////////
 // REDEFINE WHERE SHORT/LONG ADDR break is. According to NMRA the last short address
 // is 127 and the first long address is 128. There are manufacturers which have
@@ -266,15 +224,8 @@ The configuration file for DCC-EX Command Station
 //
 //#define SERIAL_BT_COMMANDS

-// SABERTOOTH
-//
-// This is a very special option and only useful if you happen to have a
-// sabertooth motor controller from dimension engineering configured to
-// take commands from and ESP32 via serial at 9600 baud from GPIO17 (TX)
-// and GPIO16 (RX, currently unused).
-// The number defined is the DCC address for which speed controls are sent
-// to the sabertooth controller _as_well_. Default: Undefined.
-//
-//#define SABERTOOTH 1

+// FastClock Enabler
+// To build the FastClock code into the CS please uncomment the line below
+//#define USEFASTCLOCK
 /////////////////////////////////////////////////////////////////////////////////////
--- a/defines.h
+++ b/defines.h
@@ -43,118 +43,110 @@
 #undef USB_SERIAL     // Teensy has this defined by default...
 #define USB_SERIAL Serial

-// Include extended addresses unless specifically excluded
-#define I2C_EXTENDED_ADDRESS
-
 #if defined(ARDUINO_AVR_UNO)
-  #define ARDUINO_TYPE "UNO"
-  #undef HAS_ENOUGH_MEMORY
-  #define NO_EXTENDED_CHARACTERS
-  #undef I2C_EXTENDED_ADDRESS
+#define ARDUINO_TYPE "UNO"
+#undef HAS_ENOUGH_MEMORY
 #elif defined(ARDUINO_AVR_NANO)
-  #define ARDUINO_TYPE "NANO"
-  #undef HAS_ENOUGH_MEMORY
-  #define NO_EXTENDED_CHARACTERS
-  #undef I2C_EXTENDED_ADDRESS
+#define ARDUINO_TYPE "NANO"
+#undef HAS_ENOUGH_MEMORY
 #elif defined(ARDUINO_AVR_MEGA)
-  #define ARDUINO_TYPE "MEGA"
+#define ARDUINO_TYPE "MEGA"
 #elif defined(ARDUINO_AVR_MEGA2560)
-  #define ARDUINO_TYPE "MEGA"
+#define ARDUINO_TYPE "MEGA"
 #elif defined(ARDUINO_ARCH_MEGAAVR)
-  #define ARDUINO_TYPE "MEGAAVR"
-  #undef HAS_ENOUGH_MEMORY
-  #define NO_EXTENDED_CHARACTERS
-  #undef I2C_EXTENDED_ADDRESS
+#define ARDUINO_TYPE "MEGAAVR"
+#undef HAS_ENOUGH_MEMORY
 #elif defined(ARDUINO_TEENSY31)
-  #define ARDUINO_TYPE "TEENSY3132"
-  #undef USB_SERIAL
-  #define USB_SERIAL SerialUSB
-  #ifndef DISABLE_EEPROM
-    #define DISABLE_EEPROM
-  #endif
-  // Teensy support for native I2C is awaiting development 
-  #ifndef I2C_USE_WIRE
-  #define I2C_USE_WIRE
-  #endif
-#elif defined(ARDUINO_TEENSY35)
-  #define ARDUINO_TYPE "TEENSY35"
-  #undef USB_SERIAL
-  #define USB_SERIAL SerialUSB
-  // Teensy support for I2C is awaiting development 
-  #ifndef DISABLE_EEPROM
-    #define DISABLE_EEPROM
-  #endif
-  // Teensy support for native I2C is awaiting development 
-  #ifndef I2C_USE_WIRE
-  #define I2C_USE_WIRE
-  #endif
-#elif defined(ARDUINO_TEENSY36)
-  #define ARDUINO_TYPE "TEENSY36"
-  #undef USB_SERIAL
-  #define USB_SERIAL SerialUSB
-  #ifndef DISABLE_EEPROM
-    #define DISABLE_EEPROM
-  #endif
-  // Teensy support for native I2C is awaiting development 
-  #ifndef I2C_USE_WIRE
-  #define I2C_USE_WIRE
-  #endif
-#elif defined(ARDUINO_TEENSY40)
-  #define ARDUINO_TYPE "TEENSY40"
-  #undef USB_SERIAL
-  #define USB_SERIAL SerialUSB
-  #ifndef DISABLE_EEPROM
-    #define DISABLE_EEPROM
-  #endif
-  // Teensy support for native I2C is awaiting development 
-  #ifndef I2C_USE_WIRE
-  #define I2C_USE_WIRE
-  #endif
-#elif defined(ARDUINO_TEENSY41)
-  #define ARDUINO_TYPE "TEENSY41"
-  #undef USB_SERIAL
-  #define USB_SERIAL SerialUSB
-  #ifndef DISABLE_EEPROM
-    #define DISABLE_EEPROM
-  #endif
-  // Teensy support for native I2C is awaiting development 
-  #ifndef I2C_USE_WIRE
-    #define I2C_USE_WIRE
-  #endif
-#elif defined(ARDUINO_ARCH_ESP8266)
-  #define ARDUINO_TYPE "ESP8266"
-  #warning "ESP8266 platform untested, you are on your own"
-#elif defined(ARDUINO_ARCH_ESP32)
-  #define ARDUINO_TYPE "ESP32"
-  #ifndef DISABLE_EEPROM
+#define ARDUINO_TYPE "TEENSY3132"
+#undef USB_SERIAL
+#define USB_SERIAL SerialUSB
+#ifndef DISABLE_EEPROM
  #define DISABLE_EEPROM
-  #endif
+#endif
+// Teensy support for native I2C is awaiting development 
+#ifndef I2C_NO_INTERRUPTS
+ #define I2C_NO_INTERRUPTS
+#endif
+#elif defined(ARDUINO_TEENSY35)
+#define ARDUINO_TYPE "TEENSY35"
+#undef USB_SERIAL
+#define USB_SERIAL SerialUSB
+// Teensy support for I2C is awaiting development 
+#ifndef DISABLE_EEPROM
+  #define DISABLE_EEPROM
+#endif
+// Teensy support for native I2C is awaiting development 
+#ifndef I2C_NO_INTERRUPTS
+ #define I2C_NO_INTERRUPTS
+#endif
+#elif defined(ARDUINO_TEENSY36)
+#define ARDUINO_TYPE "TEENSY36"
+#undef USB_SERIAL
+#define USB_SERIAL SerialUSB
+#ifndef DISABLE_EEPROM
+  #define DISABLE_EEPROM
+#endif
+// Teensy support for native I2C is awaiting development 
+#ifndef I2C_NO_INTERRUPTS
+ #define I2C_NO_INTERRUPTS
+#endif
+#elif defined(ARDUINO_TEENSY40)
+#define ARDUINO_TYPE "TEENSY40"
+#undef USB_SERIAL
+#define USB_SERIAL SerialUSB
+#ifndef DISABLE_EEPROM
+  #define DISABLE_EEPROM
+#endif
+// Teensy support for native I2C is awaiting development 
+#ifndef I2C_NO_INTERRUPTS
+ #define I2C_NO_INTERRUPTS
+#endif
+#elif defined(ARDUINO_TEENSY41)
+#define ARDUINO_TYPE "TEENSY41"
+#undef USB_SERIAL
+#define USB_SERIAL SerialUSB
+#ifndef DISABLE_EEPROM
+  #define DISABLE_EEPROM
+#endif
+// Teensy support for native I2C is awaiting development 
+#ifndef I2C_NO_INTERRUPTS
+  #define I2C_NO_INTERRUPTS
+#endif
+#elif defined(ARDUINO_ARCH_ESP8266)
+#define ARDUINO_TYPE "ESP8266"
+#warning "ESP8266 platform untested, you are on your own"
+#elif defined(ARDUINO_ARCH_ESP32)
+#define ARDUINO_TYPE "ESP32"
+#ifndef DISABLE_EEPROM
+#define DISABLE_EEPROM
+#endif
 #elif defined(ARDUINO_ARCH_SAMD)
-  #define ARDUINO_TYPE "SAMD21"
-  #undef USB_SERIAL
-  #define USB_SERIAL SerialUSB
-  // SAMD no EEPROM by default 
-  #ifndef DISABLE_EEPROM
-    #define DISABLE_EEPROM
-  #endif
+#define ARDUINO_TYPE "SAMD21"
+#undef USB_SERIAL
+#define USB_SERIAL SerialUSB
+// SAMD no EEPROM by default 
+#ifndef DISABLE_EEPROM
+  #define DISABLE_EEPROM
+#endif
 #elif defined(ARDUINO_ARCH_STM32)
-  #define ARDUINO_TYPE "STM32"
-  // STM32 no EEPROM by default 
-  #ifndef DISABLE_EEPROM
-    #define DISABLE_EEPROM
-  #endif
-  // STM32 support for native I2C is awaiting development 
-  #ifndef I2C_USE_WIRE
-  #define I2C_USE_WIRE
-  #endif
+#define ARDUINO_TYPE "STM32"
+// STM32 no EEPROM by default 
+#ifndef DISABLE_EEPROM
+  #define DISABLE_EEPROM
+#endif
+// STM32 support for native I2C is awaiting development 
+#ifndef I2C_NO_INTERRUPTS
+ #define I2C_NO_INTERRUPTS
+#endif
+

 /* TODO when ready 
 #elif defined(ARDUINO_ARCH_RP2040)
-  #define ARDUINO_TYPE "RP2040"
+#define ARDUINO_TYPE "RP2040"
 */

 #else
-  #define CPU_TYPE_ERROR
+#define CPU_TYPE_ERROR
 #endif

 // replace board type if provided by compiler
@@ -182,15 +174,6 @@
  #define WIFI_ON false
 #endif

-#ifndef WIFI_FORCE_AP
-  #define WIFI_FORCE_AP false
-#else
-  #if WIFI_FORCE_AP==true || WIFI_FORCE_AP==false
-  #else
-    #error WIFI_FORCE_AP needs to be true or false
-  #endif
-#endif
-
 #if ENABLE_ETHERNET
  #if defined(HAS_ENOUGH_MEMORY)
    #define ETHERNET_ON true
@@ -214,7 +197,7 @@
 #define WIFI_SERIAL_LINK_SPEED 115200

 #if __has_include ( "myAutomation.h")
-  #if defined(HAS_ENOUGH_MEMORY) || defined(DISABLE_EEPROM) || defined(DISABLE_PROG)
+  #if defined(HAS_ENOUGH_MEMORY) || defined(DISABLE_EEPROM)
    #define EXRAIL_ACTIVE
  #else
    #define EXRAIL_WARNING
--- a/install_via_powershell.cmd
+++ b/install_via_powershell.cmd
@@ -1,13 +0,0 @@
-@ECHO OFF
-
-FOR /f "tokens=*" %%a IN ('powershell Get-ExecutionPolicy -Scope CurrentUser') DO SET PS_POLICY=%%a
-
-IF NOT %PS_POLICY=="Bypass" (
-  powershell Set-ExecutionPolicy -Scope CurrentUser Bypass
-)
-
-powershell %~dp0%installer.ps1
-
-IF NOT %PS_POLICY=="Bypass" (
-  powershell Set-ExecutionPolicy -Scope CurrentUser %PS_POLICY%
-)
--- a/installer.ps1
+++ b/installer.ps1
@@ -1,540 +0,0 @@
-<#
-# © 2023 Peter Cole
-# 
-# This file is part of EX-CommandStation
-#
-# This is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# It is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
-#>
-
-<############################################
-For script errors set ExecutionPolicy:
-Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Bypass
-############################################>
-
-<############################################
-Optional command line parameters:
-  $buildDirectory - specify an existing directory rather than generating a new unique one
-  $configDirectory - specify a directory containing existing files as per $configFiles
-############################################>
-Param(
-  [Parameter()]
-  [String]$buildDirectory,
-  [Parameter()]
-  [String]$configDirectory
-)
-
-<############################################
-Define global parameters here such as known URLs etc.
-############################################>
-$installerVersion = "v0.0.8"
-$configFiles = @("config.h", "myAutomation.h", "myHal.cpp", "mySetup.h")
-$wifiBoards = @("arduino:avr:mega", "esp32:esp32:esp32")
-$userDirectory = $env:USERPROFILE + "\"
-$gitHubAPITags = "https://api.github.com/repos/DCC-EX/CommandStation-EX/git/refs/tags"
-$gitHubURLPrefix = "https://github.com/DCC-EX/CommandStation-EX/archive/"
-if ((Get-WmiObject win32_operatingsystem | Select-Object osarchitecture).osarchitecture -eq "64-bit") {
-  $arduinoCLIURL = "https://downloads.arduino.cc/arduino-cli/arduino-cli_latest_Windows_64bit.zip"
-  $arduinoCLIZip = $userDirectory + "Downloads\" + "arduino-cli_latest_Windows_64bit.zip"
-} else {
-  $arduinoCLIURL = "https://downloads.arduino.cc/arduino-cli/arduino-cli_latest_Windows_32bit.zip"
-  $arduinoCLIZip = $userDirectory + "Downloads\" + "arduino-cli_latest_Windows_32bit.zip"
-}
-$arduinoCLIDirectory = $userDirectory + "arduino-cli"
-$arduinoCLI = $arduinoCLIDirectory + "\arduino-cli.exe"
-
-<############################################
-List of supported devices with FQBN in case clones used that aren't detected
-############################################>
-$supportedDevices = @(
-  @{
-    name = "Arduino Mega or Mega 2560"
-    fqbn = "arduino:avr:mega"
-  },
-  @{
-    name = "Arduino Nano"
-    fqbn = "arduino:avr:nano"
-  },
-  @{
-    name = "Arduino Uno"
-    fqbn = "arduino:avr:uno"
-  },
-  @{
-    name = "ESP32 Dev Module"
-    fqbn = "esp32:esp32:esp32"
-  }
-)
-
-<############################################
-List of supported displays
-############################################>
-$displayList = @(
-  @{
-    option = "LCD 16 columns x 2 rows"
-    configLine = "#define LCD_DRIVER  0x27,16,2"
-  },
-  @{
-    option = "LCD 16 columns x 4 rows"
-    configLine = "#define LCD_DRIVER  0x27,16,4"
-  },
-  @{
-    option = "OLED 128 x 32"
-    configLine = "#define OLED_DRIVER 128,32"
-  },
-  @{
-    option = "OLED 128 x 64"
-    configLine = "#define OLED_DRIVER 128,64"
-  }
-)
-
-<############################################
-Basics of config.h
-############################################>
-$configLines = @(
-  "/*",
-  "This config.h file was generated by the DCC-EX PowerShell installer $installerVersion",
-  "*/",
-  "",
-  "// Define standard motor shield",
-  "#define MOTOR_SHIELD_TYPE STANDARD_MOTOR_SHIELD",
-  ""
-)
-
-<############################################
-Set default action for progress indicators, warnings, and errors
-############################################>
-$global:ProgressPreference = "SilentlyContinue"
-$global:WarningPreference = "SilentlyContinue"
-$global:ErrorActionPreference = "SilentlyContinue"
-
-<############################################
-If $buildDirectory not provided, generate a new time/date stamp based directory to use
-############################################>
-if (!$PSBoundParameters.ContainsKey('buildDirectory')) {
-  $buildDate = Get-Date -Format 'yyyyMMdd-HHmmss'
-  $buildDirectory = $userDirectory + "EX-CommandStation-Installer\" + $buildDate
-}
-$commandStationDirectory = $buildDirectory + "\CommandStation-EX"
-
-<############################################
-Write out intro message and prompt to continue
-############################################>
-@"
-Welcome to the DCC-EX PowerShell installer for EX-CommandStation ($installerVersion)
-
-Current installer options:
-
- EX-CommandStation will be built in $commandStationDirectory
- Arduino CLI will downloaded and extracted to $arduinoCLIDirectory
-
-Before continuing, please ensure:
-
- Your computer is connected to the internet
- The device you wish to install EX-CommandStation on is connected to a USB port
-
-This installer will obtain the Arduino CLI (if not already present), and then download and install your chosen version of EX-CommandStation
-
-"@
-
-<############################################
-Prompt user to confirm all is ready to proceed
-############################################>
-$confirmation = Read-Host "Enter 'Y' or 'y' then press <Enter> to confirm you are ready to proceed, any other key to exit"
-if ($confirmation -ne "Y" -and $confirmation -ne "y") {
-  Exit
-}
-
-<############################################
-See if we have the Arduino CLI already, otherwise download and extract it
-############################################>
-if (!(Test-Path -PathType Leaf -Path $arduinoCLI)) {
-  if (!(Test-Path -PathType Container -Path $arduinoCLIDirectory)) {
-    try {
-      New-Item -ItemType Directory -Path $arduinoCLIDirectory | Out-Null
-    }
-    catch {
-      Write-Output "Arduino CLI does not exist and cannot create directory $arduinoCLIDirectory"
-      Exit
-    }
-  }
-  Write-Output "`r`nDownloading and extracting Arduino CLI"
-  try {
-    Invoke-WebRequest -Uri $arduinoCLIURL -OutFile $arduinoCLIZip
-  }
-  catch {
-    Write-Output "Failed to download Arduino CLI"
-    Exit
-  }
-  try {
-    Expand-Archive -Path $arduinoCLIZip -DestinationPath $arduinoCLIDirectory -Force
-  }
-  catch {
-    Write-Output "Failed to extract Arduino CLI"
-  }
-} else {
-  Write-Output "`r`nArduino CLI already downloaded, ensuring it is up to date and you have a board connected"
-}
-
-<############################################
-Make sure Arduino CLI core index updated and list of boards populated
-############################################>
-# Need to do an initial board list to download everything first
-try {
-  & $arduinoCLI core update-index | Out-Null
-}
-catch {
-  Write-Output "Failed to update Arduino CLI core index"
-  Exit
-}
-# Need to do an initial board list to download everything first
-try {
-  & $arduinoCLI board list | Out-Null
-}
-catch {
-  Write-Output "Failed to update Arduino CLI board list"
-  Exit
-}
-
-<############################################
-Identify available board(s)
-############################################>
-try {
-  $boardList = & $arduinoCLI board list --format jsonmini | ConvertFrom-Json
-}
-catch {
-  Write-Output "Failed to obtain list of boards"
-  Exit
-}
-
-<############################################
-Get user to select board
-############################################>
-if ($boardList.count -eq 0) {
-  Write-Output "Could not find any attached devices, please ensure your device is plugged in to a USB port and Windows recognises it"
-  Exit
-} else {
-@"
-
-Devices attached to COM ports:
------------------------------
-"@
-
-  $boardSelect = 1
-  foreach ($board in $boardList) {
-    if ($board.matching_boards.name) {
-      $boardName = $board.matching_boards.name
-    } else {
-      $boardName = "Unknown device"
-    }
-    $port = $board.port.address
-    Write-Output "$boardSelect - $boardName on port $port"
-    $boardSelect++
-  }
-  Write-Output "$boardSelect - Exit"
-  $userSelection = 0
-  do {
-    [int]$userSelection = Read-Host "`r`nSelect the device to use from the list above"
-  } until (
-    (($userSelection -ge 1) -and ($userSelection -le ($boardList.count + 1)))
-  )
-  if ($userSelection -eq ($boardList.count + 1)) {
-    Write-Output "Exiting installer"
-    Exit
-  } else {
-    $selectedBoard = $userSelection - 1
-  }
-}
-
-<############################################
-If the board is unknown, need to choose which one
-############################################>
-if ($null -eq $boardList[$selectedBoard].matching_boards.name) {
-  Write-Output "The device selected is unknown, these boards are supported:`r`n"
-  $deviceSelect = 1
-  foreach ($device in $supportedDevices) {
-    Write-Output "$deviceSelect - $($supportedDevices[$deviceSelect - 1].name)"
-    $deviceSelect++
-  }
-  Write-Output "$deviceSelect - Exit"
-  $userSelection = 0
-  do {
-    [int]$userSelection = Read-Host "Select the board type from the list above"
-  } until (
-    (($userSelection -ge 1) -and ($userSelection -le ($supportedDevices.count + 1)))
-  )
-  if ($userSelection -eq ($supportedDevices.count + 1)) {
-    Write-Output "Exiting installer"
-    Exit
-  } else {
-    $deviceName = $supportedDevices[$userSelection - 1].name
-    $deviceFQBN = $supportedDevices[$userSelection - 1].fqbn
-    $devicePort = $boardList[$selectedBoard].port.address
-  }
-} else {
-  $deviceName = $boardList[$selectedBoard].matching_boards.name
-  $deviceFQBN = $boardList[$selectedBoard].matching_boards.fqbn
-  $devicePort = $boardList[$selectedBoard].port.address
-}
-
-<############################################
-Get the list of tags
-############################################>
-try {
-  $gitHubTags = Invoke-RestMethod -Uri $gitHubAPITags
-}
-catch {
-  Write-Output "Failed to obtain list of available EX-CommandStation versions"
-  Exit
-}
-
-<############################################
-Get our GitHub tag list in a hash so we can sort by version numbers and extract just the ones we want
-############################################>
-$versionMatch = ".*?v(\d+)\.(\d+).(\d+)-(.*)"
-$tagList = @{}
-foreach ($tag in $gitHubTags) {
-  $tagHash = @{}
-  $tagHash["Ref"] = $tag.ref
-  $version = $tag.ref.split("/")[2]
-  $null = $version -match $versionMatch
-  $tagHash["Major"] = [int]$Matches[1]
-  $tagHash["Minor"] = [int]$Matches[2]
-  $tagHash["Patch"] = [int]$Matches[3]
-  $tagHash["Type"] = $Matches[4]
-  $tagList.Add($version, $tagHash)
-}
-
-<############################################
-Get latest two Prod and Devel for user to select
-############################################>
-$userList = @{}
-$prodCount = 1
-$devCount = 1
-$select = 1
-foreach ($tag in $tagList.Keys | Sort-Object {$tagList[$_]["Major"]},{$tagList[$_]["Minor"]},{$tagList[$_]["Patch"]} -Descending) {
-  if (($tagList[$tag]["Type"] -eq "Prod") -and $prodCount -le 2) {
-    $userList[$select] = $tag
-    $select++
-    $prodCount++
-  } elseif (($tagList[$tag]["Type"] -eq "Devel") -and $devCount -le 2) {
-    $userList[$select] = $tag
-    $select++
-    $devCount++
-  }
-}
-
-<############################################
-Display options for user to select and get the selection
-############################################>
-@"
-
-Available EX-CommandStation versions:
-------------------------------------
-"@
-foreach ($selection in $userList.Keys | Sort-Object $selection) {
-  Write-Output "$selection - $($userList[$selection])"
-}
-Write-Output "5 - Exit"
-$userSelection = 0
-do {
-  [int]$userSelection = Read-Host "`r`nSelect the version to install from the list above (1 - 5)"
-} until (
-  (($userSelection -ge 1) -and ($userSelection -le 5))
-)
-if ($userSelection -eq 5) {
-  Write-Output "Exiting installer"
-  Exit
-} else {
-  $downloadURL = $gitHubURLPrefix + $tagList[$userList[$userSelection]]["Ref"] + ".zip"
-}
-
-<############################################
-Create build directory if it doesn't exist, or fail
-############################################>
-if (!(Test-Path -PathType Container -Path $buildDirectory)) {
-  try {
-    New-Item -ItemType Directory -Path $buildDirectory | Out-Null
-  }
-  catch {
-    Write-Output "Could not create build directory $buildDirectory"
-    Exit
-  }
-}
-
-<############################################
-Download the chosen version to the build directory
-############################################>
-$downladFile = $buildDirectory + "\CommandStation-EX.zip"
-Write-Output "Downloading and extracting $($userList[$userSelection])"
-try {
-  Invoke-WebRequest -Uri $downloadURL -OutFile $downladFile
-}
-catch {
-  Write-Output "Error downloading EX-CommandStation zip file"
-  Exit
-}
-
-<############################################
-If folder exists, bail out and tell user
-############################################>
-if (Test-Path -PathType Container -Path "$buildDirectory\CommandStation-EX") {
-  Write-Output "EX-CommandStation directory already exists, please ensure you have copied any user files then delete manually: $buildDirectory\CommandStation-EX"
-  Exit
-}
-
-<############################################
-Extract and rename to CommandStation-EX to allow building
-############################################>
-try {
-  Expand-Archive -Path $downladFile -DestinationPath $buildDirectory -Force
-}
-catch {
-  Write-Output "Failed to extract EX-CommandStation zip file"
-  Exit
-}
-
-$folderName = $buildDirectory + "\CommandStation-EX-" + ($userList[$userSelection] -replace "^v", "")
-try {
-  Rename-Item -Path $folderName -NewName $commandStationDirectory
-}
-catch {
-  Write-Output "Could not rename folder"
-  Exit
-}
-
-<############################################
-If config directory provided, copy files here
-############################################>
-if ($PSBoundParameters.ContainsKey('configDirectory')) {
-  if (Test-Path -PathType Container -Path $configDirectory) {
-    foreach ($file in $configFiles) {
-      if (Test-Path -PathType Leaf -Path "$configDirectory\$file") {
-        Copy-Item -Path "$configDirectory\$file" -Destination "$commandStationDirectory\$file"
-      }
-    }
-  } else {
-    Write-Output "User provided configuration directory $configDirectory does not exist, skipping"
-  }
-} else {
-
-<############################################
-If no config directory provided, prompt for display option
-############################################>
-  Write-Output "`r`nIf you have an LCD or OLED display connected, you can configure it here`r`n"
-  Write-Output "1 - I have no display, skip this step"
-  $displaySelect = 2
-  foreach ($display in $displayList) {
-    Write-Output "$displaySelect - $($displayList[$displaySelect - 2].option)"
-    $displaySelect++
-  }
-  Write-Output "$($displayList.Count + 2) - Exit"
-  do {
-    [int]$displayChoice = Read-Host "`r`nSelect a display option"
-  } until (
-    ($displayChoice -ge 1 -and $displayChoice -le ($displayList.Count + 2))
-  )
-  if ($displayChoice -eq ($displayList.Count + 2)) {
-    Exit
-  } elseif ($displayChoice -ge 2) {
-    $configLines+= "// Display configuration"
-    $configLines+= "$($displayList[$displayChoice - 2].configLine)"
-    $configLines+= "#define SCROLLMODE 1 // Alternate between pages"
-  }
-<############################################
-If device supports WiFi, prompt to configure
-############################################>
-  if ($wifiBoards.Contains($deviceFQBN)) {
-    Write-Output "`r`nYour chosen board supports WiFi`r`n"
-    Write-Output "1 - I don't want WiFi, skip this step
-2 - Configure my device as an access point I will connect to directly
-3 - Configure my device to connect to my home WiFi network
-4 - Exit"
-    do {
-      [int]$wifiChoice = Read-Host "`r`nSelect a WiFi option"
-    } until (
-      ($wifiChoice -ge 1 -and $wifiChoice -le 4)
-    )
-    if ($wifiChoice -eq 4) {
-      Exit
-    } elseif ($wifiChoice -ne 1) {
-      $configLines+= ""
-      $configLines+= "// WiFi configuration"
-      $configLines+= "#define ENABLE_WIFI true"
-      $configLines+= "#define IP_PORT 2560"
-      $configLines+= "#define WIFI_HOSTNAME ""dccex"""
-      $configLines+= "#define WIFI_CHANNEL 1"
-      if ($wifiChoice -eq 2) {
-        $configLines+= "#define WIFI_SSID ""Your network name"""
-        $configLines+= "#define WIFI_PASSWORD ""Your network passwd"""
-      }
-      if ($wifiChoice -eq 3) {
-        $wifiSSID = Read-Host "Please enter the SSID of your home network here"
-        $wifiPassword = Read-Host "Please enter your home network WiFi password here"
-        $configLines+= "#define WIFI_SSID ""$($wifiSSID)"""
-        $configLines+= "#define WIFI_PASSWORD ""$($wifiPassword)"""
-      }
-    }
-  }
-
-<############################################
-Write out config.h to a file here only if config directory not provided
-############################################>
-  $configH = $commandStationDirectory + "\config.h"
-  try {
-    $configLines | Out-File -FilePath $configH -Encoding ascii
-  }
-  catch {
-    Write-Output "Error writing config file to $configH"
-    Exit
-  }
-}
-
-<############################################
-Install core libraries for the platform
-############################################>
-$platformArray = $deviceFQBN.split(":")
-$platform = $platformArray[0] + ":" + $platformArray[1]
-try {
-  & $arduinoCLI core install $platform
-}
-catch {
-  Write-Output "Error install core libraries"
-  Exit
-}
-
-<############################################
-Upload the sketch to the selected board
-############################################>
-#$arduinoCLI upload -b fqbn -p port $commandStationDirectory
-Write-Output "Compiling and uploading to $deviceName on $devicePort"
-try {
-  $output = & $arduinoCLI compile -b $deviceFQBN -u -t -p $devicePort $commandStationDirectory --format jsonmini | ConvertFrom-Json
-}
-catch {
-  Write-Output "Failed to compile"
-  Exit
-}
-if ($output.success -eq "True") {
-  Write-Output "`r`nCongratulations! DCC-EX EX-CommandStation $($userList[$userSelection]) has been installed on your $deviceName`r`n"
-} else {
-  Write-Output "`r`nThere was an error installing $($userList[$userSelection]) on your $($deviceName), please take note of the errors provided:`r`n"
-  if ($null -ne $output.compiler_err) {
-    Write-Output "Compiler error: $($output.compiler_err)`r`n"
-  }
-  if ($null -ne $output.builder_result) {
-    Write-Output "Builder result: $($output.builder_result)`r`n"
-  }
-}
-
-Write-Output "`r`nPress any key to exit the installer"
-[void][System.Console]::ReadKey($true)
--- a/installer.sh
+++ b/installer.sh
@@ -1,7 +1,7 @@
 #!/bin/bash

 #
-# © 2022,2023 Harald Barth
+# © 2022 Harald Barth
 # 
 # This file is part of CommandStation-EX
 #
@@ -29,33 +29,14 @@ ACLI="./bin/arduino-cli"

 function need () {
    type -p $1 > /dev/null && return
-    dpkg -l $1 2>&1 | egrep ^ii >/dev/null && return
    sudo apt-get install $1
    type -p $1 > /dev/null && return
    echo "Could not install $1, abort"
    exit 255
 }

+
 need git
-
-if cat /etc/issue | egrep '^Raspbian' 2>&1 >/dev/null ; then
-    # we are on a raspi where we do not support graphical
-    unset DISPLAY
-fi
-
-if [ x$DISPLAY != x ] ; then
-    # we have DISPLAY, do the graphic thing
-    need python3-tk
-    need python3.8-venv
-    mkdir -p ~/ex-installer/venv
-    python3 -m venv ~/ex-installer/venv
-    cd ~/ex-installer/venv || exit 255
-    source ./bin/activate
-    git clone https://github.com/DCC-EX/EX-Installer
-    cd EX-Installer || exit 255
-    pip3 install -r requirements.txt
-    exec python3 -m ex_installer
-fi
 if test -d `basename "$DCCEXGITURL"` ; then
    : assume we are almost there
    cd `basename "$DCCEXGITURL"` || exit 255
@@ -88,10 +69,10 @@ else
    # need to do this config better
    cp -p config.example.h config.h
 fi
+need curl
 if test -x "$ACLI" ; then
    : all well
 else
-    need curl
    curl "$ACLIINSTALL" > acliinstall.sh
    chmod +x acliinstall.sh
    ./acliinstall.sh
--- a/myAutomation.example.h
+++ b/myAutomation.example.h
@@ -23,9 +23,7 @@
 *  
 */

-// This is the startup sequence, 
-AUTOSTART
-POWERON        // turn on track power
+// This is the startup sequence, AKA SEQUENCE(0)
 SENDLOCO(3,1) // send loco 3 off along route 1
 SENDLOCO(10,2) // send loco 10 off along route 2
 DONE     // This just ends the startup thread, leaving 2 others running.
--- a/myHal.cpp.txt
+++ b/myHal.cpp.txt
@@ -1,465 +0,0 @@
-#include "defines.h"
-#include "IODevice.h"
-
-#ifndef IO_NO_HAL
-
-#include "IO_VL53L0X.h"
-#include "IO_HCSR04.h"
-#include "Sensors.h"
-#include "Turnouts.h"
-#include "IO_DFPlayer.h"
-//#include "IO_Wire.h"
-#include "IO_AnalogueInputs.h"
-#if __has_include("IO_Servo.h")
-#include "IO_Servo.h"
-#include "IO_PCA9685pwm.h"
-#endif
-
-#include "IO_HALDisplay.h"
-#include "LiquidCrystal_I2C.h"
-
-#if __has_include("IO_CMRI.h")
-#include "IO_CMRI.h"
-#endif
-
-//#include "IO_ExampleSerial.h"
-
-//#include "IO_EXFastclock.h"
-//#include "IO_EXTurntable.h"
-
-#if __has_include("IO_ExternalEEPROM.h")
-#include "IO_ExternalEEPROM.h"
-#endif
-
-#if __has_include("IO_Network.h")
-#include "IO_Network.h"
-#include "Net_RF24.h"
-#include "Net_ENC28J60.h"
-#include "Net_Ethernet.h"
-#define NETWORK_PRESENT
-#endif
-
-#include "IO_TouchKeypad.h"
-
-#define WIRE_TEST 0
-#define TESTHARNESS 1
-#define I2C_STRESS_TEST 0
-#define I2C_SETCLOCK 0
-
-#include "DCC.h"
-
-
-#if 0 // Long Strings
-#define s10 "0123456789"
-#define s100 s10 s10 s10 s10 s10 s10 s10 s10 s10 s10
-#define s1k s100 s100 s100 s100 s100 s100 s100 s100 s100 s100
-#define s10k s1k s1k s1k s1k s1k s1k s1k s1k s1k s1k
-#define s32k s10k s10k s10k s1k s1k
-volatile const char PROGMEM ss1[] = s32k;
-#endif
-
-
-#if TESTHARNESS
-
-// Function to be invoked by test harness
-void myTest() {
-  // DIAG(F("VL53L0X #1 Test: dist=%d signal=%d ambient=%d value=%d"), 
-  //   IODevice::readAnalogue(5000),
-  //   IODevice::readAnalogue(5001),
-  //   IODevice::readAnalogue(5002),
-  //   IODevice::read(5000));
-  // DIAG(F("VL53L0X #2 Test: dist=%d signal=%d ambient=%d value=%d"), 
-  //   IODevice::readAnalogue(5003),
-  //   IODevice::readAnalogue(5004),
-  //   IODevice::readAnalogue(5005),
-  //   IODevice::read(5003));
-  // DIAG(F("HCSR04 Test: dist=%d value=%d"),
-  //   IODevice::readAnalogue(2000),
-  //   IODevice::read(2000));
-  // DIAG(F("ADS111x Test: %d %d %d %d %d"), 
-  //   IODevice::readAnalogue(4500), 
-  //   IODevice::readAnalogue(4501),
-  //   IODevice::readAnalogue(4502),
-  //   IODevice::readAnalogue(4503),
-  //   IODevice::readAnalogue(A5)
-  // );
-  // DIAG(F("RF24 Test: 4000:%d 4002:%d"), 
-  //   IODevice::read(4000), 
-  //   IODevice::read(4002)
-  // );
-  DIAG(F("EXPANDER: 2212:%d 2213:%d 2214:%d"),
-    IODevice::readAnalogue(2212), 
-    IODevice::readAnalogue(2213),
-    IODevice::readAnalogue(2214));
-}
-#endif
-
-#if I2C_STRESS_TEST
-static bool initialised = false;
-static uint8_t lastStatus = 0;
-static const int nRBs = 3; // request blocks concurrently
-static const int I2cTestPeriod = 1; // milliseconds
-static I2CAddress testDevice = {SubBus_6, 0x27};
-static I2CRB rb[nRBs];
-static uint8_t readBuffer[nRBs*32]; // nRB x 32-byte input buffer
-static uint8_t writeBuffer[nRBs];  // nRB x 1-byte output buffer
-static unsigned long count = 0;
-static unsigned long errors = 0;
-static unsigned long lastOutput = millis();
-
-void I2CTest() {
-  if (!initialised) {
-    // I2C Loading for stress test.
-    // Write value then read back 32 times
-    for (int i=0; i<nRBs; i++) {
-      writeBuffer[i] = (0xc5 ^ i ^ i<<3 ^ i<<6) & ~0x08; // bit corresponding to 08 is hard-wired low
-      rb[i].setRequestParams(testDevice, &readBuffer[i*32], 32, 
-        &writeBuffer[i], 1);
-      I2CManager.queueRequest(&rb[i]);
-    }
-    initialised = true;
-  }
-
-  for (int i=0; i<nRBs; i++) {
-    if (!rb[i].isBusy()) {
-      count++;
-      uint8_t status = rb[i].status;
-      if (status != lastStatus) {
-        DIAG(F("I2CTest: status=%d (%S)"), 
-          (int)status, I2CManager.getErrorMessage(status));
-        lastStatus = status; 
-      }
-      if (status == I2C_STATUS_OK) {
-        bool diff = false;
-        // Check contents of response
-        for (uint8_t j=0; j<32; j++) {
-          if (readBuffer[i*32+j] != writeBuffer[i]) {
-            DIAG(F("I2CTest: Received message mismatch, sent %2x rcvd %2x"), 
-              writeBuffer[i], readBuffer[i*32+j]);
-            diff = true;
-          }
-        }
-        if (diff) errors++;
-      } else
-        errors++;
-      I2CManager.queueRequest(&rb[i]);
-    }
-  }
-  if (millis() - lastOutput > 60000) { // 1 minute
-    DIAG(F("I2CTest: Count=%l Errors=%l"), count, errors);
-    count = errors = 0;
-    lastOutput = millis();
-  }
-}
-#endif
-
-void updateLocoScreen() {
-  for (int i=0; i<8; i++) {
-    if (DCC::speedTable[i].loco > 0) {
-      int speed = DCC::speedTable[i].speedCode;
-      char direction = (speed & 0x80) ? 'R' : 'F';
-      speed = speed & 0x7f;
-      if (speed > 0) speed = speed - 1;
-      SCREEN(3, i, F("Loco:%4d %3d %c"), DCC::speedTable[i].loco,
-        speed, direction);
-    }
-  }
-}
-
-void updateTime() {
-  uint8_t buffer[20];
-  I2CAddress rtc = {SubBus_1, 0x68};  // Real-time clock I2C address
-  buffer[0] = 0;
-
-  // Set time - only needs to be done once if battery is ok.
-  static bool timeSet = false;
-  if (!timeSet) {
-    // I2CManager.read(rtc, buffer+1, sizeof(buffer)-1);
-    // uint8_t year = 23;    // 2023
-    // uint8_t day = 2;      // tuesday
-    // uint8_t date = 21;    // 21st
-    // uint8_t month = 2;    // feb
-    // uint8_t hours = 23;   // xx:
-    // uint8_t minutes = 25; // :xx
-    // buffer[1] = 0;   // seconds
-    // buffer[2] = ((minutes / 10) << 4) | (minutes % 10);
-    // buffer[3] = ((hours / 10) << 4) | (hours % 10);
-    // buffer[4] = day;
-    // buffer[5] = ((date/10) << 4) + date%10; // 24th
-    // buffer[6] = ((month/10) << 4) + month%10; // feb
-    // buffer[7] = ((year/10) << 4) + year%10; // xx23
-    // for (uint8_t i=8; i<sizeof(buffer); i++) buffer[i] = 0;
-    // I2CManager.write(rtc, buffer, sizeof(buffer));
-    timeSet = true;
-  }
-
-  uint8_t status = I2CManager.read(rtc, buffer+1, sizeof(buffer)-1, 1, 0);
-  if (status == I2C_STATUS_OK) {
-    uint8_t seconds10 = buffer[1] >> 4;
-    uint8_t seconds1 = buffer[1] & 0xf;
-    uint8_t minutes10 = buffer[2] >> 4;
-    uint8_t minutes1 = buffer[2] & 0xf;
-    uint8_t hours10 = buffer[3] >> 4;
-    uint8_t hours1 = buffer[3] & 0xf;
-    SCREEN(10, 0, F("Departures  %d%d:%d%d:%d%d"), 
-      hours10, hours1, minutes10, minutes1, seconds10, seconds1);
-  }
-}
-
-void showCharacterSet() {
-  if (millis() < 3000) return;
-  const uint8_t lineLen = 20;
-  char buffer[lineLen+1];
-  static uint8_t nextChar = 0x20;
-  for (uint8_t row=0; row<8; row+=1) {
-    for (uint8_t col=0; col<lineLen; col++) {
-      buffer[col] = nextChar++;
-      buffer[++col] = ' ';
-      if (nextChar == 0) nextChar = 0x20; // check for wrap-around
-    }
-    buffer[lineLen] = '\0';
-    SCREEN(3, row, F("%s"), buffer);
-  }
-}
-
-#if defined(ARDUINO_NUCLEO_F446RE)
-HardwareSerial Serial3(PC11, PC10);
-#endif
-
-
-// HAL device initialisation
-void halSetup() {
-
-  I2CManager.setTimeout(500); // microseconds
-  I2CManager.forceClock(400000);
-
-  HALDisplay<OLED>::create(10, {SubBus_5, 0x3c}, 132, 64); // SH1106
-  // UserAddin::create(updateLocoScreen, 1000);
-  // UserAddin::create(showCharacterSet, 5000);
-  // UserAddin::create(updateTime, 1000);
-  
-  HALDisplay<OLED>::create(10, {SubBus_4, 0x3c}, 128, 32);
-  HALDisplay<OLED>::create(10, {SubBus_7, 0x3c}, 128, 32);
-
-  //HALDisplay<LiquidCrystal_I2C>::create(10, {SubBus_4, 0x27}, 20, 4);
-
-    // Draw double boxes with X O O X inside.
-  // SCREEN(3, 2, F("\xc9\xcd\xcd\xcd\xcb\xcd\xcd\xcd\xcb\xcd\xcd\xcd\xcb\xcd\xcd\xcd\xcb\xcd\xcd\xcd\xbb"));
-  // SCREEN(3, 3, F("\xba X \xba O \xba O \xba O \xba X \xba"));
-  // SCREEN(3, 4, F("\xcc\xcd\xcd\xcd\xce\xcd\xcd\xcd\xce\xcd\xcd\xcd\xce\xcd\xcd\xcd\xce\xcd\xcd\xcd\xb9"));
-  // SCREEN(3, 5, F("\xba X \xba O \xba O \xba O \xba X \xba"));
-  // SCREEN(3, 6, F("\xc8\xcd\xcd\xcd\xca\xcd\xcd\xcd\xca\xcd\xcd\xcd\xca\xcd\xcd\xcd\xca\xcd\xcd\xcd\xbc"));
-
-  // Draw single boxes with X O O X inside.
-  // SCREEN(3, 0, F("Summary Data:"));
-  // SCREEN(3, 1, F("\xda\xc4\xc4\xc4\xc2\xc4\xc4\xc4\xc2\xc4\xc4\xc4\xc2\xc4\xc4\xc4\xc2\xc4\xc4\xc4\xbf"));
-  // SCREEN(3, 2, F("\xb3 X \xb3 O \xb3 O \xb3 O \xb3 X \xb3"));
-  // SCREEN(3, 3, F("\xc3\xc4\xc4\xc4\xc5\xc4\xc4\xc4\xc5\xc4\xc4\xc4\xc5\xc4\xc4\xc4\xc5\xc4\xc4\xc4\xb4"));
-  // SCREEN(3, 4, F("\xb3 X \xb3 O \xb3 O \xb3 O \xb3 X \xb3"));
-  // SCREEN(3, 5, F("\xc3\xc4\xc4\xc4\xc5\xc4\xc4\xc4\xc5\xc4\xc4\xc4\xc5\xc4\xc4\xc4\xc5\xc4\xc4\xc4\xb4"));
-  // SCREEN(3, 6, F("\xb3 X \xb3 O \xb3 O \xb3 O \xb3 X \xb3"));
-  // SCREEN(3, 7, F("\xc0\xc4\xc4\xc4\xc1\xc4\xc4\xc4\xc1\xc4\xc4\xc4\xc1\xc4\xc4\xc4\xc1\xc4\xc4\xc4\xd9"));
-
-  // Blocks of different greyness
-  // SCREEN(3, 0, F("\xb0\xb0\xb0\xb0\xb1\xb1\xb1\xb1\xb2\xb2\xb2\xb2\xdb\xdb\xdb\xdb"));
-  // SCREEN(3, 1, F("\xb0\xb0\xb0\xb0\xb1\xb1\xb1\xb1\xb2\xb2\xb2\xb2\xdb\xdb\xdb\xdb"));
-  // SCREEN(3, 2, F("\xb0\xb0\xb0\xb0\xb1\xb1\xb1\xb1\xb2\xb2\xb2\xb2\xdb\xdb\xdb\xdb"));
-
-  // DCCEX logo
-  // SCREEN(3, 1, F("\xb0\xb0\x20\x20\x20\xb0\x20\x20\x20\xb0\x20\x20\x20\x20\xb0\xb0\xb0\x20\xb0\x20\xb0"));
-  // SCREEN(3, 2, F("\xb0\x20\xb0\x20\xb0\x20\xb0\x20\xb0\x20\xb0\x20\x20\x20\xb0\x20\x20\x20\xb0\x20\xb0"));
-  // SCREEN(3, 3, F("\xb0\x20\xb0\x20\xb0\x20\x20\x20\xb0\x20\x20\x20\xb0\x20\xb0\xb0\x20\x20\x20\xb0\x20"));
-  // SCREEN(3, 4, F("\xb0\x20\xb0\x20\xb0\x20\xb0\x20\xb0\x20\xb0\x20\x20\x20\xb0\x20\x20\x20\xb0\x20\xb0"));
-  // SCREEN(3, 5, F("\xb0\xb0\x20\x20\x20\xb0\x20\x20\x20\xb0\x20\x20\x20\x20\xb0\xb0\xb0\x20\xb0\x20\xb0"));
-  // SCREEN(3, 7, F("\xb1\xb1\xb1\xb1\xb1\xb1\xb1\xb1\xb1\xb1\xb1\xb1\xb1\xb1\xb1\xb1\xb1\xb1\xb1\xb1\xb1"));
-  
-#if 0
-  // List versions of devices that respond to the version request
-  for (uint8_t address = 8; address<0x78; address++) {
-    uint8_t buffer[3];
-    uint8_t status = I2CManager.read(0x7c, buffer, sizeof(buffer), 1, address);
-    if (status == I2C_STATUS_OK) {
-      uint16_t manufacturer = ((uint16_t)buffer[0] << 4 ) | (buffer[1] >> 4);
-      uint16_t deviceID = ((uint16_t)(buffer[1] & 0x0f) << 5) | (buffer[2] >> 3);
-      uint16_t dieRevision = buffer[2] & 0x1f;
-      DIAG(F("Addr %s version: %x %x %x"), address.toString(), manufacturer, deviceID, dieRevision);
-    } 
-  }
-#endif
-
-#if I2C_STRESS_TEST
-  UserAddin::create(I2CTest, I2cTestPeriod);
-#endif
-
-#if WIRE_TEST
-  // Test of Wire-I2CManager interface
-  Wire.begin();
-  Wire.setClock(400000);
-  Wire.beginTransmission(0x23);
-  Wire.print("Hello");
-  uint8_t status = Wire.endTransmission();
-  if (status==0) DIAG(F("Wire: device Found on 0x23"));
-
-  Wire.beginTransmission(0x23);
-  Wire.write(0xde);
-  Wire.endTransmission(false); // don't send stop
-  Wire.requestFrom(0x23, 1);
-  if (Wire.available()) {
-    DIAG(F("Wire: value=x%x"), Wire.read());
-  }
-  uint8_t st = I2CManager.write(0x33, 0, 0);
-  DIAG(F("I2CManager 0x33 st=%d \"%S\""), st, 
-    I2CManager.getErrorMessage(st));
-#endif
-
-#if I2C_SETCLOCK
-  // Test I2C clock changes
-  // Set up two I2C request blocks
-  I2CRB rb1, rb2;
-  uint8_t readBuff[32];
-  rb1.setRequestParams(0x23, readBuff, sizeof(readBuff), readBuff, sizeof(readBuff));
-  rb2.setRequestParams(0x23, readBuff, sizeof(readBuff), readBuff, sizeof(readBuff));
-  // First set clock to 400kHz and then issue requests
-  I2CManager.forceClock(400000);
-  I2CManager.queueRequest(&rb1);
-  I2CManager.queueRequest(&rb2);
-  // Wait a little to allow the first transaction to start
-  delayMicroseconds(2);
-  // ... then request a clock speed change
-  I2CManager.forceClock(100000);
-  DIAG(F("I2CClock: rb1 status=%d"), rb1.wait());
-  DIAG(F("I2CClock: rb2 status=%d"), rb2.wait());
-  // Reset clock speed
-  I2CManager.forceClock(400000);
-#endif
-  
-  EXIOExpander::create(2200, 18, {SubBus_0, 0x65});
-  //UserAddin::create(myTest, 1000);
-  // ServoTurnout::create(2200, 2200, 400, 200, 0);
-  // ServoTurnout::create(2200, 2200, 400, 200, 0);
-
-  TouchKeypad::create(2300, 16, 25, 24);
-
-  // GPIO
-  PCF8574::create(800, 8, {SubBus_1, 0x23});
-  //PCF8574::create(808, 8, {SubBus_2, 0x27});
-  PCF8574::create(65000, 8, 0x27);
-
-  MCP23017::create(164,16,{SubBus_3, 0x20});
-  //MCP23017::create(180,16,{SubBus_0, 0x27});
-  Sensor::create(170, 170, 1); // Hall effect, enable pullup.
-  Sensor::create(171, 171, 1);
-
-  // PWM (LEDs and Servos)
-  // For servos, use default 50Hz pulses.
-  PCA9685::create(100, 16, {SubBus_1, 0x41});
-  // For LEDs, use 1kHz pulses.
-  PCA9685::create(116, 16, {SubBus_1, 0x40}, 1000);
-
-  // 4-pin Analogue Input Module
-  //ADS111x::create(4500, 4, 0x48);
-
-  // Laser Time-Of-Flight Sensors
-  VL53L0X::create(5000, 3, {SubBus_0, 0x60}, 300, 310, 46);
-  //VL53L0X::create(5003, 3, {SubBus_6, 0x61}, 300, 310, 47);
-  Sensor::create(5000, 5000, 0);
-  Sensor::create(5003, 5003, 0);
-  // Monitor reset digital on first TOF
-  //Sensor::create(46,46,0);
-
-  // // External 24C256 EEPROM (256kBytes) on I2C address 0x50.
-  // ExternalEEPROM::create({SubBus_0, 0x50}, 256);
-
-  // Play up to 10 sounds on pins 10000-10009. Player is connected to Serial1 or Serial2.
-  #if defined(HAVE_HWSERIAL1) && !defined(ARDUINO_ARCH_STM32)
-  DFPlayer::create(10000, 14, Serial1);
-  #elif defined(ARDUINO_ARCH_STM32)
-  DFPlayer::create(10000, 10, Serial3);  // Pins PC11 (RX) and PC10 (TX)
-  #endif
-
-  // Ultrasound echo device
-  HCSR04::create(2000, 32, 33, 80, 85 /*, HCSR04::LOOP */);
-  Sensor::create(2000, 2000, 0);
-
-#if __has_include("IO_CMRI.h")
-  CMRIbus::create(0, Serial2, 115200, 50, 40); // 50ms cycle, pin 40 for DE/!RE pins
-  CMRInode::create(25000, 72, 0, 0, 'M'); // SMINI address 0
-  for (int pin=0; pin<24; pin++) {
-    Sensor::create(25000+pin, 25000+pin, 0);
-  }
-#endif
-
-  //CMRInode::create(25072, 72, 0, 13, 'M');  // SMINI address 13
-  //CMRInode::create(25144, 288, 0, 14, 'C', 144, 144); // CPNODE address 14
-
-#ifdef NETWORK_PRESENT
-  // Define remote pins to be used.  The range of remote pins is like a common data area shared
-  // between all nodes.
-  // For outputs, a write to a remote VPIN causes a message to be sent to another node, which then performs
-  // the write operation on the device VPIN that is local to that node.
-  // For inputs, the state of remote input VPIN is read on the node where it is connected, and then 
-  // sent to other nodes in the system where the state is saved and processed.  Updates are sent on change, and
-  // also periodically if no changes.
-  //
-  // Each definition is a triple of remote node, remote pin, indexed by relative pin.  Up to 224 rpins can
-  // be configured (per node).  This is to fit into a 32-byte packet.
-  REMOTEPINS rpins[] = {
-      {30,164,RPIN_IN} ,       //4000  Node 30, first MCP23017 pin, input
-      {30,165,RPIN_IN},        //4001  Node 30, second MCP23017 pin, input
-      {30,166,RPIN_OUT},       //4002  Node 30, third MCP23017 pin, output
-      {30,166,RPIN_OUT},       //4003  Node 30, fourth MCP23017 pin, output
-      {30,100,RPIN_INOUT},     //4004  Node 30, first PCA9685 servo pin
-      {30,101,RPIN_INOUT},     //4005  Node 30, second PCA9685 servo pin
-      {30,102,RPIN_INOUT},     //4006  Node 30, third PCA9685 servo pin
-      {30,103,RPIN_INOUT},     //4007  Node 30, fourth PCA9685 servo pin
-      {30,24,RPIN_IN},         //4008  Node 30, Arduino pin D24
-      {30,25,RPIN_IN},         //4009  Node 30, Arduino pin D25
-      {30,26,RPIN_IN},         //4010  Node 30, Arduino pin D26
-      {30,27,RPIN_IN},         //4011  Node 30, Arduino pin D27
-      {30,1000,RPIN_OUT},      //4012  Node 30, DFPlayer playing flag (when read) / Song selector (when written)
-      {30,5000,RPIN_IN},       //4013  Node 30, VL53L0X detect pin
-      {30,VPIN_NONE,0},        //4014  Node 30, spare
-      {30,VPIN_NONE,0},        //4015  Node 30, spare
-    
-      {31,164,RPIN_IN} ,       //4016  Node 31, first MCP23017 pin, input
-      {31,165,RPIN_IN},        //4017  Node 31, second MCP23017 pin, input
-      {31,166,RPIN_OUT},       //4018  Node 31, third MCP23017 pin, output
-      {31,166,RPIN_OUT},       //4019  Node 31, fourth MCP23017 pin, output
-      {31,100,RPIN_INOUT},     //4020  Node 31, first PCA9685 servo pin
-      {31,101,RPIN_INOUT},     //4021  Node 31, second PCA9685 servo pin
-      {31,102,RPIN_INOUT},     //4022  Node 31, third PCA9685 servo pin
-      {31,103,RPIN_INOUT},     //4023  Node 31, fourth PCA9685 servo pin
-      {31,24,RPIN_IN},         //4024  Node 31, Arduino pin D24
-      {31,25,RPIN_IN},         //4025  Node 31, Arduino pin D25
-      {31,26,RPIN_IN},         //4026  Node 31, Arduino pin D26
-      {31,27,RPIN_IN},         //4027  Node 31, Arduino pin D27
-      {31,3,RPIN_IN},          //4028  Node 31, Arduino pin D3
-      {31,VPIN_NONE,0},        //4029  Node 31, spare
-      {31,VPIN_NONE,0},        //4030  Node 31, spare
-      {31,VPIN_NONE,0}         //4031  Node 31, spare
-    };
-  // FirstVPIN, nPins, thisNode, pinDefs, CEPin, CSNPin
-  // Net_RF24 *rf24Driver = new Net_RF24(48, 49);
-  // Network<Net_RF24>::create(4000, NUMREMOTEPINS(rpins), NODE, rpins, rf24Driver);
-  #if NODE==30
-  //Net_ENC28J60 *encDriver = new Net_ENC28J60(49);
-  //Network<Net_ENC28J60>::create(4000, NUMREMOTEPINS(rpins), NODE, rpins, encDriver);
-  #elif NODE==31
-  Net_ENC28J60 *encDriver = new Net_ENC28J60(53);
-  Network<Net_ENC28J60>::create(4000, NUMREMOTEPINS(rpins), NODE, rpins, encDriver);
-  #else
-  Net_Ethernet *etherDriver = new Net_Ethernet();
-  Network<Net_Ethernet>::create(4000, NUMREMOTEPINS(rpins), NODE, rpins, etherDriver);
-  #endif
-  for (int i=0; i<=32; i++) 
-    Sensor::create(4000+i, 4000+i, 0);
-#endif
-
-#ifdef ARDUINO_ARCH_STM32
-//PCF8574::create(1900, 8, 0x27);
-Sensor::create(1900,100,1);
-Sensor::create(1901,101,1);
-#endif
-
-}
-#endif // IO_NO_HAL
--- a/myHal.cpp_example.txt
+++ b/myHal.cpp_example.txt
@@ -17,11 +17,9 @@

 // Include devices you need.
 #include "IODevice.h"
-//#include "IO_HALDisplay.h"  // Auxiliary display devices (LCD/OLED)
-//#include "IO_HCSR04.h"    // Ultrasonic range sensor
-//#include "IO_VL53L0X.h"   // Laser time-of-flight sensor
-//#include "IO_DFPlayer.h"  // MP3 sound player
-//#include "IO_TouchKeypad.h  // Touch keypad with 16 keys
+#include "IO_HCSR04.h"    // Ultrasonic range sensor
+#include "IO_VL53L0X.h"   // Laser time-of-flight sensor
+#include "IO_DFPlayer.h"  // MP3 sound player
 //#include "IO_EXTurntable.h"   // Turntable-EX turntable controller
 //#include "IO_EXFastClock.h"  // FastClock driver

@@ -33,61 +31,6 @@

 void halSetup() {

-  //=======================================================================
-  // The following directives define auxiliary display devices.
-  // These can be defined in addition to the system display (display
-  // number 0) that is defined in config.h.
-  // A write to a line which is beyond the length of the screen will overwrite
-  // the bottom line, unless the line number is 255 in which case the 
-  // screen contents will scroll up before the text is written to the
-  // bottom line.
-  //=======================================================================
-  // 
-  // Create a 128x32 OLED display device as display number 1 
-  // (line 0 is written by EX-RAIL 'SCREEN(1, 0, "text")').
-
-  //HALDisplay<OLED>::create(1, 0x3d, 128, 32);
-
-  // Create a 20x4 LCD display device as display number 2 
-  // (line 0 is written by EX-RAIL 'SCREEN(2, 0, "text")').
-
-  // HALDisplay<LiquidCrystal>(2, 0x27, 20, 4);
-
-
-  //=======================================================================
-  // User Add-ins
-  //=======================================================================
-  // User add-ins can be created when you want to do something that 
-  // can't be done in EX-RAIL but does not merit a HAL driver.  The 
-  // user add-in is a C++ function that is executed periodically by the
-  // HAL subsystem.
-
-  // Example: The function will be executed once per second and will display, 
-  // on screen #3, the first eight entries (assuming an 8-line display)
-  // from the loco speed table.
-  
-  // Put the following block of code in myHal.cpp OUTSIDE of the 
-  //   halSetup() function:
-  //
-  // void updateLocoScreen() {
-  //   for (int i=0; i<8; i++) {
-  //     if (DCC::speedTable[i].loco > 0) {
-  //       int speed = DCC::speedTable[i].speedCode;
-  //       char direction = (speed & 0x80) ? 'R' : 'F';
-  //       speed = speed & 0x7f;
-  //       if (speed > 0) speed = speed - 1;
-  //       SCREEN(3, i, F("Loco:%4d %3d %c"), DCC::speedTable[i].loco,
-  //         speed, direction);
-  //     }
-  //   }
-  // }
-  //
-  // Put the following line INSIDE the halSetup() function:
-  //
-  // UserAddin::create(updateLocoScreen, 1000);
-  //
-
-
  //=======================================================================
  // The following directive defines a PCA9685 PWM Servo driver module.
  //=======================================================================
@@ -145,21 +88,6 @@ void halSetup() {
  //PCF8574::create(200, 8, 0x23, 40);


-  //=======================================================================
-  // The following directive defines a PCF8575 16-port I2C GPIO Extender module.
-  //=======================================================================
-  // The parameters are: 
-  //   First Vpin=200
-  //   Number of VPINs=16 (numbered 200-215)
-  //   I2C address of module=0x23
-
-  //PCF8575::create(200, 16, 0x23);
-
-
-  // Alternative form using INT pin (see above)
-
-  //PCF8575::create(200, 16, 0x23, 40);
-
  //=======================================================================
  // The following directive defines an HCSR04 ultrasonic ranging module.
  //=======================================================================
@@ -213,12 +141,12 @@ void halSetup() {
  // With these parameters, up to 10 files may be played on pins 10000-10009.
  // Play is started from EX-RAIL with SET(10000) for first mp3 file, SET(10001)
  // for second file, etc.  Play may also be initiated by writing an analogue
-  // value to the first pin, e.g. ANOUT(10000,23,0,0) will play the 23rd mp3 file.
-  // ANOUT(10000,23,30,0) will do the same thing, as well as setting the volume to 
+  // value to the first pin, e.g. SERVO(10000,23,0) will play the 23rd mp3 file.
+  // SERVO(10000,23,30) will do the same thing, as well as setting the volume to 
  // 30 (maximum value).
  // Play is stopped by RESET(10000) (or any other allocated VPIN).
  // Volume may also be set by writing an analogue value to the second pin for the player, 
-  // e.g. ANOUT(10001,30,0,0) sets volume to maximum (30).
+  // e.g. SERVO(10001,30,0) sets volume to maximum (30).
  // The EX-RAIL script may check for completion of play by calling WAITFOR(pin), which will only proceed to the
  // following line when the player is no longer busy.
  // E.g.
@@ -227,27 +155,12 @@ void halSetup() {
  //      SET(10003)        // Play fourth MP3 file
  //      LCD(4, "Playing") // Display message on LCD/OLED
  //      WAITFOR(10003)    // Wait for playing to finish
-  //      LCD(4, "")       // Clear LCD/OLED line 
+  //      LCD(4, " ")       // Clear LCD/OLED line 
  //      FOLLOW(1)         // Go back to start

  // DFPlayer::create(10000, 10, Serial1);


-  //=======================================================================
-  // 16-pad capacitative touch key pad based on TP229 IC.
-  //=======================================================================
-  // Parameters below:
-  //   11000 = first VPIN allocated
-  //   16 = number of VPINs allocated
-  //   25 = local GPIO pin number for clock signal
-  //   24 = local GPIO pin number for data signal
-  //
-  // Pressing the key pads numbered 1-16 cause each of the nominated digital VPINs 
-  // (11000-11015 in this case) to be activated.
-
-  // TouchKeypad::create(11000, 16, 25, 24);
-
-
  //=======================================================================
  // The following directive defines an EX-Turntable turntable instance.
  //=======================================================================
--- a/platformio.ini
+++ b/platformio.ini
@@ -20,18 +20,16 @@ default_envs =
 	ESP32
 	Nucleo-F411RE
 	Nucleo-F446RE
-	Teensy3_2
-	Teensy3_5
-	Teensy3_6
-	Teensy4_0
-	Teensy4_1
+	Teensy3.2
+	Teensy3.5
+	Teensy3.6
+	Teensy4.0
+	Teensy4.1
 src_dir = .
 include_dir = .

 [env]
 build_flags = -Wall -Wextra
-monitor_filters = time
-; lib_deps = adafruit/Adafruit ST7735 and ST7789 Library @ ^1.10.0

 [env:samd21-dev-usb]
 platform = atmelsam
@@ -53,15 +51,6 @@ monitor_speed = 115200
 monitor_echo = yes
 build_flags = -std=c++17

-[env:Arduino-M0]
-platform = atmelsam
-board = mzeroUSB
-framework = arduino
-lib_deps = ${env.lib_deps}
-monitor_speed = 115200
-monitor_echo = yes
-build_flags = -std=c++17 ; -DI2C_USE_WIRE  -DDIAG_LOOPTIMES -DDIAG_IO
-
 [env:mega2560-debug]
 platform = atmelavr
 board = megaatmega2560
@@ -72,7 +61,7 @@ lib_deps =
 	SPI
 monitor_speed = 115200
 monitor_echo = yes
-build_flags =  -DDIAG_IO=2 -DDIAG_LOOPTIMES
+build_flags = -DDIAG_IO -DDIAG_LOOPTIMES

 [env:mega2560-no-HAL]
 platform = atmelavr
@@ -84,7 +73,7 @@ lib_deps =
 	SPI
 monitor_speed = 115200
 monitor_echo = yes
-build_flags = -DIO_NO_HAL 
+build_flags = -DIO_NO_HAL

 [env:mega2560-I2C-wire]
 platform = atmelavr
@@ -108,7 +97,7 @@ lib_deps =
 	SPI
 monitor_speed = 115200
 monitor_echo = yes
-build_flags =     ; -DDIAG_LOOPTIMES
+build_flags = -mcall-prologues

 [env:mega328]
 platform = atmelavr
@@ -144,7 +133,7 @@ lib_deps =
 monitor_speed = 115200
 monitor_echo = yes
 upload_speed = 19200
-build_flags = 
+build_flags = -DDIAG_IO

 [env:uno]
 platform = atmelavr
@@ -173,8 +162,6 @@ board = esp32dev
 framework = arduino
 lib_deps = ${env.lib_deps}
 build_flags = -std=c++17
-monitor_speed = 115200
-monitor_echo = yes

 [env:Nucleo-F411RE]
 platform = ststm32
@@ -190,11 +177,11 @@ platform = ststm32
 board = nucleo_f446re
 framework = arduino
 lib_deps = ${env.lib_deps}
-build_flags = -std=c++17  -Os -g2 -Wunused-variable ; -DDIAG_LOOPTIMES ; -DDIAG_IO 
+build_flags = -std=c++17  -Os -g2 -Wunused-variable
 monitor_speed = 115200
 monitor_echo = yes

-[env:Teensy3_2]
+[env:Teensy3.2]
 platform = teensy
 board = teensy31
 framework = arduino
@@ -202,7 +189,7 @@ build_flags = -std=c++17  -Os -g2
 lib_deps = ${env.lib_deps}
 lib_ignore = NativeEthernet

-[env:Teensy3_5]
+[env:Teensy3.5]
 platform = teensy
 board = teensy35
 framework = arduino
@@ -210,7 +197,7 @@ build_flags = -std=c++17  -Os -g2
 lib_deps = ${env.lib_deps}
 lib_ignore = NativeEthernet

-[env:Teensy3_6]
+[env:Teensy3.6]
 platform = teensy
 board = teensy36
 framework = arduino
@@ -218,7 +205,7 @@ build_flags = -std=c++17  -Os -g2
 lib_deps = ${env.lib_deps}
 lib_ignore = NativeEthernet

-[env:Teensy4_0]
+[env:Teensy4.0]
 platform = teensy
 board = teensy40
 framework = arduino
@@ -226,7 +213,7 @@ build_flags = -std=c++17  -Os -g2
 lib_deps = ${env.lib_deps}
 lib_ignore = NativeEthernet

-[env:Teensy4_1]
+[env:Teensy4.1]
 platform = teensy
 board = teensy41
 framework = arduino
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Harald Barth	802f9c96b4	DC via power pin 3rd part	2023-02-13 20:48:48 +01:00
Harald Barth	0e36b3b997	DC via power pin 2nd part	2023-02-13 17:06:33 +01:00
Harald Barth	9482041799	DC via power pin 1st try	2023-02-12 23:31:13 +01:00