yaml syntax

Compiler isn't as clever as one might expect

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Install Python Wheel
       run: pip install wheel
     - name: Install PlatformIO Core
-      run: pip install -U platformio
+      run: pip install -U https://github.com/platformio/platformio/archive/v4.2.1.zip
     - name: Copy generic config over
       run: cp config.example.h config.h
     - name: Compile Command Station (AVR)

.gitignore

@@ -8,4 +8,3 @@ Release/*
 .vscode/
 config.h
 .vscode/extensions.json
-mySetup.h

CommandDistributor.cpp

@@ -25,7 +25,7 @@ DCCEXParser * CommandDistributor::parser=0;
 void  CommandDistributor::parse(byte clientId,byte * buffer, RingStream * streamer) {
  if (buffer[0] == '<')  {
     if (!parser) parser = new DCCEXParser();
-    parser->parse(streamer, buffer, streamer); 
+    parser->parse(streamer, buffer, true); // tell JMRI parser that ACKS are blocking because we can't handle the async
   }
   else WiThrottle::getThrottle(clientId)->parse(streamer, buffer);
 }

CommandStation-EX.ino

@@ -58,9 +58,10 @@ void setup()
   // Responsibility 1: Start the usb connection for diagnostics
   // This is normally Serial but uses SerialUSB on a SAMD processor
   Serial.begin(115200);
+  DIAG(F("DCC++ EX v%S"),F(VERSION));
    
   CONDITIONAL_LCD_START {
-    // This block is still executed for DIAGS if LCD not in use 
+    // This block is ignored if LCD not in use 
     LCD(0,F("DCC++ EX v%S"),F(VERSION));
     LCD(1,F("Starting")); 
     }   
@@ -95,11 +96,6 @@ void setup()
         #undef SETUP
        #endif
 
-  #if defined(LCN_SERIAL)
-      LCN_SERIAL.begin(115200); 
-      LCN::init(LCN_SERIAL);
-  #endif
-
   LCD(1,F("Ready")); 
 }
 
@@ -126,19 +122,17 @@ void loop()
   RMFT::loop();
 #endif
 
-  #if defined(LCN_SERIAL) 
-      LCN::loop();
-  #endif
-
   LCDDisplay::loop();  // ignored if LCD not in use 
   
-  // Report any decrease in memory (will automatically trigger on first call)
-  static int ramLowWatermark = __INT_MAX__; // replaced on first loop 
+// Optionally report any decrease in memory (will automatically trigger on first call)
+#if ENABLE_FREE_MEM_WARNING
+  static int ramLowWatermark = 32767; // replaced on first loop 
 
-  int freeNow = minimumFreeMemory();
+  int freeNow = freeMemory();
   if (freeNow < ramLowWatermark)
   {
     ramLowWatermark = freeNow;
     LCD(2,F("Free RAM=%5db"), ramLowWatermark);
   }
+#endif
 }

DCC.cpp

@@ -45,12 +45,10 @@ const byte FN_GROUP_4=0x08;
 const byte FN_GROUP_5=0x10;         
 
 FSH* DCC::shieldName=NULL;
-byte DCC::joinRelay=UNUSED_PIN;
-byte DCC::globalSpeedsteps=128;
 
 void DCC::begin(const FSH * motorShieldName, MotorDriver * mainDriver, MotorDriver* progDriver) {
   shieldName=(FSH *)motorShieldName;
-  StringFormatter::send(Serial,F("<iDCC-EX V-%S / %S / %S G-%S>\n"), F(VERSION), F(ARDUINO_TYPE), shieldName, F(GITHUB_SHA));
+  DIAG(F("<iDCC-EX V-%S / %S / %S G-%S>\n"), F(VERSION), F(ARDUINO_TYPE), shieldName, F(GITHUB_SHA));
 
   // Load stuff from EEprom
   (void)EEPROM; // tell compiler not to warn this is unused
@@ -59,14 +57,6 @@ void DCC::begin(const FSH * motorShieldName, MotorDriver * mainDriver, MotorDriv
   DCCWaveform::begin(mainDriver,progDriver); 
 }
 
-void DCC::setJoinRelayPin(byte joinRelayPin) {
-  joinRelay=joinRelayPin;
-  if (joinRelay!=UNUSED_PIN) {
-    pinMode(joinRelay,OUTPUT);
-    digitalWrite(joinRelay,LOW);  // LOW is relay disengaged
-  }
-}
-
 void DCC::setThrottle( uint16_t cab, uint8_t tSpeed, bool tDirection)  {
   byte speedCode = (tSpeed & 0x7F)  + tDirection * 128; 
   setThrottle2(cab, speedCode);
@@ -78,45 +68,19 @@ void DCC::setThrottle2( uint16_t cab, byte speedCode)  {
 
   uint8_t b[4];
   uint8_t nB = 0;
-  // DIAG(F("setSpeedInternal %d %x"),cab,speedCode);
+  // DIAG(F("\nsetSpeedInternal %d %x"),cab,speedCode);
   
   if (cab > 127)
     b[nB++] = highByte(cab) | 0xC0;    // convert train number into a two-byte address
   b[nB++] = lowByte(cab);
-
-  if (globalSpeedsteps <= 28) {
-
-    uint8_t speed128 = speedCode & 0x7F;
-    uint8_t speed28;
-    uint8_t code28;
-
-    if (speed128 == 0 || speed128 == 1) { // stop or emergency stop
-      code28 = speed128;
-    } else {
-      speed28= (speed128*10+36)/46;                 // convert 2-127 to 1-28
-/*
-      if (globalSpeedsteps <= 14)                   // Don't want to do 14 steps, to get F0 there is ugly
-        code28 = (speed28+3)/2 | (Value of F0);     // convert 1-28 to DCC 14 step speed code
-      else
-*/
-      code28 = (speed28+3)/2 | ( (speed28 & 1) ? 0 : 0b00010000 ); // convert 1-28 to DCC 28 step speed code
-    }
-    //        Construct command byte from:
-    //        command      speed    direction
-    b[nB++] = 0b01000000 | code28 | ((speedCode & 0x80) ? 0b00100000 : 0);
-
-  } else { // 128 speedsteps
-
-    b[nB++] = SET_SPEED;                      // 128-step speed control byte
-    b[nB++] = speedCode; // for encoding see setThrottle
-
-  }
+  b[nB++] = SET_SPEED;                      // 128-step speed control byte
+  b[nB++] = speedCode; // for encoding see setThrottle
 
   DCCWaveform::mainTrack.schedulePacket(b, nB, 0);
 }
 
 void DCC::setFunctionInternal(int cab, byte byte1, byte byte2) {
-  // DIAG(F("setFunctionInternal %d %x %x"),cab,byte1,byte2);
+  // DIAG(F("\nsetFunctionInternal %d %x %x"),cab,byte1,byte2);
   byte b[4];
   byte nB = 0;
 
@@ -126,7 +90,7 @@ void DCC::setFunctionInternal(int cab, byte byte1, byte byte2) {
   if (byte1!=0) b[nB++] = byte1;
   b[nB++] = byte2;
 
-  DCCWaveform::mainTrack.schedulePacket(b, nB, 0);
+  DCCWaveform::mainTrack.schedulePacket(b, nB, 3);     // send packet 3 times
 }
 
 uint8_t DCC::getThrottleSpeed(int cab) {
@@ -142,29 +106,8 @@ bool DCC::getThrottleDirection(int cab) {
 }
 
 // Set function to value on or off
-void DCC::setFn( int cab, int16_t functionNumber, bool on) {
-  if (cab<=0 ) return;
-  
-  if (functionNumber>28) { 
-    //non reminding advanced binary bit set 
-    byte b[5];
-    byte nB = 0;
-    if (cab > 127)
-      b[nB++] = highByte(cab) | 0xC0;    // convert train number into a two-byte address
-    b[nB++] = lowByte(cab);
-    if (functionNumber <= 127) {
-       b[nB++] = 0b11011101;   // Binary State Control Instruction short form  
-       b[nB++] = functionNumber | (on ? 0x80 : 0);
-    }
-    else  {
-       b[nB++] = 0b11000000;   // Binary State Control Instruction long form  
-       b[nB++] = (functionNumber & 0x7F) | (on ? 0x80 : 0);  // low order bits and state flag
-       b[nB++] = functionNumber >>7 ;  // high order bits
-    }
-    DCCWaveform::mainTrack.schedulePacket(b, nB, 4);
-    return;
-  }
-  
+void DCC::setFn( int cab, byte functionNumber, bool on) {
+  if (cab<=0 || functionNumber>28) return;
   int reg = lookupSpeedTable(cab);
   if (reg<0) return;  
 
@@ -183,7 +126,7 @@ void DCC::setFn( int cab, int16_t functionNumber, bool on) {
 // Change function according to how button was pressed,
 // typically in WiThrottle.
 // Returns new state or -1 if nothing was changed.
-int DCC::changeFn( int cab, int16_t functionNumber, bool pressed) {
+int DCC::changeFn( int cab, byte functionNumber, bool pressed) {
   int funcstate = -1;
   if (cab<=0 || functionNumber>28) return funcstate;
   int reg = lookupSpeedTable(cab);
@@ -205,15 +148,15 @@ int DCC::changeFn( int cab, int16_t functionNumber, bool pressed) {
   } else {
       // toggle function on press, ignore release
       if (pressed) {
-        speedTable[reg].functions ^= funcmask;
+	  speedTable[reg].functions ^= funcmask;
       }
-      funcstate = (speedTable[reg].functions & funcmask)? 1 : 0;
+      funcstate = speedTable[reg].functions & funcmask;
   }
   updateGroupflags(speedTable[reg].groupFlags, functionNumber);
   return funcstate;
 }
 
-int DCC::getFn( int cab, int16_t functionNumber) {
+int DCC::getFn( int cab, byte functionNumber) {
   if (cab<=0 || functionNumber>28) return -1;  // unknown
   int reg = lookupSpeedTable(cab);
   if (reg<0) return -1;  
@@ -224,7 +167,7 @@ int DCC::getFn( int cab, int16_t functionNumber) {
 
 // Set the group flag to say we have touched the particular group.
 // A group will be reminded only if it has been touched.  
-void DCC::updateGroupflags(byte & flags, int16_t functionNumber) {
+void DCC::updateGroupflags(byte & flags, int functionNumber) {
   byte groupMask;
   if (functionNumber<=4)       groupMask=FN_GROUP_1;
   else if (functionNumber<=8)  groupMask=FN_GROUP_2;
@@ -248,10 +191,6 @@ void DCC::setAccessory(int address, byte number, bool activate) {
   DCCWaveform::mainTrack.schedulePacket(b, 2, 4);      // Repeat the packet four times
 }
 
-//
-// writeCVByteMain: Write a byte with PoM on main. This writes
-// the 5 byte sized packet to implement this DCC function
-//
 void DCC::writeCVByteMain(int cab, int cv, byte bValue)  {
   byte b[5];
   byte nB = 0;
@@ -266,10 +205,6 @@ void DCC::writeCVByteMain(int cab, int cv, byte bValue)  {
   DCCWaveform::mainTrack.schedulePacket(b, nB, 4);
 }
 
-//
-// writeCVBitMain: Write a bit of a byte with PoM on main. This writes
-// the 5 byte sized packet to implement this DCC function
-//
 void DCC::writeCVBitMain(int cab, int cv, byte bNum, bool bValue)  {
   byte b[5];
   byte nB = 0;
@@ -288,7 +223,6 @@ void DCC::writeCVBitMain(int cab, int cv, byte bNum, bool bValue)  {
 }
 
 void DCC::setProgTrackSyncMain(bool on) {
-  if (joinRelay!=UNUSED_PIN) digitalWrite(joinRelay,on?HIGH:LOW);
   DCCWaveform::progTrackSyncMain=on;
 }
 void DCC::setProgTrackBoost(bool on) {
@@ -342,9 +276,9 @@ const ackOp FLASH READ_BIT_PROG[] = {
      
 const ackOp FLASH WRITE_BYTE_PROG[] = {
       BASELINE,
-      WB,WACK,ITC1,    // Write and callback(1) if ACK 
-      // handle decoders that dont ack a write 
-      VB,WACK,ITC1,    // validate byte and callback(1) if correct 
+      WB,WACK,    // Write 
+      VB,WACK,     // validate byte 
+      ITC1,       // if ok callback (1)
       FAIL        // callback (-1)
       };
       
@@ -398,6 +332,10 @@ const ackOp FLASH READ_CV_PROG[] = {
 
 const ackOp FLASH LOCO_ID_PROG[] = {
       BASELINE,
+      SETCV, (ackOp)1,   
+      SETBIT, (ackOp)7,
+      V0,WACK,NAKFAIL, // test CV 1 bit 7 is a zero... NAK means no loco found
+
       SETCV, (ackOp)19,     // CV 19 is consist setting
       SETBYTE, (ackOp)0,    
       VB, WACK, ITSKIP,     // ignore consist if cv19 is zero (no consist)
@@ -466,15 +404,14 @@ const ackOp FLASH SHORT_LOCO_ID_PROG[] = {
       BASELINE,
       SETCV,(ackOp)19,
       SETBYTE, (ackOp)0,
-      WB,WACK,     // ignore dedcoder without cv19 support
+      WB,WACK,     // ignore router without cv19 support
       // Turn off long address flag
       SETCV,(ackOp)29,
       SETBIT,(ackOp)5,
-      W0,WACK,
-      V0,WACK,NAKFAIL,
+      W0,WACK,NAKFAIL,
       SETCV, (ackOp)1,   
       SETBYTEL,   // low byte of word 
-      WB,WACK,    // some decoders don't ACK writes
+      WB,WACK,NAKFAIL,
       VB,WACK,ITCB,
       FAIL
 };    
@@ -484,84 +421,89 @@ const ackOp FLASH LONG_LOCO_ID_PROG[] = {
       // Clear consist CV 19
       SETCV,(ackOp)19,
       SETBYTE, (ackOp)0,
-      WB,WACK,     // ignore decoder without cv19 support
+      WB,WACK,     // ignore router without cv19 support
       // Turn on long address flag cv29 bit 5
       SETCV,(ackOp)29,
       SETBIT,(ackOp)5,
-      W1,WACK,
-      V1,WACK,NAKFAIL,
+      W1,WACK,NAKFAIL,
       // Store high byte of address in cv 17
       SETCV, (ackOp)17,
       SETBYTEH,   // high byte of word 
-      WB,WACK,
+      WB,WACK,NAKFAIL,
       VB,WACK,NAKFAIL,
       // store 
       SETCV, (ackOp)18,
       SETBYTEL,   // low byte of word 
-      WB,WACK,
+      WB,WACK,NAKFAIL,
       VB,WACK,ITC1,   // callback(1) means Ok
       FAIL
 };    
 
-void  DCC::writeCVByte(int16_t cv, byte byteValue, ACK_CALLBACK callback)  {
-  ackManagerSetup(cv, byteValue,  WRITE_BYTE_PROG, callback);
+// On the following prog-track functions blocking defaults to false.
+// blocking=true forces the API to block, waiting for the response and invoke the callback BEFORE returning.
+// During that wait, other parts of the system will be unresponsive.
+// blocking =false means the callback will be called some time after the API returns (typically a few tenths of a second)
+//  but that would be very inconvenient in a Wifi situaltion where the stream becomes 
+//  unuavailable immediately after the API rerturns. 
+
+void  DCC::writeCVByte(int cv, byte byteValue, ACK_CALLBACK callback, bool blocking)  {
+  ackManagerSetup(cv, byteValue,  WRITE_BYTE_PROG, callback, blocking);
 }
 
-void DCC::writeCVBit(int16_t cv, byte bitNum, bool bitValue, ACK_CALLBACK callback)  {
+
+void DCC::writeCVBit(int cv, byte bitNum, bool bitValue, ACK_CALLBACK callback, bool blocking)  {
   if (bitNum >= 8) callback(-1);
-  else ackManagerSetup(cv, bitNum, bitValue?WRITE_BIT1_PROG:WRITE_BIT0_PROG, callback);
+  else ackManagerSetup(cv, bitNum, bitValue?WRITE_BIT1_PROG:WRITE_BIT0_PROG, callback, blocking);
 }
 
-void  DCC::verifyCVByte(int16_t cv, byte byteValue, ACK_CALLBACK callback)  {
-  ackManagerSetup(cv, byteValue,  VERIFY_BYTE_PROG, callback);
+void  DCC::verifyCVByte(int cv, byte byteValue, ACK_CALLBACK callback, bool blocking)  {
+  ackManagerSetup(cv, byteValue,  VERIFY_BYTE_PROG, callback, blocking);
 }
 
-void DCC::verifyCVBit(int16_t cv, byte bitNum, bool bitValue, ACK_CALLBACK callback)  {
+
+void DCC::verifyCVBit(int cv, byte bitNum, bool bitValue, ACK_CALLBACK callback, bool blocking)  {
   if (bitNum >= 8) callback(-1);
-  else ackManagerSetup(cv, bitNum, bitValue?VERIFY_BIT1_PROG:VERIFY_BIT0_PROG, callback);
+  else ackManagerSetup(cv, bitNum, bitValue?VERIFY_BIT1_PROG:VERIFY_BIT0_PROG, callback, blocking);
 }
 
 
-void DCC::readCVBit(int16_t cv, byte bitNum, ACK_CALLBACK callback)  {
+void DCC::readCVBit(int cv, byte bitNum, ACK_CALLBACK callback, bool blocking)  {
   if (bitNum >= 8) callback(-1);
-  else ackManagerSetup(cv, bitNum,READ_BIT_PROG, callback);
+  else ackManagerSetup(cv, bitNum,READ_BIT_PROG, callback, blocking);
 }
 
-void DCC::readCV(int16_t cv, ACK_CALLBACK callback)  {
-  ackManagerSetup(cv, 0,READ_CV_PROG, callback);
+void DCC::readCV(int cv, ACK_CALLBACK callback, bool blocking)  {
+  ackManagerSetup(cv, 0,READ_CV_PROG, callback, blocking);
 }
 
-void DCC::getLocoId(ACK_CALLBACK callback) {
-  ackManagerSetup(0,0, LOCO_ID_PROG, callback);
+void DCC::getLocoId(ACK_CALLBACK callback, bool blocking) {
+  ackManagerSetup(0,0, LOCO_ID_PROG, callback, blocking);
 }
 
-void DCC::setLocoId(int id,ACK_CALLBACK callback) {
+void DCC::setLocoId(int id,ACK_CALLBACK callback, bool blocking) {
   if (id<1 || id>10239) { //0x27FF according to standard
     callback(-1);
     return;
   }
   if (id<=127)
-      ackManagerSetup(id, SHORT_LOCO_ID_PROG, callback);
+      ackManagerSetup(id, SHORT_LOCO_ID_PROG, callback, blocking);
   else
-      ackManagerSetup(id | 0xc000,LONG_LOCO_ID_PROG, callback);
+      ackManagerSetup(id | 0xc000,LONG_LOCO_ID_PROG, callback, blocking);
 }
 
-void DCC::forgetLoco(int cab) {  // removes any speed reminders for this loco
-  setThrottle2(cab,1); // ESTOP this loco if still on track  
+void DCC::forgetLoco(int cab) {  // removes any speed reminders for this loco  
   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      
-  for (int i=0;i<MAX_LOCOS;i++) speedTable[i].loco=0;
+  for (int i=0;i<MAX_LOCOS;i++) speedTable[i].loco=0;  
 }
 
 byte DCC::loopStatus=0;  
 
 void DCC::loop()  {
-  DCCWaveform::loop(ackManagerProg!=NULL); // power overload checks
-  ackManagerLoop();    // maintain prog track ack manager
+  DCCWaveform::loop(); // power overload checks
+  ackManagerLoop(false);    // maintain prog track ack manager
   issueReminders();
 }
 
@@ -589,7 +531,7 @@ bool DCC::issueReminder(int reg) {
   
   switch (loopStatus) {
         case 0:
-      //   DIAG(F("Reminder %d speed %d"),loco,speedTable[reg].speedCode);
+      //   DIAG(F("\nReminder %d speed %d"),loco,speedTable[reg].speedCode);
          setThrottle2(loco, speedTable[reg].speedCode);
          break;
        case 1: // remind function group 1 (F0-F4)
@@ -647,7 +589,7 @@ int DCC::lookupSpeedTable(int locoId) {
   }
   if (reg == MAX_LOCOS) reg = firstEmpty;
   if (reg >= MAX_LOCOS) {
-    DIAG(F("Too many locos"));
+    DIAG(F("\nToo many locos\n"));
     return -1;
   }
   if (reg==firstEmpty){
@@ -685,93 +627,83 @@ int    DCC::ackManagerWord;
 int    DCC::ackManagerCv;
 byte   DCC::ackManagerBitNum;
 bool   DCC::ackReceived;
-bool   DCC::ackManagerRejoin;
-
-CALLBACK_STATE DCC::callbackState=READY;
 
 ACK_CALLBACK DCC::ackManagerCallback;
 
-void  DCC::ackManagerSetup(int cv, byte byteValueOrBitnum, ackOp const program[], ACK_CALLBACK callback) {
-  if (!DCCWaveform::progTrack.canMeasureCurrent()) {
-    callback(-2);
-    return;
-  }
-
-  ackManagerRejoin=DCCWaveform::progTrackSyncMain;     
-  if (ackManagerRejoin ) {
-        // Change from JOIN must zero resets packet.
-        setProgTrackSyncMain(false);
-        DCCWaveform::progTrack.sentResetsSincePacket = 0;      
-      }
-      
-   DCCWaveform::progTrack.autoPowerOff=false;           
-   if (DCCWaveform::progTrack.getPowerMode() == POWERMODE::OFF) {
-        DCCWaveform::progTrack.autoPowerOff=true;  // power off afterwards           
-        if (Diag::ACK) DIAG(F("Auto Prog power on"));
-        DCCWaveform::progTrack.setPowerMode(POWERMODE::ON);
-        DCCWaveform::progTrack.sentResetsSincePacket = 0;      
-    }
-
+void  DCC::ackManagerSetup(int cv, byte byteValueOrBitnum, ackOp const program[], ACK_CALLBACK callback, bool blocking) {
   ackManagerCv = cv;
   ackManagerProg = program;
   ackManagerByte = byteValueOrBitnum;
   ackManagerBitNum=byteValueOrBitnum;
   ackManagerCallback = callback;
+  if (blocking) ackManagerLoop(blocking);
 }
 
-void  DCC::ackManagerSetup(int wordval, ackOp const program[], ACK_CALLBACK callback) {
+void  DCC::ackManagerSetup(int wordval, ackOp const program[], ACK_CALLBACK callback, bool blocking) {
   ackManagerWord=wordval;
-  ackManagerSetup(0, 0, program, callback);
-  }
+  ackManagerProg = program;
+  ackManagerCallback = callback;
+  if (blocking) ackManagerLoop(blocking);
+}
 
 const byte RESET_MIN=8;  // tuning of reset counter before sending message
 
 // checkRessets return true if the caller should yield back to loop and try later.
-bool DCC::checkResets(uint8_t numResets) {
+bool DCC::checkResets(bool blocking, uint8_t numResets) {
+  if (blocking) {
+    // must block waiting for restest to be issued
+    while(DCCWaveform::progTrack.sentResetsSincePacket < numResets);
+    return false; // caller need not yield
+  }
   return DCCWaveform::progTrack.sentResetsSincePacket < numResets;
 }
 
-void DCC::ackManagerLoop() {
+void DCC::ackManagerLoop(bool blocking) {
   while (ackManagerProg) {
     byte opcode=GETFLASH(ackManagerProg);
     
     // breaks from this switch will step to next prog entry
     // returns from this switch will stay on same entry
     // (typically waiting for a reset counter or ACK waiting, or when all finished.)
+    // if blocking then we must ONLY return AFTER callback issued       
     switch (opcode) {
       case BASELINE:
-      	  if (checkResets(DCCWaveform::progTrack.autoPowerOff || ackManagerRejoin  ? 20 : 3)) return;
+	  if (DCCWaveform::progTrack.getPowerMode() == POWERMODE::OFF) {
+        if (Diag::ACK) DIAG(F("\nAuto Prog power on"));
+        DCCWaveform::progTrack.setPowerMode(POWERMODE::ON);
+        DCCWaveform::progTrack.sentResetsSincePacket = 0;
+	      DCCWaveform::progTrack.autoPowerOff=true;
+	      if (!blocking) return;
+	  }
+	  if (checkResets(blocking, DCCWaveform::progTrack.autoPowerOff ? 20 : 3)) return;
           DCCWaveform::progTrack.setAckBaseline();
-          callbackState=READY;
           break;   
       case W0:    // write 0 bit 
       case W1:    // write 1 bit 
             {
-	      if (checkResets(RESET_MIN)) return;
-              if (Diag::ACK) DIAG(F("W%d cv=%d bit=%d"),opcode==W1, ackManagerCv,ackManagerBitNum); 
+	      if (checkResets(blocking, RESET_MIN)) return;
+              if (Diag::ACK) DIAG(F("\nW%d cv=%d bit=%d"),opcode==W1, ackManagerCv,ackManagerBitNum); 
               byte instruction = WRITE_BIT | (opcode==W1 ? BIT_ON : BIT_OFF) | ackManagerBitNum;
               byte message[] = {cv1(BIT_MANIPULATE, ackManagerCv), cv2(ackManagerCv), instruction };
               DCCWaveform::progTrack.schedulePacket(message, sizeof(message), PROG_REPEATS);
               DCCWaveform::progTrack.setAckPending(); 
-             callbackState=AFTER_WRITE;
          }
             break; 
       
       case WB:   // write byte 
             {
-	      if (checkResets( RESET_MIN)) return;
-              if (Diag::ACK) DIAG(F("WB cv=%d value=%d"),ackManagerCv,ackManagerByte);
+	      if (checkResets(blocking, RESET_MIN)) return;
+              if (Diag::ACK) DIAG(F("\nWB cv=%d value=%d"),ackManagerCv,ackManagerByte);
               byte message[] = {cv1(WRITE_BYTE, ackManagerCv), cv2(ackManagerCv), ackManagerByte};
               DCCWaveform::progTrack.schedulePacket(message, sizeof(message), PROG_REPEATS);
               DCCWaveform::progTrack.setAckPending(); 
-              callbackState=AFTER_WRITE;
             }
             break;
       
       case   VB:     // Issue validate Byte packet
         {
-	  if (checkResets( RESET_MIN)) return; 
-          if (Diag::ACK) DIAG(F("VB cv=%d value=%d"),ackManagerCv,ackManagerByte);
+	  if (checkResets(blocking, RESET_MIN)) return; 
+          if (Diag::ACK) DIAG(F("\nVB cv=%d value=%d"),ackManagerCv,ackManagerByte);
           byte message[] = { cv1(VERIFY_BYTE, ackManagerCv), cv2(ackManagerCv), ackManagerByte};
           DCCWaveform::progTrack.schedulePacket(message, sizeof(message), PROG_REPEATS);
           DCCWaveform::progTrack.setAckPending(); 
@@ -781,8 +713,8 @@ void DCC::ackManagerLoop() {
       case V0:
       case V1:      // Issue validate bit=0 or bit=1  packet
         {
-	  if (checkResets(RESET_MIN)) return; 
-          if (Diag::ACK) DIAG(F("V%d cv=%d bit=%d"),opcode==V1, ackManagerCv,ackManagerBitNum); 
+	  if (checkResets(blocking, RESET_MIN)) return; 
+          if (Diag::ACK) DIAG(F("\nV%d cv=%d bit=%d"),opcode==V1, ackManagerCv,ackManagerBitNum); 
           byte instruction = VERIFY_BIT | (opcode==V0?BIT_OFF:BIT_ON) | ackManagerBitNum;
           byte message[] = {cv1(BIT_MANIPULATE, ackManagerCv), cv2(ackManagerCv), instruction };
           DCCWaveform::progTrack.schedulePacket(message, sizeof(message), PROG_REPEATS);
@@ -793,29 +725,36 @@ void DCC::ackManagerLoop() {
       case WACK:   // wait for ack (or absence of ack)
          {
           byte ackState=2; // keep polling
-      
-          ackState=DCCWaveform::progTrack.getAck();
-          if (ackState==2) return; // keep polling
+          if (blocking) {
+            while(ackState==2) ackState=DCCWaveform::progTrack.getAck();
+          }
+          else {
+            ackState=DCCWaveform::progTrack.getAck();
+            if (ackState==2) return; // keep polling
+          }
           ackReceived=ackState==1;
           break;  // we have a genuine ACK result
          }
      case ITC0:
      case ITC1:   // If True Callback(0 or 1)  (if prevous WACK got an ACK)
         if (ackReceived) {
-            callback(opcode==ITC0?0:1);
+            ackManagerProg = NULL; // all done now
+	          callback(opcode==ITC0?0:1);
             return;
           }
         break;
         
       case ITCB:   // If True callback(byte)
           if (ackReceived) {
+            ackManagerProg = NULL; // all done now
             callback(ackManagerByte);
             return;
           }
         break;
 
-      case ITCB7:   // If True callback(byte & 0x7F)
+      case ITCB7:   // If True callback(byte & 0xF)
           if (ackReceived) {
+            ackManagerProg = NULL; // all done now
             callback(ackManagerByte & 0x7F);
             return;
           }
@@ -823,13 +762,15 @@ void DCC::ackManagerLoop() {
         
       case NAKFAIL:   // If nack callback(-1)
           if (!ackReceived) {
-            callback(-1);
+            ackManagerProg = NULL; // all done now
+	          callback(-1);
             return;
           }
         break;
         
       case FAIL:  // callback(-1)
-           callback(-1);
+           ackManagerProg = NULL;
+	         callback(-1);
            return;
            
       case STARTMERGE:
@@ -873,6 +814,7 @@ void DCC::ackManagerLoop() {
           
      case COMBINELOCOID: 
           // ackManagerStash is  cv17, ackManagerByte is CV 18
+          ackManagerProg=NULL;
           callback( ackManagerByte + ((ackManagerStash - 192) << 8));
           return;            
 
@@ -887,7 +829,8 @@ void DCC::ackManagerLoop() {
      case SKIPTARGET: 
           break;     
      default: 
-          DIAG(F("!! ackOp %d FAULT!!"),opcode);
+          DIAG(F("\n!! ackOp %d FAULT!!"),opcode);
+          ackManagerProg=NULL;
           callback( -1);
           return;        
     
@@ -895,70 +838,25 @@ void DCC::ackManagerLoop() {
     ackManagerProg++;
   }
 }
-
 void DCC::callback(int value) {
-    static unsigned long callbackStart;
-    // We are about to leave programming mode
-    // Rule 1: If we have written to a decoder we must maintain power for 100mS
-    // Rule 2: If we are re-joining the main track we must power off for 30mS
-
-    switch (callbackState) {    
-       case AFTER_WRITE:  // first attempt to callback after a write operation
-            callbackStart=millis();
-            callbackState=WAITING_100;
-            if (Diag::ACK) DIAG(F("Stable 100mS"));
-            break;
-            
-       case WAITING_100:  // waiting for 100mS
-            if (millis()-callbackStart < 100) break;
-            // stable after power maintained for 100mS
-
-            // If we are going to power off anyway, it doesnt matter
-            // but if we will keep the power on, we must off it for 30mS
-            if (DCCWaveform::progTrack.autoPowerOff) callbackState=READY;
-            else { // Need to cycle power off and on
-                DCCWaveform::progTrack.setPowerMode(POWERMODE::OFF); 
-                callbackStart=millis();
-                callbackState=WAITING_30;
-                if (Diag::ACK) DIAG(F("OFF 30mS"));
-            }
-            break;
- 
-        case WAITING_30:  // waiting for 30mS with power off
-            if (millis()-callbackStart < 30) break;
-            //power has been off for 30mS
-            DCCWaveform::progTrack.setPowerMode(POWERMODE::ON); 
-            callbackState=READY;
-            break;
-     
-       case READY:  // ready after read, or write after power delay and off period.
-            // power off if we powered it on
-           if (DCCWaveform::progTrack.autoPowerOff) {
-              if (Diag::ACK) DIAG(F("Auto Prog power off"));
-              DCCWaveform::progTrack.doAutoPowerOff();
-           }
-          // Restore <1 JOIN> to state before BASELINE
-          if (ackManagerRejoin) {
-              setProgTrackSyncMain(true);
-              if (Diag::ACK) DIAG(F("Auto JOIN"));
-          }  
-    
-          ackManagerProg=NULL;  // no more steps to execute
-          if (Diag::ACK) DIAG(F("Callback(%d)"),value);
-          (ackManagerCallback)( value);
+    if (DCCWaveform::progTrack.autoPowerOff) {
+      if (Diag::ACK) DIAG(F("\nAuto Prog power off"));
+      DCCWaveform::progTrack.doAutoPowerOff();
     }
+    if (Diag::ACK) DIAG(F("\nCallback(%d)\n"),value);
+    (ackManagerCallback)( value);
 }
 
-void DCC::displayCabList(Print * stream) {
+ void DCC::displayCabList(Print * stream) {
 
     int used=0;
     for (int reg = 0; reg < MAX_LOCOS; reg++) {
        if (speedTable[reg].loco>0) {
         used ++;
-        StringFormatter::send(stream,F("cab=%d, speed=%d, dir=%c \n"),       
+        StringFormatter::send(stream,F("\ncab=%d, speed=%d, dir=%c "),       
            speedTable[reg].loco,  speedTable[reg].speedCode & 0x7f,(speedTable[reg].speedCode & 0x80) ? 'F':'R');
        }
      }
-     StringFormatter::send(stream,F("Used=%d, max=%d\n"),used,MAX_LOCOS);
+     StringFormatter::send(stream,F("\nUsed=%d, max=%d\n"),used,MAX_LOCOS);
      
 }

DCC.h

@@ -22,8 +22,7 @@
 #include "MotorDriver.h"
 #include "MotorDrivers.h"
 #include "FSH.h"
-
-typedef void (*ACK_CALLBACK)(int16_t result);
+typedef void (*ACK_CALLBACK)(int result);
 
 enum ackOp : byte
 {           // Program opcodes for the ack Manager
@@ -54,14 +53,6 @@ enum ackOp : byte
   SKIPTARGET = 0xFF // jump to target
 };
 
-enum   CALLBACK_STATE : byte {
-  AFTER_WRITE,  // Start callback sequence after something was written to the decoder  
-  WAITING_100,        // Waiting for 100mS of stable power 
-  WAITING_30,         // waiting to 30ms of power off gap. 
-  READY,              // Ready to complete callback  
-  }; 
-
-
 // Allocations with memory implications..!
 // Base system takes approx 900 bytes + 8 per loco. Turnouts, Sensors etc are dynamically created
 #ifdef ARDUINO_AVR_UNO
@@ -74,7 +65,6 @@ class DCC
 {
 public:
   static void begin(const FSH * motorShieldName, MotorDriver *mainDriver, MotorDriver *progDriver);
-  static void setJoinRelayPin(byte joinRelayPin);
   static void loop();
 
   // Public DCC API functions
@@ -84,25 +74,25 @@ public:
   static void writeCVByteMain(int cab, int cv, byte bValue);
   static void writeCVBitMain(int cab, int cv, byte bNum, bool bValue);
   static void setFunction(int cab, byte fByte, byte eByte);
-  static void setFn(int cab, int16_t functionNumber, bool on);
-  static int changeFn(int cab, int16_t functionNumber, bool pressed);
-  static int  getFn(int cab, int16_t functionNumber);
-  static void updateGroupflags(byte &flags, int16_t functionNumber);
+  static void setFn(int cab, byte functionNumber, bool on);
+  static int changeFn(int cab, byte functionNumber, bool pressed);
+  static int  getFn(int cab, byte functionNumber);
+  static void updateGroupflags(byte &flags, int functionNumber);
   static void setAccessory(int aAdd, byte aNum, bool activate);
   static bool writeTextPacket(byte *b, int nBytes);
   static void setProgTrackSyncMain(bool on); // when true, prog track becomes driveable
   static void setProgTrackBoost(bool on);    // when true, special prog track current limit does not apply
 
   // ACKable progtrack calls  bitresults callback 0,0 or -1, cv returns value or -1
-  static void readCV(int16_t cv, ACK_CALLBACK callback);
-  static void readCVBit(int16_t cv, byte bitNum, ACK_CALLBACK callback); // -1 for error
-  static void writeCVByte(int16_t cv, byte byteValue, ACK_CALLBACK callback);
-  static void writeCVBit(int16_t cv, byte bitNum, bool bitValue, ACK_CALLBACK callback);
-  static void verifyCVByte(int16_t cv, byte byteValue, ACK_CALLBACK callback);
-  static void verifyCVBit(int16_t cv, byte bitNum, bool bitValue, ACK_CALLBACK callback);
+  static void readCV(int cv, ACK_CALLBACK callback, bool blocking = false);
+  static void readCVBit(int cv, byte bitNum, ACK_CALLBACK callback, bool blocking = false); // -1 for error
+  static void writeCVByte(int cv, byte byteValue, ACK_CALLBACK callback, bool blocking = false);
+  static void writeCVBit(int cv, byte bitNum, bool bitValue, ACK_CALLBACK callback, bool blocking = false);
+  static void verifyCVByte(int cv, byte byteValue, ACK_CALLBACK callback, bool blocking = false);
+  static void verifyCVBit(int cv, byte bitNum, bool bitValue, ACK_CALLBACK callback, bool blocking = false);
 
-  static void getLocoId(ACK_CALLBACK callback);
-  static void setLocoId(int id,ACK_CALLBACK callback);
+  static void getLocoId(ACK_CALLBACK callback, bool blocking = false);
+  static void setLocoId(int id,ACK_CALLBACK callback, bool blocking = false);
 
   // Enhanced API functions
   static void forgetLoco(int cab); // removes any speed reminders for this loco
@@ -110,9 +100,6 @@ public:
   static void displayCabList(Print *stream);
 
   static FSH *getMotorShieldName();
-  static inline void setGlobalSpeedsteps(byte s) {
-    globalSpeedsteps = s;
-  };
 
 private:
   struct LOCO
@@ -122,7 +109,6 @@ private:
     byte groupFlags;
     unsigned long functions;
   };
-  static byte joinRelay;
   static byte loopStatus;
   static void setThrottle2(uint16_t cab, uint8_t speedCode);
   static void updateLocoReminder(int loco, byte speedCode);
@@ -130,7 +116,6 @@ private:
   static bool issueReminder(int reg);
   static int nextLoco;
   static FSH *shieldName;
-  static byte globalSpeedsteps;
 
   static LOCO speedTable[MAX_LOCOS];
   static byte cv1(byte opcode, int cv);
@@ -147,15 +132,13 @@ private:
   static int ackManagerWord;
   static byte ackManagerStash;
   static bool ackReceived;
-  static bool ackManagerRejoin;
   static ACK_CALLBACK ackManagerCallback;
-  static CALLBACK_STATE callbackState;
-  static void ackManagerSetup(int cv, byte bitNumOrbyteValue, ackOp const program[], ACK_CALLBACK callback);
-  static void ackManagerSetup(int wordval, ackOp const program[], ACK_CALLBACK callback);
-  static void ackManagerLoop();
-  static bool checkResets( uint8_t numResets);
+  static void ackManagerSetup(int cv, byte bitNumOrbyteValue, ackOp const program[], ACK_CALLBACK callback, bool blocking);
+  static void ackManagerSetup(int wordval, ackOp const program[], ACK_CALLBACK callback, bool blocking);
+  static void ackManagerLoop(bool blocking);
+  static bool checkResets(bool blocking, uint8_t numResets);
   static const int PROG_REPEATS = 8; // repeats of programming commands (some decoders need at least 8 to be reliable)
-  
+
   // NMRA codes #
   static const byte SET_SPEED = 0x3f;
   static const byte WRITE_BYTE_MAIN = 0xEC;
@@ -181,16 +164,6 @@ private:
 #define ARDUINO_TYPE "MEGA"
 #elif defined(ARDUINO_ARCH_MEGAAVR)
 #define ARDUINO_TYPE "MEGAAVR"
-#elif defined(ARDUINO_TEENSY32)
-#define ARDUINO_TYPE "TEENSY32"
-#elif defined(ARDUINO_TEENSY35)
-#define ARDUINO_TYPE "TEENSY35"
-#elif defined(ARDUINO_TEENSY36)
-#define ARDUINO_TYPE "TEENSY36"
-#elif defined(ARDUINO_TEENSY40)
-#define ARDUINO_TYPE "TEENSY40"
-#elif defined(ARDUINO_TEENSY41)
-#define ARDUINO_TYPE "TEENSY41"
 #else
 #error CANNOT COMPILE - DCC++ EX ONLY WORKS WITH AN ARDUINO UNO, NANO 328, OR ARDUINO MEGA 1280/2560
 #endif

DCCEX.h

@@ -14,7 +14,6 @@
 #include "EthernetInterface.h"
 #endif
 #include "LCD_Implementation.h"
-#include "LCN.h"
 #include "freeMemory.h"
 
 #if __has_include ( "myAutomation.h")

DCCEXParser.cpp

@@ -30,39 +30,32 @@
 
 #include "EEStore.h"
 #include "DIAG.h"
-#include <avr/wdt.h>
 
 // These keywords are used in the <1> command. The number is what you get if you use the keyword as a parameter.
 // To discover new keyword numbers , use the <$ YOURKEYWORD> command
-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;
-const int16_t HASH_KEYWORD_WIT = 31594;
-const int16_t HASH_KEYWORD_WIFI = -5583;
-const int16_t HASH_KEYWORD_ACK = 3113;
-const int16_t HASH_KEYWORD_ON = 2657;
-const int16_t HASH_KEYWORD_DCC = 6436;
-const int16_t HASH_KEYWORD_SLOW = -17209;
-const int16_t HASH_KEYWORD_PROGBOOST = -6353;
-const int16_t HASH_KEYWORD_EEPROM = -7168;
-const int16_t HASH_KEYWORD_LIMIT = 27413;
-const int16_t HASH_KEYWORD_ETHERNET = -30767;    
-const int16_t HASH_KEYWORD_MAX = 16244;
-const int16_t HASH_KEYWORD_MIN = 15978;
-const int16_t HASH_KEYWORD_LCN = 15137;   
-const int16_t HASH_KEYWORD_RESET = 26133;
-const int16_t HASH_KEYWORD_SPEED28 = -17064;
-const int16_t HASH_KEYWORD_SPEED128 = 25816;
+const int HASH_KEYWORD_PROG = -29718;
+const int HASH_KEYWORD_MAIN = 11339;
+const int HASH_KEYWORD_JOIN = -30750;
+const int HASH_KEYWORD_CABS = -11981;
+const int HASH_KEYWORD_RAM = 25982;
+const int HASH_KEYWORD_CMD = 9962;
+const int HASH_KEYWORD_WIT = 31594;
+const int HASH_KEYWORD_WIFI = -5583;
+const int HASH_KEYWORD_ACK = 3113;
+const int HASH_KEYWORD_ON = 2657;
+const int HASH_KEYWORD_DCC = 6436;
+const int HASH_KEYWORD_SLOW = -17209;
+const int HASH_KEYWORD_PROGBOOST = -6353;
+const int HASH_KEYWORD_EEPROM = -7168;
+const int HASH_KEYWORD_LIMIT = 27413;
+const int HASH_KEYWORD_ETHERNET = -30767;    
+const int HASH_KEYWORD_MAX = 16244;
+const int HASH_KEYWORD_MIN = 15978;
 
-int16_t DCCEXParser::stashP[MAX_COMMAND_PARAMS];
+int DCCEXParser::stashP[MAX_COMMAND_PARAMS];
 bool DCCEXParser::stashBusy;
 
 Print *DCCEXParser::stashStream = NULL;
-RingStream *DCCEXParser::stashRingStream = NULL;
-byte DCCEXParser::stashTarget=0;
 
 // This is a JMRI command parser, one instance per incoming stream
 // It doesnt know how the string got here, nor how it gets back.
@@ -74,7 +67,7 @@ DCCEXParser::DCCEXParser() {}
 void DCCEXParser::flush()
 {
     if (Diag::CMD)
-        DIAG(F("Buffer flush"));
+        DIAG(F("\nBuffer flush"));
     bufferLength = 0;
     inCommandPayload = false;
 }
@@ -97,7 +90,7 @@ void DCCEXParser::loop(Stream &stream)
         else if (ch == '>')
         {
             buffer[bufferLength] = '\0';
-            parse(&stream, buffer, NULL); // Parse this (No ringStream for serial)
+            parse(&stream, buffer, false); // Parse this allowing async responses
             inCommandPayload = false;
             break;
         }
@@ -109,16 +102,16 @@ void DCCEXParser::loop(Stream &stream)
     Sensor::checkAll(&stream); // Update and print changes
 }
 
-int16_t DCCEXParser::splitValues(int16_t result[MAX_COMMAND_PARAMS], const byte *cmd)
+int DCCEXParser::splitValues(int result[MAX_COMMAND_PARAMS], const byte *cmd)
 {
     byte state = 1;
     byte parameterCount = 0;
-    int16_t runningValue = 0;
+    int runningValue = 0;
     const byte *remainingCmd = cmd + 1; // skips the opcode
     bool signNegative = false;
 
     // clear all parameters in case not enough found
-    for (int16_t i = 0; i < MAX_COMMAND_PARAMS; i++)
+    for (int i = 0; i < MAX_COMMAND_PARAMS; i++)
         result[i] = 0;
 
     while (parameterCount < MAX_COMMAND_PARAMS)
@@ -168,15 +161,15 @@ int16_t DCCEXParser::splitValues(int16_t result[MAX_COMMAND_PARAMS], const byte
     return parameterCount;
 }
 
-int16_t DCCEXParser::splitHexValues(int16_t result[MAX_COMMAND_PARAMS], const byte *cmd)
+int DCCEXParser::splitHexValues(int result[MAX_COMMAND_PARAMS], const byte *cmd)
 {
     byte state = 1;
     byte parameterCount = 0;
-    int16_t runningValue = 0;
+    int runningValue = 0;
     const byte *remainingCmd = cmd + 1; // skips the opcode
     
     // clear all parameters in case not enough found
-    for (int16_t i = 0; i < MAX_COMMAND_PARAMS; i++)
+    for (int i = 0; i < MAX_COMMAND_PARAMS; i++)
         result[i] = 0;
 
     while (parameterCount < MAX_COMMAND_PARAMS)
@@ -249,16 +242,16 @@ void DCCEXParser::parse(const FSH * cmd) {
       int size=strlen_P((char *)cmd)+1; 
       char buffer[size];
       strcpy_P(buffer,(char *)cmd);
-      parse(&Serial,(byte *)buffer,NULL);
+      parse(&Serial,(byte *)buffer,true);
 }
 
 // See documentation on DCC class for info on this section
-void DCCEXParser::parse(Print *stream, byte *com, RingStream * ringStream)
+void DCCEXParser::parse(Print *stream, byte *com, bool blocking)
 {
     (void)EEPROM; // tell compiler not to warn this is unused
     if (Diag::CMD)
-        DIAG(F("PARSING:%s"), com);
-    int16_t p[MAX_COMMAND_PARAMS];
+        DIAG(F("\nPARSING:%s\n"), com);
+    int p[MAX_COMMAND_PARAMS];
     while (com[0] == '<' || com[0] == ' ')
         com++; // strip off any number of < or spaces
     byte params = splitValues(p, com);
@@ -276,9 +269,9 @@ void DCCEXParser::parse(Print *stream, byte *com, RingStream * ringStream)
         return; // filterCallback asked us to ignore
     case 't':   // THROTTLE <t [REGISTER] CAB SPEED DIRECTION>
     {
-        int16_t cab;
-        int16_t tspeed;
-        int16_t direction;
+        int cab;
+        int tspeed;
+        int direction;
 
         if (params == 4)
         { // <t REGISTER CAB SPEED DIRECTION>
@@ -312,9 +305,9 @@ void DCCEXParser::parse(Print *stream, byte *com, RingStream * ringStream)
 
         DCC::setThrottle(cab, tspeed, direction);
         if (params == 4)
-            StringFormatter::send(stream, F("<T %d %d %d>\n"), p[0], p[2], p[3]);
+            StringFormatter::send(stream, F("<T %d %d %d>"), p[0], p[2], p[3]);
         else
-            StringFormatter::send(stream, F("<O>\n"));
+            StringFormatter::send(stream, F("<O>"));
         return;
     }
     case 'f': // FUNCTION <f CAB BYTE1 [BYTE2]>
@@ -381,57 +374,57 @@ void DCCEXParser::parse(Print *stream, byte *com, RingStream * ringStream)
           byte packet[params];
           for (int i=0;i<params;i++) {
             packet[i]=(byte)p[i+1];
-            if (Diag::CMD) DIAG(F("packet[%d]=%d (0x%x)"), i, packet[i], packet[i]);
+            if (Diag::CMD) DIAG(F("packet[%d]=%d (0x%x)\n"), i, packet[i], packet[i]);
           }
           (opcode=='M'?DCCWaveform::mainTrack:DCCWaveform::progTrack).schedulePacket(packet,params,3);  
         }
         return;
         
     case 'W': // WRITE CV ON PROG <W CV VALUE CALLBACKNUM CALLBACKSUB>
-            if (!stashCallback(stream, p, ringStream))
+            if (!stashCallback(stream, p))
                 break;
         if (params == 1) // <W id> Write new loco id (clearing consist and managing short/long)
-            DCC::setLocoId(p[0],callback_Wloco);
+            DCC::setLocoId(p[0],callback_Wloco, blocking);
         else // WRITE CV ON PROG <W CV VALUE [CALLBACKNUM] [CALLBACKSUB]>
-            DCC::writeCVByte(p[0], p[1], callback_W);
+            DCC::writeCVByte(p[0], p[1], callback_W, blocking);
         return;
 
     case 'V': // VERIFY CV ON PROG <V CV VALUE> <V CV BIT 0|1>
         if (params == 2)
         { // <V CV VALUE>
-            if (!stashCallback(stream, p, ringStream))
+            if (!stashCallback(stream, p))
                 break;
-            DCC::verifyCVByte(p[0], p[1], callback_Vbyte);
+            DCC::verifyCVByte(p[0], p[1], callback_Vbyte, blocking);
             return;
         }
         if (params == 3)
         {
-            if (!stashCallback(stream, p, ringStream))
+            if (!stashCallback(stream, p))
                 break;
-            DCC::verifyCVBit(p[0], p[1], p[2], callback_Vbit);
+            DCC::verifyCVBit(p[0], p[1], p[2], callback_Vbit, blocking);
             return;
         }
         break;
 
     case 'B': // WRITE CV BIT ON PROG <B CV BIT VALUE CALLBACKNUM CALLBACKSUB>
-        if (!stashCallback(stream, p, ringStream))
+        if (!stashCallback(stream, p))
             break;
-        DCC::writeCVBit(p[0], p[1], p[2], callback_B);
+        DCC::writeCVBit(p[0], p[1], p[2], callback_B, blocking);
         return;
 
     case 'R': // READ CV ON PROG
         if (params == 3)
         { // <R CV CALLBACKNUM CALLBACKSUB>
-            if (!stashCallback(stream, p, ringStream))
+            if (!stashCallback(stream, p))
                 break;
-            DCC::readCV(p[0], callback_R);
+            DCC::readCV(p[0], callback_R, blocking);
             return;
         }
         if (params == 0)
         { // <R> New read loco id
-            if (!stashCallback(stream, p, ringStream))
+            if (!stashCallback(stream, p))
                 break;
-            DCC::getLocoId(callback_Rloco);
+            DCC::getLocoId(callback_Rloco, blocking);
             return;
         }
         break;
@@ -450,21 +443,21 @@ void DCCEXParser::parse(Print *stream, byte *com, RingStream * ringStream)
                 DCCWaveform::progTrack.setPowerMode(mode);
 		if (mode == POWERMODE::OFF)
 		  DCC::setProgTrackBoost(false);  // Prog track boost mode will not outlive prog track off
-                StringFormatter::send(stream, F("<p%c>\n"), opcode);
+                StringFormatter::send(stream, F("<p%c>"), opcode);
                 return;
             }
             switch (p[0])
             {
             case HASH_KEYWORD_MAIN:
                 DCCWaveform::mainTrack.setPowerMode(mode);
-                StringFormatter::send(stream, F("<p%c MAIN>\n"), opcode);
+                StringFormatter::send(stream, F("<p%c MAIN>"), opcode);
                 return;
 
             case HASH_KEYWORD_PROG:
                 DCCWaveform::progTrack.setPowerMode(mode);
 		if (mode == POWERMODE::OFF)
 		  DCC::setProgTrackBoost(false);  // Prog track boost mode will not outlive prog track off
-                StringFormatter::send(stream, F("<p%c PROG>\n"), opcode);
+                StringFormatter::send(stream, F("<p%c PROG>"), opcode);
                 return;
             case HASH_KEYWORD_JOIN:
                 DCCWaveform::mainTrack.setPowerMode(mode);
@@ -472,25 +465,21 @@ void DCCEXParser::parse(Print *stream, byte *com, RingStream * ringStream)
                 if (mode == POWERMODE::ON)
                 {
                     DCC::setProgTrackSyncMain(true);
-                    StringFormatter::send(stream, F("<p1 JOIN>\n"), opcode);
+                    StringFormatter::send(stream, F("<p1 JOIN>"), opcode);
                 }
                 else
-                    StringFormatter::send(stream, F("<p0>\n"));
+                    StringFormatter::send(stream, F("<p0>"));
                 return;
             }
             break;
         }
         return;
 
-    case '!': // ESTOP ALL  <!>
-        DCC::setThrottle(0,1,1); // this broadcasts speed 1(estop) and sets all reminders to speed 1. 
-        return;
-
     case 'c': // SEND METER RESPONSES <c>
         //                               <c MeterName value C/V unit min max res warn>
-        StringFormatter::send(stream, F("<c CurrentMAIN %d C Milli 0 %d 1 %d>\n"), DCCWaveform::mainTrack.getCurrentmA(), 
+        StringFormatter::send(stream, F("<c CurrentMAIN %d C Milli 0 %d 1 %d>"), DCCWaveform::mainTrack.getCurrentmA(), 
             DCCWaveform::mainTrack.getMaxmA(), DCCWaveform::mainTrack.getTripmA());
-        StringFormatter::send(stream, F("<a %d>\n"), DCCWaveform::mainTrack.get1024Current()); //'a' message deprecated, remove once JMRI 4.22 is available
+        StringFormatter::send(stream, F("<a %d>"), DCCWaveform::mainTrack.get1024Current()); //'a' message deprecated, remove once JMRI 4.22 is available
         return;
 
     case 'Q': // SENSORS <Q>
@@ -498,8 +487,8 @@ void DCCEXParser::parse(Print *stream, byte *com, RingStream * ringStream)
         return;
 
     case 's': // <s>
-        StringFormatter::send(stream, F("<p%d>\n"), DCCWaveform::mainTrack.getPowerMode() == POWERMODE::ON);
-        StringFormatter::send(stream, F("<iDCC-EX V-%S / %S / %S G-%S>\n"), F(VERSION), F(ARDUINO_TYPE), DCC::getMotorShieldName(), F(GITHUB_SHA));
+        StringFormatter::send(stream, F("<p%d>"), DCCWaveform::mainTrack.getPowerMode() == POWERMODE::ON);
+        StringFormatter::send(stream, F("<iDCC-EX V-%S / %S / %S G-%S>"), F(VERSION), F(ARDUINO_TYPE), DCC::getMotorShieldName(), F(GITHUB_SHA));
         Turnout::printAll(stream); //send all Turnout states
         Output::printAll(stream);  //send all Output  states
         Sensor::printAll(stream);  //send all Sensor  states
@@ -508,12 +497,12 @@ void DCCEXParser::parse(Print *stream, byte *com, RingStream * ringStream)
 
     case 'E': // STORE EPROM <E>
         EEStore::store();
-        StringFormatter::send(stream, F("<e %d %d %d>\n"), EEStore::eeStore->data.nTurnouts, EEStore::eeStore->data.nSensors, EEStore::eeStore->data.nOutputs);
+        StringFormatter::send(stream, F("<e %d %d %d>"), EEStore::eeStore->data.nTurnouts, EEStore::eeStore->data.nSensors, EEStore::eeStore->data.nOutputs);
         return;
 
     case 'e': // CLEAR EPROM <e>
         EEStore::clear();
-        StringFormatter::send(stream, F("<O>\n"));
+        StringFormatter::send(stream, F("<O>"));
         return;
 
     case ' ': // < >
@@ -526,13 +515,7 @@ void DCCEXParser::parse(Print *stream, byte *com, RingStream * ringStream)
         return;
 
     case '#': // NUMBER OF LOCOSLOTS <#>
-        StringFormatter::send(stream, F("<# %d>\n"), MAX_LOCOS);
-        return;
-
-    case '-': // Forget Loco <- [cab]>
-        if (params > 1 || p[0]<0) break;
-        if (p[0]==0) DCC::forgetAllLocos();
-        else  DCC::forgetLoco(p[0]);
+        StringFormatter::send(stream, F("<# %d>"), MAX_LOCOS);
         return;
 
     case 'F': // New command to call the new Loco Function API <F cab func 1|0>
@@ -551,18 +534,18 @@ void DCCEXParser::parse(Print *stream, byte *com, RingStream * ringStream)
         break;
 
     default: //anything else will diagnose and drop out to <X>
-        DIAG(F("Opcode=%c params=%d"), opcode, params);
+        DIAG(F("\nOpcode=%c params=%d\n"), opcode, params);
         for (int i = 0; i < params; i++)
-            DIAG(F("p[%d]=%d (0x%x)"), i, p[i], p[i]);
+            DIAG(F("p[%d]=%d (0x%x)\n"), i, p[i], p[i]);
         break;
 
     } // end of opcode switch
 
     // Any fallout here sends an <X>
-    StringFormatter::send(stream, F("<X>\n"));
+    StringFormatter::send(stream, F("<X>"));
 }
 
-bool DCCEXParser::parseZ(Print *stream, int16_t params, int16_t p[])
+bool DCCEXParser::parseZ(Print *stream, int params, int p[])
 {
 
     switch (params)
@@ -574,20 +557,20 @@ bool DCCEXParser::parseZ(Print *stream, int16_t params, int16_t p[])
         if (o == NULL)
             return false;
         o->activate(p[1]);
-        StringFormatter::send(stream, F("<Y %d %d>\n"), p[0], p[1]);
+        StringFormatter::send(stream, F("<Y %d %d>"), p[0], p[1]);
     }
         return true;
 
     case 3: // <Z ID PIN INVERT>
         if (!Output::create(p[0], p[1], p[2], 1))
           return false;
-        StringFormatter::send(stream, F("<O>\n"));
+        StringFormatter::send(stream, F("<O>"));
         return true;
 
     case 1: // <Z ID>
         if (!Output::remove(p[0]))
           return false;
-        StringFormatter::send(stream, F("<O>\n"));
+        StringFormatter::send(stream, F("<O>"));
         return true;
 
     case 0: // <Z> list Output definitions
@@ -596,7 +579,7 @@ bool DCCEXParser::parseZ(Print *stream, int16_t params, int16_t p[])
         for (Output *tt = Output::firstOutput; tt != NULL; tt = tt->nextOutput)
         {
             gotone = true;
-            StringFormatter::send(stream, F("<Y %d %d %d %d>\n"), tt->data.id, tt->data.pin, tt->data.iFlag, tt->data.oStatus);
+            StringFormatter::send(stream, F("<Y %d %d %d %d>"), tt->data.id, tt->data.pin, tt->data.iFlag, tt->data.oStatus);
         }
         return gotone;
     }
@@ -606,7 +589,7 @@ bool DCCEXParser::parseZ(Print *stream, int16_t params, int16_t p[])
 }
 
 //===================================
-bool DCCEXParser::parsef(Print *stream, int16_t params, int16_t p[])
+bool DCCEXParser::parsef(Print *stream, int params, int p[])
 {
     // JMRI sends this info in DCC message format but it's not exactly
     //      convenient for other processing
@@ -638,9 +621,9 @@ bool DCCEXParser::parsef(Print *stream, int16_t params, int16_t p[])
     return true;
 }
 
-void DCCEXParser::funcmap(int16_t cab, byte value, byte fstart, byte fstop)
+void DCCEXParser::funcmap(int cab, byte value, byte fstart, byte fstop)
 {
-    for (int16_t i = fstart; i <= fstop; i++)
+    for (int i = fstart; i <= fstop; i++)
     {
         DCC::setFn(cab, i, value & 1);
         value >>= 1;
@@ -648,7 +631,7 @@ void DCCEXParser::funcmap(int16_t cab, byte value, byte fstart, byte fstop)
 }
 
 //===================================
-bool DCCEXParser::parseT(Print *stream, int16_t params, int16_t p[])
+bool DCCEXParser::parseT(Print *stream, int params, int p[])
 {
     switch (params)
     {
@@ -658,7 +641,7 @@ bool DCCEXParser::parseT(Print *stream, int16_t params, int16_t p[])
         for (Turnout *tt = Turnout::firstTurnout; tt != NULL; tt = tt->nextTurnout)
         {
             gotOne = true;
-            StringFormatter::send(stream, F("<H %d %d %d %d>\n"), tt->data.id, tt->data.address, 
+            StringFormatter::send(stream, F("<H %d %d %d %d>"), tt->data.id, tt->data.address, 
                 tt->data.subAddress, (tt->data.tStatus & STATUS_ACTIVE)!=0);
         }
         return gotOne; // will <X> if none found
@@ -667,7 +650,7 @@ bool DCCEXParser::parseT(Print *stream, int16_t params, int16_t p[])
     case 1: // <T id>  delete turnout
         if (!Turnout::remove(p[0]))
             return false;
-        StringFormatter::send(stream, F("<O>\n"));
+        StringFormatter::send(stream, F("<O>"));
         return true;
 
     case 2: // <T id 0|1>  activate turnout
@@ -676,14 +659,14 @@ bool DCCEXParser::parseT(Print *stream, int16_t params, int16_t p[])
         if (!tt)
             return false;
         tt->activate(p[1]);
-        StringFormatter::send(stream, F("<H %d %d>\n"), tt->data.id, (tt->data.tStatus & STATUS_ACTIVE)!=0);
+        StringFormatter::send(stream, F("<H %d %d>"), tt->data.id, (tt->data.tStatus & STATUS_ACTIVE)!=0);
     }
         return true;
 
     case 3: // <T id addr subaddr>  define turnout
         if (!Turnout::create(p[0], p[1], p[2]))
             return false;
-        StringFormatter::send(stream, F("<O>\n"));
+        StringFormatter::send(stream, F("<O>"));
         return true;
 
     default:
@@ -691,7 +674,7 @@ bool DCCEXParser::parseT(Print *stream, int16_t params, int16_t p[])
     }
 }
 
-bool DCCEXParser::parseS(Print *stream, int16_t params, int16_t p[])
+bool DCCEXParser::parseS(Print *stream, int params, int p[])
 {
 
     switch (params)
@@ -699,13 +682,13 @@ bool DCCEXParser::parseS(Print *stream, int16_t params, int16_t p[])
     case 3: // <S id pin pullup>  create sensor. pullUp indicator (0=LOW/1=HIGH)
         if (!Sensor::create(p[0], p[1], p[2]))
           return false;
-        StringFormatter::send(stream, F("<O>\n"));
+        StringFormatter::send(stream, F("<O>"));
         return true;
 
     case 1: // S id> remove sensor
         if (!Sensor::remove(p[0]))
           return false;
-        StringFormatter::send(stream, F("<O>\n"));
+        StringFormatter::send(stream, F("<O>"));
         return true;
 
     case 0: // <S> list sensor definitions
@@ -713,7 +696,7 @@ bool DCCEXParser::parseS(Print *stream, int16_t params, int16_t p[])
 	    return false;
         for (Sensor *tt = Sensor::firstSensor; tt != NULL; tt = tt->nextSensor)
         {
-            StringFormatter::send(stream, F("<Q %d %d %d>\n"), tt->data.snum, tt->data.pin, tt->data.pullUp);
+            StringFormatter::send(stream, F("<Q %d %d %d>"), tt->data.snum, tt->data.pin, tt->data.pullUp);
         }
         return true;
 
@@ -723,7 +706,7 @@ bool DCCEXParser::parseS(Print *stream, int16_t params, int16_t p[])
     return false;
 }
 
-bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
+bool DCCEXParser::parseD(Print *stream, int params, int p[])
 {
     if (params == 0)
         return false;
@@ -735,23 +718,23 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
         return true;
 
     case HASH_KEYWORD_RAM: // <D RAM>
-        StringFormatter::send(stream, F("Free memory=%d\n"), minimumFreeMemory());
+        StringFormatter::send(stream, F("\nFree memory=%d\n"), freeMemory());
         break;
 
     case HASH_KEYWORD_ACK: // <D ACK ON/OFF> <D ACK [LIMIT|MIN|MAX] Value>
 	if (params >= 3) {
 	    if (p[1] == HASH_KEYWORD_LIMIT) {
 	      DCCWaveform::progTrack.setAckLimit(p[2]);
-	      StringFormatter::send(stream, F("Ack limit=%dmA\n"), p[2]);
+	      StringFormatter::send(stream, F("\nAck limit=%dmA\n"), p[2]);
 	    } else if (p[1] == HASH_KEYWORD_MIN) {
 	      DCCWaveform::progTrack.setMinAckPulseDuration(p[2]);
-	      StringFormatter::send(stream, F("Ack min=%dus\n"), p[2]);
+	      StringFormatter::send(stream, F("\nAck min=%dus\n"), p[2]);
 	    } else if (p[1] == HASH_KEYWORD_MAX) {
 	      DCCWaveform::progTrack.setMaxAckPulseDuration(p[2]);
-	      StringFormatter::send(stream, F("Ack max=%dus\n"), p[2]);
+	      StringFormatter::send(stream, F("\nAck max=%dus\n"), p[2]);
 	    }
 	} else {
-	  StringFormatter::send(stream, F("Ack diag %S\n"), onOff ? F("on") : F("off"));
+	  StringFormatter::send(stream, F("\nAck diag %S\n"), onOff ? F("on") : F("off"));
 	  Diag::ACK = onOff;
 	}
         return true;
@@ -771,37 +754,16 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
     case HASH_KEYWORD_WIT: // <D WIT ON/OFF>
         Diag::WITHROTTLE = onOff;
         return true;
-  
-    case HASH_KEYWORD_LCN: // <D LCN ON/OFF>
-        Diag::LCN = onOff;
-        return true;
 
     case HASH_KEYWORD_PROGBOOST:
         DCC::setProgTrackBoost(true);
-	      return true;
+	return true;
 
-    case HASH_KEYWORD_RESET:
-        {
-          wdt_enable( WDTO_15MS); // set Arduino watchdog timer for 15ms 
-          delay(50);            // wait for the prescaller time to expire          
-          break; // and <X> if we didnt restart 
-        }
-        
     case HASH_KEYWORD_EEPROM: // <D EEPROM NumEntries>
 	if (params >= 2)
 	    EEStore::dump(p[1]);
 	return true;
 
-    case HASH_KEYWORD_SPEED28:
-        DCC::setGlobalSpeedsteps(28);
-	StringFormatter::send(stream, F("28 Speedsteps"));
-        return true;
-
-    case HASH_KEYWORD_SPEED128:
-        DCC::setGlobalSpeedsteps(128);
-	StringFormatter::send(stream, F("128 Speedsteps"));
-        return true;
-
     default: // invalid/unknown
         break;
     }
@@ -809,70 +771,52 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
 }
 
 // CALLBACKS must be static
-bool DCCEXParser::stashCallback(Print *stream, int16_t p[MAX_COMMAND_PARAMS], RingStream * ringStream)
+bool DCCEXParser::stashCallback(Print *stream, int p[MAX_COMMAND_PARAMS])
 {
     if (stashBusy )
         return false;
     stashBusy = true;
     stashStream = stream;
-    stashRingStream=ringStream;
-    if (ringStream) stashTarget= ringStream->peekTargetMark();
     memcpy(stashP, p, MAX_COMMAND_PARAMS * sizeof(p[0]));
     return true;
 }
-
-Print * DCCEXParser::getAsyncReplyStream() {
-       if (stashRingStream) {
-           stashRingStream->mark(stashTarget);
-           return stashRingStream;
-       }
-       return stashStream;
-}
-
-void DCCEXParser::commitAsyncReplyStream() {
-     if (stashRingStream) stashRingStream->commit();
-     stashBusy = false;
-}
-
-void DCCEXParser::callback_W(int16_t result)
+void DCCEXParser::callback_W(int result)
 {
-    StringFormatter::send(getAsyncReplyStream(),
-          F("<r%d|%d|%d %d>\n"), stashP[2], stashP[3], stashP[0], result == 1 ? stashP[1] : -1);
-    commitAsyncReplyStream();
+    StringFormatter::send(stashStream, F("<r%d|%d|%d %d>"), stashP[2], stashP[3], stashP[0], result == 1 ? stashP[1] : -1);
+    stashBusy = false;
 }
 
-void DCCEXParser::callback_B(int16_t result)
+void DCCEXParser::callback_B(int result)
 {
-    StringFormatter::send(getAsyncReplyStream(), 
-          F("<r%d|%d|%d %d %d>\n"), stashP[3], stashP[4], stashP[0], stashP[1], result == 1 ? stashP[2] : -1);
-    commitAsyncReplyStream();
+    StringFormatter::send(stashStream, F("<r%d|%d|%d %d %d>"), stashP[3], stashP[4], stashP[0], stashP[1], result == 1 ? stashP[2] : -1);
+    stashBusy = false;
 }
-void DCCEXParser::callback_Vbit(int16_t result)
+void DCCEXParser::callback_Vbit(int result)
 {
-    StringFormatter::send(getAsyncReplyStream(), F("<v %d %d %d>\n"), stashP[0], stashP[1], result);
-    commitAsyncReplyStream();
+    StringFormatter::send(stashStream, F("<v %d %d %d>"), stashP[0], stashP[1], result);
+    stashBusy = false;
 }
-void DCCEXParser::callback_Vbyte(int16_t result)
+void DCCEXParser::callback_Vbyte(int result)
 {
-    StringFormatter::send(getAsyncReplyStream(), F("<v %d %d>\n"), stashP[0], result);
-    commitAsyncReplyStream();
+    StringFormatter::send(stashStream, F("<v %d %d>"), stashP[0], result);
+    stashBusy = false;
 }
 
-void DCCEXParser::callback_R(int16_t result)
+void DCCEXParser::callback_R(int result)
 {
-    StringFormatter::send(getAsyncReplyStream(), F("<r%d|%d|%d %d>\n"), stashP[1], stashP[2], stashP[0], result);
-    commitAsyncReplyStream();
+    StringFormatter::send(stashStream, F("<r%d|%d|%d %d>"), stashP[1], stashP[2], stashP[0], result);
+    stashBusy = false;
 }
 
-void DCCEXParser::callback_Rloco(int16_t result)
+void DCCEXParser::callback_Rloco(int result)
 {
-    StringFormatter::send(getAsyncReplyStream(), F("<r %d>\n"), result);
-    commitAsyncReplyStream();
+    StringFormatter::send(stashStream, F("<r %d>"), result);
+    stashBusy = false;
 }
 
-void DCCEXParser::callback_Wloco(int16_t result)
+void DCCEXParser::callback_Wloco(int result)
 {
     if (result==1) result=stashP[0]; // pick up original requested id from command
-    StringFormatter::send(getAsyncReplyStream(), F("<w %d>\n"), result);
-    commitAsyncReplyStream();
+    StringFormatter::send(stashStream, F("<w %d>"), result);
+    stashBusy = false;
 }

DCCEXParser.h

@@ -20,16 +20,15 @@
 #define DCCEXParser_h
 #include <Arduino.h>
 #include "FSH.h"
-#include "RingStream.h"
 
-typedef void (*FILTER_CALLBACK)(Print * stream, byte & opcode, byte & paramCount, int16_t p[]);
+typedef void (*FILTER_CALLBACK)(Print * stream, byte & opcode, byte & paramCount, int p[]);
 typedef void (*AT_COMMAND_CALLBACK)(const byte * command);
 
 struct DCCEXParser
 {
    DCCEXParser();
    void loop(Stream & stream);
-   void parse(Print * stream,  byte * command,  RingStream * ringStream);
+   void parse(Print * stream,  byte * command, bool blocking);
    void parse(const FSH * cmd);
    void flush();
    static void setFilter(FILTER_CALLBACK filter);
@@ -39,40 +38,36 @@ struct DCCEXParser
  
    private:
   
-    static const int16_t MAX_BUFFER=50;  // longest command sent in
+    static const int MAX_BUFFER=50;  // longest command sent in
      byte  bufferLength=0;
      bool  inCommandPayload=false;
      byte  buffer[MAX_BUFFER+2]; 
-    int16_t splitValues( int16_t result[MAX_COMMAND_PARAMS], const byte * command);
-    int16_t splitHexValues( int16_t result[MAX_COMMAND_PARAMS], const byte * command);
+    int splitValues( int result[MAX_COMMAND_PARAMS], const byte * command);
+    int splitHexValues( int result[MAX_COMMAND_PARAMS], const byte * command);
      
-     bool parseT(Print * stream, int16_t params, int16_t p[]);
-     bool parseZ(Print * stream, int16_t params, int16_t p[]);
-     bool parseS(Print * stream,  int16_t params, int16_t p[]);
-     bool parsef(Print * stream,  int16_t params, int16_t p[]);
-     bool parseD(Print * stream,  int16_t params, int16_t p[]);
+     bool parseT(Print * stream, int params, int p[]);
+     bool parseZ(Print * stream, int params, int p[]);
+     bool parseS(Print * stream,  int params, int p[]);
+     bool parsef(Print * stream,  int params, int p[]);
+     bool parseD(Print * stream,  int params, int p[]);
 
-     static Print * getAsyncReplyStream();
-     static void commitAsyncReplyStream();
-
-    static bool stashBusy;
-    static byte stashTarget;
-    static Print * stashStream;
-    static RingStream * stashRingStream;
     
-    static int16_t stashP[MAX_COMMAND_PARAMS];
-    bool stashCallback(Print * stream, int16_t p[MAX_COMMAND_PARAMS], RingStream * ringStream);
-    static void callback_W(int16_t result);
-    static void callback_B(int16_t result);        
-    static void callback_R(int16_t result);
-    static void callback_Rloco(int16_t result);
-    static void callback_Wloco(int16_t result);
-    static void callback_Vbit(int16_t result);
-    static void callback_Vbyte(int16_t result);
+    static bool stashBusy;
+   
+    static Print * stashStream;
+    static int stashP[MAX_COMMAND_PARAMS];
+    bool stashCallback(Print * stream, int p[MAX_COMMAND_PARAMS]);
+    static void callback_W(int result);
+    static void callback_B(int result);        
+    static void callback_R(int result);
+    static void callback_Rloco(int result);
+    static void callback_Wloco(int result);
+    static void callback_Vbit(int result);
+    static void callback_Vbyte(int result);
     static FILTER_CALLBACK  filterCallback;
     static FILTER_CALLBACK  filterRMFTCallback;
     static AT_COMMAND_CALLBACK  atCommandCallback;
-    static void funcmap(int16_t cab, byte value, byte fstart, byte fstop);
+    static void funcmap(int cab, byte value, byte fstart, byte fstop);
 
 };
 

DCCTimer.cpp

@@ -72,80 +72,17 @@ INTERRUPT_CALLBACK interruptHandler=0;
   }
 
   bool DCCTimer::isPWMPin(byte pin) {
-       (void) pin; 
        return false;  // TODO what are the relevant pins? 
   }
 
  void DCCTimer::setPWM(byte pin, bool high) {
-    (void) pin;
-    (void) high;
     // TODO what are the relevant pins?
  }
 
   void   DCCTimer::getSimulatedMacAddress(byte mac[6]) {
     memcpy(mac,(void *) &SIGROW.SERNUM0,6);  // serial number
-    mac[0] &= 0xFE;
-    mac[0] |= 0x02;
   }
 
-#elif defined(TEENSYDUINO)
-  IntervalTimer myDCCTimer;
-
-  void DCCTimer::begin(INTERRUPT_CALLBACK callback) {
-    interruptHandler=callback;
-
-  myDCCTimer.begin(interruptHandler, DCC_SIGNAL_TIME);
-
-  }
-
-  bool DCCTimer::isPWMPin(byte pin) {
-       //Teensy: digitalPinHasPWM, todo
-      (void) pin;
-       return false;  // TODO what are the relevant pins? 
-  }
-
- void DCCTimer::setPWM(byte pin, bool high) {
-    // TODO what are the relevant pins?
-    (void) pin;
-    (void) high;
-}
-
-  void   DCCTimer::getSimulatedMacAddress(byte mac[6]) {
-#if defined(__IMXRT1062__)  //Teensy 4.0 and Teensy 4.1
-    uint32_t m1 = HW_OCOTP_MAC1;
-    uint32_t m2 = HW_OCOTP_MAC0;
-    mac[0] = m1 >> 8;
-    mac[1] = m1 >> 0;
-    mac[2] = m2 >> 24;
-    mac[3] = m2 >> 16;
-    mac[4] = m2 >> 8;
-    mac[5] = m2 >> 0;
-#else
-    read_mac(mac);
-#endif
-  }
-
-#if !defined(__IMXRT1062__)
-  void DCCTimer::read_mac(byte mac[6]) {
-    read(0xe,mac,0);
-    read(0xf,mac,3);
-  }
-
-// http://forum.pjrc.com/threads/91-teensy-3-MAC-address
-void DCCTimer::read(uint8_t word, uint8_t *mac, uint8_t offset) {
-  FTFL_FCCOB0 = 0x41;             // Selects the READONCE command
-  FTFL_FCCOB1 = word;             // read the given word of read once area
-
-  // launch command and wait until complete
-  FTFL_FSTAT = FTFL_FSTAT_CCIF;
-  while(!(FTFL_FSTAT & FTFL_FSTAT_CCIF));
-
-  *(mac+offset) =   FTFL_FCCOB5;       // collect only the top three bytes,
-  *(mac+offset+1) = FTFL_FCCOB6;       // in the right orientation (big endian).
-  *(mac+offset+2) = FTFL_FCCOB7;       // Skip FTFL_FCCOB4 as it's always 0.
-}
-#endif
-
 #else 
   // Arduino nano, uno, mega etc
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
@@ -202,12 +139,7 @@ void DCCTimer::read(uint8_t word, uint8_t *mac, uint8_t offset) {
 
   #include <avr/boot.h> 
   void DCCTimer::getSimulatedMacAddress(byte mac[6]) {
-    for (byte i=0; i<6; i++) {
-      mac[i]=boot_signature_byte_get(0x0E + i);
-    }
-    mac[0] &= 0xFE;
-    mac[0] |= 0x02;
-
+    for (byte i=0; i<6; i++) mac[i]=boot_signature_byte_get(0x0E + i);
   }
 
 #endif

DCCTimer.h

@@ -10,10 +10,6 @@ class DCCTimer {
   static void getSimulatedMacAddress(byte mac[6]);
   static bool isPWMPin(byte pin);
   static void setPWM(byte pin, bool high);
-#if (defined(TEENSYDUINO) && !defined(__IMXRT1062__))
-  static void read_mac(byte mac[6]);
-  static void read(uint8_t word, uint8_t *mac, uint8_t offset);
-#endif
   private:
 };
 

DCCWaveform.cpp

@@ -23,39 +23,32 @@
 #include "DCCWaveform.h"
 #include "DCCTimer.h"
 #include "DIAG.h"
-#include "freeMemory.h"
+ 
 
 DCCWaveform  DCCWaveform::mainTrack(PREAMBLE_BITS_MAIN, true);
 DCCWaveform  DCCWaveform::progTrack(PREAMBLE_BITS_PROG, false);
 
+
 bool DCCWaveform::progTrackSyncMain=false; 
 bool DCCWaveform::progTrackBoosted=false; 
 int  DCCWaveform::progTripValue=0;
-volatile uint8_t DCCWaveform::numAckGaps=0;
-volatile uint8_t DCCWaveform::numAckSamples=0;
-uint8_t DCCWaveform::trailingEdgeCounter=0;
-
+  
 void DCCWaveform::begin(MotorDriver * mainDriver, MotorDriver * progDriver) {
   mainTrack.motorDriver=mainDriver;
   progTrack.motorDriver=progDriver;
   progTripValue = progDriver->mA2raw(TRIP_CURRENT_PROG); // need only calculate once hence static
   mainTrack.setPowerMode(POWERMODE::OFF);      
   progTrack.setPowerMode(POWERMODE::OFF);
-  // Fault pin config for odd motor boards (example pololu)
-  MotorDriver::commonFaultPin = ((mainDriver->getFaultPin() == progDriver->getFaultPin())
-				 && (mainDriver->getFaultPin() != UNUSED_PIN));
-  // Only use PWM if both pins are PWM capable. Otherwise JOIN does not work
   MotorDriver::usePWM= mainDriver->isPWMCapable() && progDriver->isPWMCapable();
-  if (MotorDriver::usePWM)
-    DIAG(F("Signal pin config: high accuracy waveform"));
-  else
-    DIAG(F("Signal pin config: normal accuracy waveform"));
+  MotorDriver::commonFaultPin = (mainDriver->getFaultPin() == progDriver->getFaultPin());
+  if (MotorDriver::usePWM) DIAG(F("\nWaveform using PWM pins for accuracy."));
+  else  DIAG(F("\nWaveform accuracy limited by signal pin configuration."));
   DCCTimer::begin(DCCWaveform::interruptHandler);     
 }
 
-void DCCWaveform::loop(bool ackManagerActive) {
-  mainTrack.checkPowerOverload(false);
-  progTrack.checkPowerOverload(ackManagerActive);
+void DCCWaveform::loop() {
+  mainTrack.checkPowerOverload();
+  progTrack.checkPowerOverload();
 }
 
 void DCCWaveform::interruptHandler() {
@@ -117,11 +110,11 @@ void DCCWaveform::setPowerMode(POWERMODE mode) {
 }
 
 
-void DCCWaveform::checkPowerOverload(bool ackManagerActive) {
+void DCCWaveform::checkPowerOverload() {
   if (millis() - lastSampleTaken  < sampleDelay) return;
   lastSampleTaken = millis();
   int tripValue= motorDriver->getRawCurrentTripValue();
-  if (!isMainTrack && !ackManagerActive && !progTrackSyncMain && !progTrackBoosted)
+  if (!isMainTrack && !ackPending && !progTrackSyncMain && !progTrackBoosted)
     tripValue=progTripValue;
   
   switch (powerMode) {
@@ -141,9 +134,9 @@ void DCCWaveform::checkPowerOverload(bool ackManagerActive) {
 	      }
 	      // Write this after the fact as we want to turn on as fast as possible
 	      // because we don't know which output actually triggered the fault pin
-	      DIAG(F("*** COMMON FAULT PIN ACTIVE - TOGGLED POWER on %S ***"), isMainTrack ? F("MAIN") : F("PROG"));
+	      DIAG(F("\n*** COMMON FAULT PIN ACTIVE - TOGGLED POWER on %S ***\n"), isMainTrack ? F("MAIN") : F("PROG"));
 	  } else {
-	      DIAG(F("*** %S FAULT PIN ACTIVE - OVERLOAD ***"), isMainTrack ? F("MAIN") : F("PROG"));
+	      DIAG(F("\n*** %S FAULT PIN ACTIVE - OVERLOAD ***\n"), isMainTrack ? F("MAIN") : F("PROG"));
 	      if (lastCurrent < tripValue) {
 		  lastCurrent = tripValue; // exaggerate
 	      }
@@ -161,7 +154,7 @@ void DCCWaveform::checkPowerOverload(bool ackManagerActive) {
         unsigned int maxmA=motorDriver->raw2mA(tripValue);
 	power_good_counter=0;
         sampleDelay = power_sample_overload_wait;
-        DIAG(F("*** %S TRACK POWER OVERLOAD current=%d max=%d  offtime=%d ***"), isMainTrack ? F("MAIN") : F("PROG"), mA, maxmA, sampleDelay);
+        DIAG(F("\n*** %S TRACK POWER OVERLOAD current=%d max=%d  offtime=%d ***\n"), isMainTrack ? F("MAIN") : F("PROG"), mA, maxmA, sampleDelay);
 	if (power_sample_overload_wait >= 10000)
 	    power_sample_overload_wait = 10000;
 	else
@@ -173,7 +166,7 @@ void DCCWaveform::checkPowerOverload(bool ackManagerActive) {
       setPowerMode(POWERMODE::ON);
       sampleDelay = POWER_SAMPLE_ON_WAIT;
       // Debug code....
-      DIAG(F("*** %S TRACK POWER RESET delay=%d ***"), isMainTrack ? F("MAIN") : F("PROG"), sampleDelay);
+      DIAG(F("\n*** %S TRACK POWER RESET delay=%d ***\n"), isMainTrack ? F("MAIN") : F("PROG"), sampleDelay);
       break;
     default:
       sampleDelay = 999; // cant get here..meaningless statement to avoid compiler warning.
@@ -205,9 +198,6 @@ void DCCWaveform::interrupt2() {
   if (remainingPreambles > 0 ) {
     state=WAVE_MID_1;  // switch state to trigger LOW on next interrupt
     remainingPreambles--;
-    // Update free memory diagnostic as we don't have anything else to do this time.
-    // Allow for checkAck and its called functions using 22 bytes more.
-    updateMinimumFreeMemory(22); 
     return;
   }
 
@@ -257,7 +247,7 @@ void DCCWaveform::interrupt2() {
 
 // Wait until there is no packet pending, then make this pending
 void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repeats) {
-  if (byteCount > MAX_PACKET_SIZE) return; // allow for chksum
+  if (byteCount >= MAX_PACKET_SIZE) return; // allow for chksum
   while (packetPending);
 
   byte checksum = 0;
@@ -265,7 +255,6 @@ void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repea
     checksum ^= buffer[b];
     pendingPacket[b] = buffer[b];
   }
-  // buffer is MAX_PACKET_SIZE but pendingPacket is one bigger
   pendingPacket[byteCount] = checksum;
   pendingLength = byteCount + 1;
   pendingRepeats = repeats;
@@ -280,7 +269,7 @@ void DCCWaveform::setAckBaseline() {
       if (isMainTrack) return;
       int baseline=motorDriver->getCurrentRaw();
       ackThreshold= baseline + motorDriver->mA2raw(ackLimitmA);
-      if (Diag::ACK) DIAG(F("ACK baseline=%d/%dmA Threshold=%d/%dmA Duration between %dus and %dus"),
+      if (Diag::ACK) DIAG(F("\nACK baseline=%d/%dmA Threshold=%d/%dmA Duration: %dus <= pulse <= %dus"),
 			  baseline,motorDriver->raw2mA(baseline),
 			  ackThreshold,motorDriver->raw2mA(ackThreshold),
                           minAckPulseDuration, maxAckPulseDuration);
@@ -293,15 +282,13 @@ void DCCWaveform::setAckPending() {
       ackPulseDuration=0;
       ackDetected=false;
       ackCheckStart=millis();
-      numAckSamples=0;
-      numAckGaps=0;
       ackPending=true;  // interrupt routines will now take note
 }
 
 byte DCCWaveform::getAck() {
       if (ackPending) return (2);  // still waiting
-      if (Diag::ACK) DIAG(F("%S after %dmS max=%d/%dmA pulse=%duS samples=%d gaps=%d"),ackDetected?F("ACK"):F("NO-ACK"), ackCheckDuration,
-			  ackMaxCurrent,motorDriver->raw2mA(ackMaxCurrent), ackPulseDuration, numAckSamples, numAckGaps);
+      if (Diag::ACK) DIAG(F("\n%S after %dmS max=%d/%dmA pulse=%duS"),ackDetected?F("ACK"):F("NO-ACK"), ackCheckDuration, 
+           ackMaxCurrent,motorDriver->raw2mA(ackMaxCurrent), ackPulseDuration);
       if (ackDetected) return (1); // Yes we had an ack
       return(0);  // pending set off but not detected means no ACK.   
 }
@@ -315,15 +302,10 @@ void DCCWaveform::checkAck() {
     }
       
     int current=motorDriver->getCurrentRaw();
-    numAckSamples++;
     if (current > ackMaxCurrent) ackMaxCurrent=current;
     // An ACK is a pulse lasting between minAckPulseDuration and maxAckPulseDuration uSecs (refer @haba)
         
     if (current>ackThreshold) {
-       if (trailingEdgeCounter > 0) {
-	 numAckGaps++;
-	 trailingEdgeCounter = 0;
-       }
        if (ackPulseStart==0) ackPulseStart=micros();    // leading edge of pulse detected
        return;
     }
@@ -331,21 +313,9 @@ void DCCWaveform::checkAck() {
     // not in pulse
     if (ackPulseStart==0) return; // keep waiting for leading edge 
     
-    // if we reach to this point, we have
     // detected trailing edge of pulse
-    if (trailingEdgeCounter == 0) {
-      ackPulseDuration=micros()-ackPulseStart;
-    }
-
-    // but we do not trust it yet and return (which will force another
-    // measurement) and first the third time around with low current
-    // the ack detection will be finalized. 
-    if (trailingEdgeCounter < 2) {
-      trailingEdgeCounter++;
-      return;
-    }
-    trailingEdgeCounter = 0;
-
+    ackPulseDuration=micros()-ackPulseStart;
+               
     if (ackPulseDuration>=minAckPulseDuration && ackPulseDuration<=maxAckPulseDuration) {
         ackCheckDuration=millis()-ackCheckStart;
         ackDetected=true;

DCCWaveform.h

@@ -19,7 +19,6 @@
  */
 #ifndef DCCWaveform_h
 #define DCCWaveform_h
-
 #include "MotorDriver.h"
 
 // Wait times for power management. Unit: milliseconds
@@ -30,7 +29,7 @@ const int  POWER_SAMPLE_OVERLOAD_WAIT = 20;
 // Number of preamble bits.
 const int   PREAMBLE_BITS_MAIN = 16;
 const int   PREAMBLE_BITS_PROG = 22;
-const byte   MAX_PACKET_SIZE = 5;  // NMRA standard extended packets, payload size WITHOUT checksum.
+const byte   MAX_PACKET_SIZE = 5;  // NMRA standard exrtended packets 
 
 // The WAVE_STATE enum is deliberately numbered because a change of order would be catastrophic
 // to the transform array.
@@ -50,14 +49,14 @@ class DCCWaveform {
   public:
     DCCWaveform( byte preambleBits, bool isMain);
     static void begin(MotorDriver * mainDriver, MotorDriver * progDriver);
-    static void loop(bool ackManagerActive);
+    static void loop();
     static DCCWaveform  mainTrack;
     static DCCWaveform  progTrack;
 
     void beginTrack();
     void setPowerMode(POWERMODE);
     POWERMODE getPowerMode();
-    void checkPowerOverload(bool ackManagerActive);
+    void checkPowerOverload();
     inline int get1024Current() {
 	  if (powerMode == POWERMODE::ON)
 	      return (int)(lastCurrent*(long int)1024/motorDriver->getRawCurrentTripValue());
@@ -95,9 +94,6 @@ class DCCWaveform {
 	    autoPowerOff=false;
 	}
     };
-    inline bool canMeasureCurrent() {
-      return motorDriver->canMeasureCurrent();
-    };
     inline void setAckLimit(int mA) {
 	ackLimitmA = mA;
     }
@@ -123,7 +119,7 @@ class DCCWaveform {
     bool isMainTrack;
     MotorDriver*  motorDriver;
     // Transmission controller
-    byte transmitPacket[MAX_PACKET_SIZE+1]; // +1 for checksum
+    byte transmitPacket[MAX_PACKET_SIZE];  // packet being transmitted
     byte transmitLength;
     byte transmitRepeats;      // remaining repeats of transmission
     byte remainingPreambles;
@@ -131,7 +127,7 @@ class DCCWaveform {
     byte bits_sent;           // 0-8 (yes 9 bits) sent for current byte
     byte bytes_sent;          // number of bytes sent from transmitPacket
     WAVE_STATE state;         // wave generator state machine
-    byte pendingPacket[MAX_PACKET_SIZE+1]; // +1 for checksum
+    byte pendingPacket[MAX_PACKET_SIZE];
     byte pendingLength;
     byte pendingRepeats;
     int  lastCurrent;
@@ -161,11 +157,8 @@ class DCCWaveform {
     unsigned int ackPulseDuration;  // micros
     unsigned long ackPulseStart; // micros
 
-    unsigned int minAckPulseDuration = 4000; // micros
+    unsigned int minAckPulseDuration = 2000; // micros
     unsigned int maxAckPulseDuration = 8500; // micros
-
-    volatile static uint8_t numAckGaps;
-    volatile static uint8_t numAckSamples;
-    static uint8_t trailingEdgeCounter;
+           
 };
 #endif

EEStore.cpp

@@ -94,10 +94,10 @@ int EEStore::pointer(){
 
 void EEStore::dump(int num) {
     byte b;
-    DIAG(F("Addr  0x  char"));
+    DIAG(F("\nAddr  0x  char\n"));
     for (int n=0 ; n<num; n++) {
 	EEPROM.get(n, b);
-	DIAG(F("%d     %x    %c"),n,b,isprint(b) ? b : ' ');
+	DIAG(F("%d     %x    %c\n"),n,b,isprint(b) ? b : ' ');
     }
 }
 ///////////////////////////////////////////////////////////////////////////////

EthernetInterface.cpp

@@ -52,6 +52,12 @@ EthernetInterface::EthernetInterface()
 {
     byte mac[6];
     DCCTimer::getSimulatedMacAddress(mac);
+    DIAG(F("\n+++++ Ethernet Setup. Simulatd mac="));
+    for (byte i=0;i<sizeof(mac); i++) {
+        DIAG(F("%x:"),mac[i]);
+    }
+    DIAG(F("\n"));
+    
     connected=false;
    
     #ifdef IP_ADDRESS
@@ -59,17 +65,17 @@ EthernetInterface::EthernetInterface()
     #else
     if (Ethernet.begin(mac) == 0)
     {
-        DIAG(F("Ethernet.begin FAILED"));
+        DIAG(F("begin FAILED\n"));
         return;
     } 
     #endif
     DIAG(F("begin OK."));
      if (Ethernet.hardwareStatus() == EthernetNoHardware) {
-      DIAG(F("Ethernet shield not found"));
+      DIAG(F("shield not found\n"));
       return;
     }
     if (Ethernet.linkStatus() == LinkOFF) {
-      DIAG(F("Ethernet cable not connected"));
+      DIAG(F("cable not connected\n"));
       return;
     }
     
@@ -98,13 +104,13 @@ void EthernetInterface::loop()
     {
     case 1:
         //renewed fail
-        DIAG(F("Ethernet Error: renewed fail"));
+        DIAG(F("\nEthernet Error: renewed fail\n"));
         singleton=NULL;
         return;
 
     case 3:
         //rebind fail
-        DIAG(F("Ethernet Error: rebind fail"));
+        DIAG(F("Ethernet Error: rebind fail\n"));
         singleton=NULL;
         return;
 
@@ -125,7 +131,7 @@ void EthernetInterface::loop()
     // check for new client
     if (client)
     {
-        if (Diag::ETHERNET) DIAG(F("Ethernet: New client "));
+        if (Diag::ETHERNET) DIAG(F("\nEthernet: New client "));
         byte socket;
         for (socket = 0; socket < MAX_SOCK_NUM; socket++)
         {
@@ -133,12 +139,12 @@ void EthernetInterface::loop()
             {
                 // On accept() the EthernetServer doesn't track the client anymore
                 // so we store it in our client array
-                if (Diag::ETHERNET) DIAG(F("Socket %d"),socket);
+                if (Diag::ETHERNET) DIAG(F("%d\n"),socket);
                 clients[socket] = client;
                 break;
             }
         }
-        if (socket==MAX_SOCK_NUM) DIAG(F("new Ethernet OVERFLOW")); 
+        if (socket==MAX_SOCK_NUM) DIAG(F("new Ethernet OVERFLOW\n")); 
     }
 
     // check for incoming data from all possible clients
@@ -148,11 +154,11 @@ void EthernetInterface::loop()
         
         int available=clients[socket].available();
         if (available > 0) {
-            if (Diag::ETHERNET)  DIAG(F("Ethernet: available socket=%d,avail=%d"), socket, available);
+            if (Diag::ETHERNET)  DIAG(F("\nEthernet: available socket=%d,avail=%d,count="), socket, available);
             // read bytes from a client
             int count = clients[socket].read(buffer, MAX_ETH_BUFFER);
             buffer[count] = '\0'; // terminate the string properly
-            if (Diag::ETHERNET) DIAG(F(",count=%d:%e"), socket,buffer);
+            if (Diag::ETHERNET) DIAG(F("%d:%e\n"), socket,buffer);
             // execute with data going directly back
             outboundRing->mark(socket); 
             CommandDistributor::parse(socket,buffer,outboundRing);
@@ -166,7 +172,7 @@ void EthernetInterface::loop()
    for (int socket = 0; socket<MAX_SOCK_NUM; socket++) {
      if (clients[socket] && !clients[socket].connected()) {
       clients[socket].stop();
-      if (Diag::ETHERNET)  DIAG(F("Ethernet: disconnect %d "), socket);             
+      if (Diag::ETHERNET)  DIAG(F("\nEthernet: disconnect %d \n"), socket);             
      }
     }
     
@@ -174,7 +180,7 @@ void EthernetInterface::loop()
     int socketOut=outboundRing->read();
     if (socketOut>=0) {
       int count=outboundRing->count();
-      if (Diag::ETHERNET) DIAG(F("Ethernet reply socket=%d, count=:%d"), socketOut,count);
+      if (Diag::ETHERNET) DIAG(F("Ethernet reply socket=%d, count=:%d\n"), socketOut,count);
       for(;count>0;count--)  clients[socketOut].write(outboundRing->read());
       clients[socketOut].flush(); //maybe 
     }

EthernetInterface.h

@@ -31,12 +31,7 @@
 #include "DCCEXParser.h"
 #include <Arduino.h>
 #include <avr/pgmspace.h>
-#if defined (ARDUINO_TEENSY41)
- #include <NativeEthernet.h>         //TEENSY Ethernet Treiber
- #include <NativeEthernetUdp.h>   
-#else
- #include "Ethernet.h"
-#endif
+#include <Ethernet.h>
 #include "RingStream.h"
 
 /**

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "b3d0235"
+#define GITHUB_SHA "edeaad4"

I2CManager.cpp

@@ -1,129 +0,0 @@
-/*
- *  © 2021, Neil McKechnie. All rights reserved.
- *
- *  This file is part of CommandStation-EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include <stdarg.h>
-#include <Wire.h>
-#include "I2CManager.h"
-
-// If not already initialised, initialise I2C (wire).
-void I2CManagerClass::begin(void) {
-  if (!_beginCompleted) {
-    Wire.begin();
-    _beginCompleted = true;
-  }
-}
-
-// Set clock speed to the lowest requested one. If none requested,
-//  the Wire default is 100kHz.
-void I2CManagerClass::setClock(uint32_t speed) {
-  if (speed < _clockSpeed && !_clockSpeedFixed) {
-    _clockSpeed = speed;
-    Wire.setClock(_clockSpeed);
-  }
-}
-
-// Force clock speed to that specified.  It can then only 
-// be overridden by calling Wire.setClock directly.
-void I2CManagerClass::forceClock(uint32_t speed) {
-  if (!_clockSpeedFixed) {
-    _clockSpeed = speed;
-    _clockSpeedFixed = true;
-    Wire.setClock(_clockSpeed);
-  }
-}
-
-// Check if specified I2C address is responding.
-// Returns 0 if OK, or error code.
-uint8_t I2CManagerClass::checkAddress(uint8_t address) {
-  begin();
-  Wire.beginTransmission(address);
-  return Wire.endTransmission();
-}
-
-bool I2CManagerClass::exists(uint8_t address) {
-  return checkAddress(address)==0;
-}
-
-// Write a complete transmission to I2C using a supplied buffer of data
-uint8_t I2CManagerClass::write(uint8_t address, const uint8_t buffer[], uint8_t size) {
-  Wire.beginTransmission(address);
-  Wire.write(buffer, size);
-  return Wire.endTransmission();
-}
-
-// Write a complete transmission to I2C using a supplied buffer of data in Flash
-uint8_t I2CManagerClass::write_P(uint8_t address, const uint8_t buffer[], uint8_t size) {
-  uint8_t ramBuffer[size];
-  memcpy_P(ramBuffer, buffer, size);
-  return write(address, ramBuffer, size);
-}
-  
-
-// Write a complete transmission to I2C using a list of data 
-uint8_t I2CManagerClass::write(uint8_t address, int nBytes, ...) {
-  uint8_t buffer[nBytes];
-  va_list args;
-  va_start(args, nBytes);
-  for (uint8_t i=0; i<nBytes; i++)
-    buffer[i] = va_arg(args, int);
-  va_end(args);
-  return write(address, buffer, nBytes);
-}
-
-// Write a command and read response, returns number of bytes received.
-//  Different modules use different ways of accessing registers: 
-//    PCF8574 I/O expander justs needs the address (no data);
-//    PCA9685 needs a two byte command to select the register(s) to be read;
-//    MCP23016 needs a one-byte command to select the register.
-// Some devices use 8-bit registers exclusively and some have 16-bit registers.
-// Therefore the following function is general purpose, to apply to any
-// type of I2C device.
-//
-uint8_t I2CManagerClass::read(uint8_t address, uint8_t readBuffer[], uint8_t readSize,
-                              uint8_t writeBuffer[], uint8_t writeSize) {
-  if (writeSize > 0) {
-    Wire.beginTransmission(address);
-    Wire.write(writeBuffer, writeSize);
-    Wire.endTransmission(false); // Don't free bus yet
-  }
-  Wire.requestFrom(address, readSize);
-  uint8_t nBytes = 0;
-  while (Wire.available() && nBytes < readSize) 
-    readBuffer[nBytes++] = Wire.read();
-  return nBytes;
-}
-
-// Overload of read() to allow command to be specified as a series of bytes.
-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.
-  va_start(args, writeSize);
-  uint8_t writeBuffer[writeSize];
-  for (uint8_t i=0; i<writeSize; i++)
-    writeBuffer[i] = va_arg(args, int);
-  va_end(args);
-  return read(address, readBuffer, readSize, writeBuffer, writeSize);
-}
-
-uint8_t I2CManagerClass::read(uint8_t address, uint8_t readBuffer[], uint8_t readSize) {
-  return read(address, readBuffer, readSize, NULL, 0);
-}
-
-I2CManagerClass I2CManager = I2CManagerClass();

I2CManager.h

@@ -1,76 +0,0 @@
-/*
- *  © 2021, Neil McKechnie. All rights reserved.
- *
- *  This file is part of CommandStation-EX
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef I2CManager_h
-#define I2CManager_h
-
-#include "FSH.h"
-
-/* 
- * Helper class to manage access to the I2C 'Wire' subsystem.
- * 
- * 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
- * driver, to a speed which is higher than a device supports.
- * 
- * Thirdly, it provides a convenient way to check whether there is a 
- * device on a particular I2C address.
- */
-
-class I2CManagerClass {
-
-public:
-
-  I2CManagerClass() {}
-
-  // If not already initialised, initialise I2C (wire).
-  void begin(void);
-  // Set clock speed to the lowest requested one.
-  void setClock(uint32_t speed);
-  // Force clock speed 
-  void forceClock(uint32_t speed);
-  // Check if specified I2C address is responding.
-  uint8_t checkAddress(uint8_t address);
-  bool exists(uint8_t address);
-  // Write a complete transmission to I2C from an array in RAM
-  uint8_t write(uint8_t address, const uint8_t buffer[], uint8_t size);
-  // Write a complete transmission to I2C from an array in Flash
-  uint8_t write_P(uint8_t address, const uint8_t buffer[], uint8_t size);
-  // Write a transmission to I2C from a list of bytes.
-  uint8_t write(uint8_t address, int nBytes, ...);
-  // Write a command from an array in RAM and read response
-  uint8_t read(uint8_t address, uint8_t writeBuffer[], uint8_t writeSize, 
-    uint8_t readBuffer[], uint8_t readSize);
-  // Write a command from an arbitrary list of bytes and read response
-  uint8_t read(uint8_t address, uint8_t readBuffer[], uint8_t readSize, 
-    uint8_t writeSize, ...);
-  // Write a null command and read the response.
-  uint8_t read(uint8_t address, uint8_t readBuffer[], uint8_t readSize);
-
-private:
-  bool _beginCompleted = false;
-  bool _clockSpeedFixed = false;
-  uint32_t _clockSpeed = 400000L;  // 400kHz max on Arduino.
-};
-
-extern I2CManagerClass I2CManager;
-
-#endif

LCDDisplay.cpp

@@ -1,6 +1,6 @@
 /*
- *  © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
- *
+ *  © 2020, Chris Harlow. All rights reserved.
+ *  
  *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
@@ -17,146 +17,63 @@
  *  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).
-
- */
-
+// CAUTION: the device dependent parts of this class are created in the .ini using LCD_Implementation.h
 #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::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;
-}
+ 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;
-  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 (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 ((!force) && (millis() - lastScrollTime)< LCD_SCROLL_TIME) return NULL;
+    lastScrollTime=millis();
+    clearNative();
+    int rowFirst=nextFilledRow();
+    if (rowFirst<0)return NULL; // No filled rows
+    setRowNative(0);
+    writeNative(rowBuffer[rowFirst]);
+    for (int slot=1;slot<lcdRows;slot++) {
+      int rowNext=nextFilledRow();
+      if (rowNext==rowFirst){
+         // we have wrapped around and not filled the screen 
+         topRow=-1; // start again at first row next time.  
+         break; 
       }
+      setRowNative(slot);
+      writeNative(rowBuffer[rowNext]);
+    } 
+    displayNative();   
+    return NULL; 
+ }
 
-      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);
+ int LCDDisplay::nextFilledRow() {
+      for (int rx=1;rx<=MAX_LCD_ROWS;rx++) {
+          topRow++;
+          topRow %= MAX_LCD_ROWS;
+          if (rowBuffer[topRow][0]) return topRow; 
+          }
+      return -1; // No slots filled
+ }
 
-  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();
-}
+  
+   

LCDDisplay.h

@@ -1,6 +1,6 @@
 /*
- *  © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
- *
+ *  © 2020, Chris Harlow. All rights reserved.
+ *  
  *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
@@ -20,61 +20,44 @@
 #define LCDDisplay_h
 #include <Arduino.h>
 
-#if __has_include ( "config.h")
-  #include "config.h"
-#endif
-
-// Allow maximum message length to be overridden from config.h
-#if !defined(MAX_MSG_SIZE) 
-#define MAX_MSG_SIZE 16
-#endif
-
 // This class is created in LCDisplay_Implementation.h
 
 class LCDDisplay : public Print {
- public:
-  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
 
-  static LCDDisplay* lcdDisplay;
-  LCDDisplay();
-  void interfake(int p1, int p2, int p3);
+  public:
+    static const int MAX_LCD_ROWS=8;
+    static const int MAX_LCD_COLS=16;
+    static const long LCD_SCROLL_TIME=3000; // 3 seconds  
+    
+    static LCDDisplay* lcdDisplay; 
+    LCDDisplay();
+    void interfake(int p1, int p2, int p3);    
 
-  // Internally handled functions
-  static void loop();
-  LCDDisplay* loop2(bool force);
-  void setRow(byte line);
-  void clear();
-
-  virtual size_t write(uint8_t b);
-  using Print::write;
-
- private:
-  void moveToNextRow();
-  void skipBlankRows();
-
-  // Relay functions to the live driver
-  void clearNative();
-  void displayNative();
-  void setRowNative(byte line);
-  void writeNative(char b);
-
-  unsigned long lastScrollTime = 0;
-  int8_t hotRow = 0;
-  int8_t hotCol = 0;
-  int8_t topRow = 0;
-  uint8_t lcdRows;
-  uint8_t lcdCols;
-  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 done = false;
-
-  char rowBuffer[MAX_LCD_ROWS][MAX_LCD_COLS + 1];
+    // Internally handled functions
+    static void loop();
+    LCDDisplay*  loop2(bool force);
+    void setRow(byte line); 
+    void clear();
+   
+    virtual size_t write(uint8_t b);
+    using Print::write;
+    
+  private:
+    int nextFilledRow();
+  
+   // Relay functions to the live driver
+    void clearNative();
+    void displayNative();
+    void setRowNative(byte line); 
+    void writeNative(char * b);
+  
+   unsigned long lastScrollTime=0;
+   int hotRow=0;
+   int hotCol=0; 
+   int topRow=0;
+   int lcdRows;
+   void renderRow(byte row);
+   char rowBuffer[MAX_LCD_ROWS][MAX_LCD_COLS+1];     
 };
 
 #endif

LCD_Implementation.h

@@ -1,5 +1,5 @@
 /*
- *  © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
@@ -22,7 +22,7 @@
 //
 // It will create a driver implemntation and a shim class implementation.
 // This means that other classes can reference the shim without knowing
-// which library is involved.
+// which libraray is involved.
 ////////////////////////////////////////////////////////////////////////////////////
 
 #ifndef LCD_Implementation_h
@@ -49,7 +49,7 @@ LCDDisplay * LCDDisplay::lcdDisplay=0;
 
 #else 
   #include "LCD_NONE.h"
-  #define CONDITIONAL_LCD_START if (true) /* NO LCD CONFIG, but do the LCD macros to get DIAGS */      
+  #define CONDITIONAL_LCD_START if (false) /* NO LCD CONFIG */      
 #endif
 
 #endif // LCD_Implementation_h

LCD_LCD.h

@@ -1,5 +1,5 @@
 /*
- *  © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
@@ -16,7 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
-  #include "LiquidCrystal_I2C.h" 
+  #include <LiquidCrystal_I2C.h> 
   LiquidCrystal_I2C LCDDriver(LCD_DRIVER);  // set the LCD address, cols, rows 
   // DEVICE SPECIFIC LCDDisplay Implementation for LCD_DRIVER
   LCDDisplay::LCDDisplay() { 
@@ -28,6 +28,10 @@
   }
   void LCDDisplay::interfake(int p1, int p2, int p3) {(void)p1; (void)p2; lcdRows=p3; }   
   void LCDDisplay::clearNative() {LCDDriver.clear();}
-  void LCDDisplay::setRowNative(byte row) { LCDDriver.setCursor(0, row); }
-  void LCDDisplay::writeNative(char b){ LCDDriver.write(b); }    
+  void LCDDisplay::setRowNative(byte row) { 
+    LCDDriver.setCursor(0, row);
+    LCDDriver.print(F("                "));
+    LCDDriver.setCursor(0, row);
+    }
+  void LCDDisplay::writeNative(char * b){ LCDDriver.print(b); }    
   void LCDDisplay::displayNative() { LCDDriver.display(); }

LCD_NONE.h

@@ -1,5 +1,5 @@
 /*
- *  © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
+ *  © 2020, Chris Harlow. All rights reserved.
  *  
  *  This file is part of CommandStation-EX
  *
@@ -22,6 +22,6 @@
   void LCDDisplay::interfake(int p1, int p2, int p3) {(void)p1; (void)p2; (void)p3;}   
   void LCDDisplay::setRowNative(byte row) { (void)row;} 
   void LCDDisplay::clearNative() {}
-  void LCDDisplay::writeNative(char b){ (void)b;} //  
+  void LCDDisplay::writeNative(char * b){ (void)b;} //  
   void LCDDisplay::displayNative(){}
   

LCD_OLED.h

@@ -1,6 +1,6 @@
 /*
- *  © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
- *
+ *  © 2020, Chris Harlow. All rights reserved.
+ *  
  *  This file is part of CommandStation-EX
  *
  *  This is free software: you can redistribute it and/or modify
@@ -17,57 +17,41 @@
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// OLED Implementation of LCDDisplay class
-// Note: this file is optionally included by LCD_Implementation.h
-// It is NOT a .cpp file to prevent it being compiled and demanding libraries
-// even when not needed.
-
-#include "I2CManager.h"
-#include "SSD1306Ascii.h"
-SSD1306AsciiWire LCDDriver;
-
+// OLED Implementation of LCDDisplay class 
+// Note: this file is optionally included by LCD_Implenentation.h
+// It is NOT a .cpp file to prevent it being compiled and demanding libraraies even when not needed.
+  
+#include <Adafruit_SSD1306.h>
+Adafruit_SSD1306 LCDDriver(OLED_DRIVER);
+  
 // DEVICE SPECIFIC LCDDisplay Implementation for OLED
 
 LCDDisplay::LCDDisplay() {
-  // Scan for device on 0x3c and 0x3d.
-  I2CManager.begin();
-  I2CManager.setClock(400000L);  // Set max supported I2C speed
-  for (byte address = 0x3c; address <= 0x3d; address++) {
-    if (I2CManager.exists(address)) {
-      // Device found
-      DIAG(F("OLED display found at 0x%x"), address);
-      interfake(OLED_DRIVER, 0);
-      const DevType *devType;
-      if (lcdCols == 132)
-        devType = &SH1106_128x64;  // Actually 132x64 but treated as 128x64
-      else if (lcdCols == 128 && lcdRows == 4)
-        devType = &Adafruit128x32;
-      else
-        devType = &Adafruit128x64;
-      LCDDriver.begin(devType, address);
-      lcdDisplay = this;
-      LCDDriver.setFont(System5x7);  // Normal 1:1 pixel scale, 8 bits high
+    if(LCDDriver.begin(SSD1306_SWITCHCAPVCC, 0x3C) || LCDDriver.begin(SSD1306_SWITCHCAPVCC, 0x3D)) {
+      DIAG(F("\nOLED display found")); 
+      delay(2000); // painful Adafruit splash pants! 
+      lcdDisplay=this;
+      LCDDriver.setTextSize(1);             // Normal 1:1 pixel scale
+      LCDDriver.setTextColor(SSD1306_WHITE);            // Draw white text
+      interfake(OLED_DRIVER,0);
       clear();
-      return;
+      return;  
+      }
+    DIAG(F("\nOLED display not found\n"));
     }
-  }
-  DIAG(F("OLED display not found"));
-}
 
-void LCDDisplay::interfake(int p1, int p2, int p3) {
-  lcdCols = p1;
-  lcdRows = p2 / 8;
-  (void)p3;
-}
+  void LCDDisplay::interfake(int p1, int p2, int p3) {(void)p1; lcdRows=p2/8; (void)p3;}   
 
-void LCDDisplay::clearNative() { LCDDriver.clear(); }
+  void LCDDisplay::clearNative() {LCDDriver.clearDisplay();}
 
-void LCDDisplay::setRowNative(byte row) {
-  // Positions text write to start of row 1..n
-  int y = row;
-  LCDDriver.setCursor(0, y);
-}
-
-void LCDDisplay::writeNative(char b) { LCDDriver.write(b); }
-
-void LCDDisplay::displayNative() {}
+  void LCDDisplay::setRowNative(byte row) {
+    // Positions text write to start of row 1..n and clears previous text 
+    int y=8*row;
+    LCDDriver.fillRect(0, y, LCDDriver.width(),   8, SSD1306_BLACK);
+    LCDDriver.setCursor(0, y); 
+    }
+  
+  void LCDDisplay::writeNative(char * b){ LCDDriver.print(b); }    
+  
+  void LCDDisplay::displayNative() { LCDDriver.display(); }  
+  

LCN.cpp

@@ -1,74 +0,0 @@
-/*
- *  © 2021, Chris Harlow. All rights reserved.
- *  
- *  This file is part of DCC-EX CommandStation-EX 
- *  
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "LCN.h"
-#include "DIAG.h"
-#include "Turnouts.h"
-#include "Sensors.h"
-
-int  LCN::id = 0;
-Stream * LCN::stream=NULL;
-bool LCN::firstLoop=true;
-
-void LCN::init(Stream & lcnstream) {
-  stream=&lcnstream; 
-  DIAG(F("LCN connection setup")); 
-}
-
-
-// Inbound LCN traffic is postfix notation...   nnnX  where nnn is an id, X is the opcode
-void LCN::loop() {
-  if (!stream) return;
-  if (firstLoop) {
-    firstLoop=false;
-    stream->println('X');
-    return; 
-  }
-  
-  while (stream->available()) {
-    int ch = stream->read();
-    if (ch >= 0 && ch <= '9') {  // accumulate id value
-      id = 10 * id + ch - '0';
-    }
-    else if (ch == 't' || ch == 'T') { // Turnout opcodes
-      if (Diag::LCN) DIAG(F("LCN IN %d%c"),id,(char)ch);
-      Turnout * tt = Turnout::get(id);
-      if (!tt) Turnout::create(id, LCN_TURNOUT_ADDRESS, 0);
-      if (ch == 't') tt->data.tStatus |= STATUS_ACTIVE;
-      else   tt->data.tStatus &= ~STATUS_ACTIVE;
-      Turnout::turnoutlistHash++; // signals ED update of turnout data
-      id = 0;
-    }
-    else if (ch == 'S' || ch == 's') {
-      if (Diag::LCN) DIAG(F("LCN IN %d%c"),id,(char)ch);
-      Sensor * ss = Sensor::get(id);
-      if (!ss) ss = Sensor::create(id, 255,0); // impossible pin
-      ss->active = ch == 'S';
-      id = 0;
-    }
-    else  id = 0; // ignore any other garbage from LCN
-  }
-}
-
-void LCN::send(char opcode, int id, bool state) {
-   if (stream) {
-      StringFormatter::send(stream,F("%c/%d/%d"), opcode, id , state);
-      if (Diag::LCN) DIAG(F("LCN OUT %c/%d/%d"), opcode, id , state);
-   }
-}

LCN.h

@@ -1,16 +0,0 @@
-#ifndef LCN_h
-#define LCN_h
-#include <Arduino.h>
-
-class LCN {
-  public: 
-    static void init(Stream & lcnstream);
-    static void loop();
-    static void send(char opcode, int id, bool state);
-  private :
-    static bool firstLoop; 
-    static Stream * stream; 
-    static int id;
-};
-
-#endif

LiquidCrystal_I2C.cpp

@@ -1,218 +0,0 @@
-/*
- *  © 2021, Neil McKechnie. All rights reserved.
- *  Based on the work by DFRobot, Frank de Brabander and Marco Schwartz.
- *
- *  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-EX.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include <Arduino.h>
-#include "LiquidCrystal_I2C.h"
-#include "I2CManager.h"
-
-// When the display powers up, it is configured as follows:
-//
-// 1. Display clear
-// 2. Function set:
-//    DL = 1; 8-bit interface data
-//    N = 0; 1-line display
-//    F = 0; 5x8 dot character font
-// 3. Display on/off control:
-//    D = 0; Display off
-//    C = 0; Cursor off
-//    B = 0; Blinking off
-// 4. Entry mode set:
-//    I/D = 1; Increment by 1
-//    S = 0; No shift
-//
-// Note, however, that resetting the Arduino doesn't reset the LCD, so we
-// can't assume that its in that state when a sketch starts (and the
-// LiquidCrystal constructor is called).
-
-LiquidCrystal_I2C::LiquidCrystal_I2C(uint8_t lcd_Addr, uint8_t lcd_cols,
-                                     uint8_t lcd_rows) {
-  _Addr = lcd_Addr;
-  _cols = lcd_cols;
-  _rows = lcd_rows;
-  _backlightval = LCD_NOBACKLIGHT;
-}
-
-void LiquidCrystal_I2C::init() { init_priv(); }
-
-void LiquidCrystal_I2C::init_priv() {
-  I2CManager.begin();
-  I2CManager.setClock(100000L);    // PCF8574 is spec'd to 100kHz.
-
-  _displayfunction = LCD_4BITMODE | LCD_1LINE | LCD_5x8DOTS;
-  begin(_cols, _rows);
-}
-
-void LiquidCrystal_I2C::begin(uint8_t cols, uint8_t lines) {
-  if (lines > 1) {
-    _displayfunction |= LCD_2LINE;
-  }
-  _numlines = lines;
-  (void)cols; // Suppress compiler warning.
-
-  // according to datasheet, we need at least 40ms after power rises above 2.7V
-  // before sending commands. Arduino can turn on way befer 4.5V so we'll allow
-  // 100 milliseconds after pulling both RS and R/W and backlight pin low
-  expanderWrite(
-      _backlightval);  // reset expander and turn backlight off (Bit 8 =1)
-  delay(100);
-
-  // put the LCD into 4 bit mode
-  // this is according to the hitachi HD44780 datasheet
-  // figure 24, pg 46
-
-  // we start in 8bit mode, try to set 4 bit mode
-  write4bits(0x03 << 4);
-  delayMicroseconds(4500);  // wait min 4.1ms
-
-  // second try
-  write4bits(0x03 << 4);
-  delayMicroseconds(4500);  // wait min 4.1ms
-
-  // third go!
-  write4bits(0x03 << 4);
-  delayMicroseconds(150);
-
-  // finally, set to 4-bit interface
-  write4bits(0x02 << 4);
-
-  // set # lines, font size, etc.
-  command(LCD_FUNCTIONSET | _displayfunction);
-
-  // turn the display on with no cursor or blinking default
-  _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);
-
-  setCursor(0, 0);
-}
-
-/********** high level commands, for the user! */
-void LiquidCrystal_I2C::clear() {
-  command(LCD_CLEARDISPLAY);  // clear display, set cursor position to zero
-  delayMicroseconds(2000);    // this command takes 1.52ms
-}
-
-void LiquidCrystal_I2C::setCursor(uint8_t col, uint8_t row) {
-  int row_offsets[] = {0x00, 0x40, 0x14, 0x54};
-  if (row > _numlines) {
-    row = _numlines - 1;  // we count rows starting w/0
-  }
-  command(LCD_SETDDRAMADDR | (col + row_offsets[row]));
-}
-
-// Turn the display on/off (quickly)
-void LiquidCrystal_I2C::noDisplay() {
-  _displaycontrol &= ~LCD_DISPLAYON;
-  command(LCD_DISPLAYCONTROL | _displaycontrol);
-}
-
-void LiquidCrystal_I2C::display() {
-  _displaycontrol |= LCD_DISPLAYON;
-  command(LCD_DISPLAYCONTROL | _displaycontrol);
-}
-
-// Turn the (optional) backlight off/on
-void LiquidCrystal_I2C::noBacklight(void) {
-  _backlightval = LCD_NOBACKLIGHT;
-  expanderWrite(0);
-}
-
-void LiquidCrystal_I2C::backlight(void) {
-  _backlightval = LCD_BACKLIGHT;
-  expanderWrite(0);
-}
-
-size_t LiquidCrystal_I2C::write(uint8_t value) {
-  send(value, Rs);
-  return 1;
-}
-
-/*********** mid level commands, for sending data/cmds */
-
-inline void LiquidCrystal_I2C::command(uint8_t value) { 
-  send(value, 0); 
-}
-
-/************ low level data pushing commands **********/
-
-/* According to the NXP Datasheet for the PCF8574 section 8.2:
- *   "The master (microcontroller) sends the START condition and slave address
- *    setting the last bit of the address byte to logic 0 for the write mode.
- *    The PCF8574/74A acknowledges and the master then sends the data byte for
- *    P7 to P0 to the port register. As the clock line goes HIGH, the 8-bit
- *    data is presented on the port lines after it has been acknowledged by the
- *    PCF8574/74A. [...] The master can then send a STOP or ReSTART condition
- *    or continue sending data. The number of data bytes that can be sent 
- *    successively is not limited and the previous data is overwritten every
- *    time a data byte has been sent and acknowledged."
- * 
- * This driver takes advantage of this by sending multiple data bytes in succession
- * within a single I2C transmission.  With a fast clock rate of 400kHz, the time
- * between successive updates of the PCF8574 outputs will be at least 2.5us.  With
- * the default clock rate of 100kHz the time between updates will be at least 10us.
- * 
- * The LCD controller HD44780, according to its datasheet, needs nominally 37us
- * (up to 50us) to execute a command (i.e. write to gdram, reposition, etc.). Each
- * command is sent in a separate I2C transmission here.  The time taken to end a 
- * transmission and start another one is a stop bit, a start bit, 8 address bits,
- * an ack, 8 data bits and another ack; this is at least 20 bits, i.e. >50us
- * at 400kHz and >200us at 100kHz. Therefore, we don't need additional delay.
- * 
- * Similarly, the Enable must be set/reset for at least 450ns.  This is 
- * well within the I2C clock cycle time of 2.5us at 400kHz.  Data is clocked in
- * to the HD44780 on the trailing edge of the Enable pin, so we set the Enable
- * as we present the data, then in the next byte we reset Enable without changing
- * the data.
- */
-
-// write either command or data (8 bits) to the HD44780 LCD controller as
-//  a single I2C transmission. 
-void LiquidCrystal_I2C::send(uint8_t value, uint8_t mode) {
-  mode |= _backlightval;
-  uint8_t highnib = (value & 0xf0) | mode;
-  uint8_t lownib = ((value << 4) & 0xf0) | mode;
-  // Send both nibbles
-  byte buffer[] = {(byte)(highnib|En), highnib, (byte)(lownib|En), lownib};
-  I2CManager.write(_Addr, buffer, sizeof(buffer));
-}
-
-// write 4 bits to the HD44780 LCD controller.
-void LiquidCrystal_I2C::write4bits(uint8_t value) {
-  uint8_t _data = value | _backlightval;
-  // Enable must be set/reset for at least 450ns.  This is well within the
-  // I2C clock cycle time of 2.5us at 400kHz. Data is clocked in to the
-  // HD44780 on the trailing edge of the Enable pin.
-  byte buffer[] = {(byte)(_data|En), _data};
-  I2CManager.write(_Addr, buffer, sizeof(buffer));
-}
-
-// 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) {
-  I2CManager.write(_Addr, 1, value | _backlightval);
-}

LiquidCrystal_I2C.h

@@ -1,102 +0,0 @@
-/*
- *  © 2021, Neil McKechnie. All rights reserved.
- *  Based on the work by DFRobot, Frank de Brabander and Marco Schwartz.
- *
- *  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 LiquidCrystal_I2C_h
-#define LiquidCrystal_I2C_h
-
-#include <Arduino.h>
-
-// commands
-#define LCD_CLEARDISPLAY 0x01
-#define LCD_RETURNHOME 0x02
-#define LCD_ENTRYMODESET 0x04
-#define LCD_DISPLAYCONTROL 0x08
-#define LCD_CURSORSHIFT 0x10
-#define LCD_FUNCTIONSET 0x20
-#define LCD_SETCGRAMADDR 0x40
-#define LCD_SETDDRAMADDR 0x80
-
-// flags for display entry mode
-#define LCD_ENTRYRIGHT 0x00
-#define LCD_ENTRYLEFT 0x02
-#define LCD_ENTRYSHIFTINCREMENT 0x01
-#define LCD_ENTRYSHIFTDECREMENT 0x00
-
-// flags for display on/off control
-#define LCD_DISPLAYON 0x04
-#define LCD_DISPLAYOFF 0x00
-#define LCD_CURSORON 0x02
-#define LCD_CURSOROFF 0x00
-#define LCD_BLINKON 0x01
-#define LCD_BLINKOFF 0x00
-
-// flags for display/cursor shift
-#define LCD_DISPLAYMOVE 0x08
-#define LCD_CURSORMOVE 0x00
-#define LCD_MOVERIGHT 0x04
-#define LCD_MOVELEFT 0x00
-
-// flags for function set
-#define LCD_8BITMODE 0x10
-#define LCD_4BITMODE 0x00
-#define LCD_2LINE 0x08
-#define LCD_1LINE 0x00
-#define LCD_5x10DOTS 0x04
-#define LCD_5x8DOTS 0x00
-
-// flags for backlight control
-#define LCD_BACKLIGHT 0x08
-#define LCD_NOBACKLIGHT 0x00
-
-#define En 0b00000100  // Enable bit
-#define Rw 0b00000010  // Read/Write bit
-#define Rs 0b00000001  // Register select bit
-
-class LiquidCrystal_I2C : public Print {
-public:
-  LiquidCrystal_I2C(uint8_t lcd_Addr,uint8_t lcd_cols,uint8_t lcd_rows);
-  void begin(uint8_t cols, uint8_t rows);
-  void clear();
-  void noDisplay();
-  void display();
-  void noBacklight();
-  void backlight();
-  
-  void setCursor(uint8_t, uint8_t); 
-  virtual size_t write(uint8_t);
-  void command(uint8_t);
-  void init();
-
-private:
-  void init_priv();
-  void send(uint8_t, uint8_t);
-  void write4bits(uint8_t);
-  void expanderWrite(uint8_t);
-  uint8_t _Addr;
-  uint8_t _displayfunction;
-  uint8_t _displaycontrol;
-  uint8_t _displaymode;
-  uint8_t _numlines;
-  uint8_t _cols;
-  uint8_t _rows;
-  uint8_t _backlightval;
-};
-
-#endif

MotorDriver.cpp

@@ -58,10 +58,7 @@ MotorDriver::MotorDriver(byte power_pin, byte signal_pin, byte signal_pin2, int8
   else brakePin=UNUSED_PIN;
   
   currentPin=current_pin;
-  if (currentPin!=UNUSED_PIN) {
-    pinMode(currentPin, INPUT);
-    senseOffset=analogRead(currentPin); // value of sensor at zero current
-  }
+  pinMode(currentPin, INPUT);
 
   faultPin=fault_pin;
   if (faultPin != UNUSED_PIN) {
@@ -72,12 +69,6 @@ MotorDriver::MotorDriver(byte power_pin, byte signal_pin, byte signal_pin2, int8
   senseFactor=sense_factor;
   tripMilliamps=trip_milliamps;
   rawCurrentTripValue=(int)(trip_milliamps / sense_factor);
-  
-  if (currentPin==UNUSED_PIN) 
-    DIAG(F("MotorDriver ** WARNING ** No current or short detection"));  
-  else  
-    DIAG(F("MotorDriver currentPin=A%d, senseOffset=%d, rawCurentTripValue(relative to offset)=%d"),
-    currentPin-A0, senseOffset,rawCurrentTripValue);
 }
 
 bool MotorDriver::isPWMCapable() {
@@ -126,40 +117,14 @@ void MotorDriver::setSignal( bool high) {
    }
 }
 
-#if defined(ARDUINO_TEENSY32) || defined(ARDUINO_TEENSY35)|| defined(ARDUINO_TEENSY36)
-volatile unsigned int overflow_count=0;
-#endif
-
-bool MotorDriver::canMeasureCurrent() {
-  return currentPin!=UNUSED_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, create a little and return -1 in that case.
- * 
- * senseOffset handles the case where a shield returns values above or below 
- * a central value depending on direction.
+ * As there is no -0, ceat a little and return -1 in that case.
  */
 int MotorDriver::getCurrentRaw() {
-  if (currentPin==UNUSED_PIN) return 0; 
-  int current;
-#if defined(ARDUINO_TEENSY40) || defined(ARDUINO_TEENSY41)
-  bool irq = disableInterrupts();
-  current = analogRead(currentPin)-senseOffset;
-  enableInterrupts(irq);
-#elif defined(ARDUINO_TEENSY32) || defined(ARDUINO_TEENSY35)|| defined(ARDUINO_TEENSY36)
-  unsigned char sreg_backup;
-  sreg_backup = SREG;   /* save interrupt enable/disable state */
-  cli();
-  current = analogRead(currentPin)-senseOffset;
-  overflow_count = 0;
-  SREG = sreg_backup;    /* restore interrupt state */
-#else
-  current = analogRead(currentPin)-senseOffset;
-#endif
-  if (current<0) current=0-current;
-  if ((faultPin != UNUSED_PIN)  && isLOW(fastFaultPin) && isHIGH(fastPowerPin))
+  int current = analogRead(currentPin);
+  if (faultPin != UNUSED_PIN && isLOW(fastFaultPin) && isHIGH(fastPowerPin))
       return (current == 0 ? -1 : -current);
   return current;
   // IMPORTANT:  This function can be called in Interrupt() time within the 56uS timer
@@ -175,8 +140,7 @@ int MotorDriver::mA2raw( unsigned int mA) {
 }
 
 void  MotorDriver::getFastPin(const FSH* type,int pin, bool input, FASTPIN & result) {
-    // DIAG(F("MotorDriver %S Pin=%d,"),type,pin);
-    (void) type; // avoid compiler warning if diag not used above. 
+    DIAG(F("\nMotorDriver %S Pin=%d,"),type,pin);
     uint8_t port = digitalPinToPort(pin);
     if (input)
       result.inout = portInputRegister(port);
@@ -184,5 +148,5 @@ void  MotorDriver::getFastPin(const FSH* type,int pin, bool input, FASTPIN & res
       result.inout = portOutputRegister(port);
     result.maskHIGH = digitalPinToBitMask(pin);
     result.maskLOW = ~result.maskHIGH;
-    // DIAG(F(" port=0x%x, inoutpin=0x%x, isinput=%d, mask=0x%x"),port, result.inout,input,result.maskHIGH);
+    DIAG(F(" port=0x%x, inoutpin=0x%x, isinput=%d, mask=0x%x\n"),port, result.inout,input,result.maskHIGH);
 }

MotorDriver.h

@@ -26,24 +26,15 @@
 #define UNUSED_PIN 127 // inside int8_t
 #endif
 
-#if defined(__IMXRT1062__)
-struct FASTPIN {
-  volatile uint32_t *inout;
-  uint32_t maskHIGH;  
-  uint32_t maskLOW;  
-};
-#else
 struct FASTPIN {
   volatile uint8_t *inout;
   uint8_t maskHIGH;  
   uint8_t maskLOW;  
 };
-#endif
 
 class MotorDriver {
   public:
-    MotorDriver(byte power_pin, byte signal_pin, byte signal_pin2, int8_t brake_pin, 
-                byte current_pin, float senseFactor, unsigned int tripMilliamps, byte faultPin);
+    MotorDriver(byte power_pin, byte signal_pin, byte signal_pin2, int8_t brake_pin, byte current_pin, float senseFactor, unsigned int tripMilliamps, byte faultPin);
     virtual void setPower( bool on);
     virtual void setSignal( bool high);
     virtual void setBrake( bool on);
@@ -54,12 +45,12 @@ class MotorDriver {
 	    return rawCurrentTripValue;
     }
     bool isPWMCapable();
-    bool canMeasureCurrent();
     static bool usePWM;
     static bool commonFaultPin; // This is a stupid motor shield which has only a common fault pin for both outputs
     inline byte getFaultPin() {
 	return faultPin;
     }
+    
   private:
     void  getFastPin(const FSH* type,int pin, bool input, FASTPIN & result);
     void  getFastPin(const FSH* type,int pin, FASTPIN & result) {
@@ -70,19 +61,7 @@ class MotorDriver {
     bool dualSignal;       // true to use signalPin2
     bool invertBrake;       // brake pin passed as negative means pin is inverted
     float senseFactor;
-    int senseOffset;
     unsigned int tripMilliamps;
     int rawCurrentTripValue;
-#if defined(ARDUINO_TEENSY40) || defined(ARDUINO_TEENSY41)
-    static bool disableInterrupts() {
-      uint32_t primask;
-      __asm__ volatile("mrs %0, primask\n" : "=r" (primask)::);
-      __disable_irq();
-      return (primask == 0) ? true : false;
-    }
-    static void enableInterrupts(bool doit) {
-      if (doit) __enable_irq();
-    }
-#endif
 };
 #endif

MotorDrivers.h

@@ -21,7 +21,7 @@
 // If the brakePin is negative that means the sense
 // of the brake pin on the motor bridge is inverted
 // (HIGH == release brake)
-//
+
 // Arduino standard Motor Shield
 #define STANDARD_MOTOR_SHIELD F("STANDARD_MOTOR_SHIELD"),                                                 \
                               new MotorDriver(3, 12, UNUSED_PIN, UNUSED_PIN, A0, 2.99, 2000, UNUSED_PIN), \
@@ -57,9 +57,4 @@
                          new MotorDriver(10, 12, UNUSED_PIN, 9, A0, 2.99, 2000, UNUSED_PIN), \
                          new MotorDriver(11, 13, UNUSED_PIN, UNUSED_PIN, A1, 2.99, 2000, UNUSED_PIN)
 
-// IBT_2 Motor Board for Main and Arduino Motor Shield for Prog
-#define IBT_2_WITH_ARDUINO F("IBT_2_WITH_ARDUINO_SHIELD"),                                              \
-                         new MotorDriver(4, 5, 6, UNUSED_PIN, A5, 41.54, 5000, UNUSED_PIN), \
-                         new MotorDriver(11, 13, UNUSED_PIN, UNUSED_PIN, A1, 2.99, 2000, UNUSED_PIN)
-
 #endif

Outputs.cpp

@@ -88,7 +88,7 @@ the state of any outputs being monitored or controlled by a separate interface o
 // print all output states to stream
 void Output::printAll(Print *stream){
   for (Output *tt = Output::firstOutput; tt != NULL; tt = tt->nextOutput)
-    StringFormatter::send(stream, F("<Y %d %d>\n"), tt->data.id, tt->data.oStatus);
+    StringFormatter::send(stream, F("<Y %d %d>"), tt->data.id, tt->data.oStatus);
 } // Output::printAll
 
 void  Output::activate(int s){

PWMServoDriver.cpp

@@ -23,9 +23,9 @@
  *  BSD license, all text above must be included in any redistribution
  */
 #include <Arduino.h>
+#include <Wire.h>
 #include "PWMServoDriver.h"
 #include "DIAG.h"
-#include "I2CManager.h"
 
 
 // REGISTER ADDRESSES
@@ -40,7 +40,6 @@ const byte MODE1_RESTART=0x80; /**< Restart enabled */
 const byte PCA9685_I2C_ADDRESS=0x40;      /** First PCA9685 I2C Slave Address */
 const float FREQUENCY_OSCILLATOR=25000000.0; /** 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
   
 /*!
  *  @brief  Sets the PWM frequency for a chip to 50Hz for servos
@@ -53,20 +52,19 @@ bool PWMServoDriver::setup(int board) {
   if (board>3 || (failFlags & (1<<board))) return false; 
   if (setupFlags & (1<<board)) return true; 
   
-  I2CManager.begin();
-  I2CManager.setClock(MAX_I2C_SPEED);
-  
+  Wire.begin();
   uint8_t i2caddr=PCA9685_I2C_ADDRESS + board;
 
-  // Test if device is available
-  byte error = I2CManager.checkAddress(i2caddr);
-  if (error) {
-    DIAG(F("I2C Servo device 0x%x Not Found %d"),i2caddr, error);
+  // Terst if device is available
+  Wire.beginTransmission(i2caddr);
+  byte error = Wire.endTransmission();
+  if (error!=0) {
+    DIAG(F("\nI2C Servo device 0x%x Not Found %d\n"),i2caddr, error);
     failFlags|=1<<board;  
     return false;
   }
     
-  //DIAG(F("PWMServoDriver::setup %x prescale=%d"),i2caddr,PRESCALE_50HZ); 
+  //DIAG(F("\nPWMServoDriver::setup %x prescale=%d"),i2caddr,PRESCALE_50HZ); 
   writeRegister(i2caddr,PCA9685_MODE1, MODE1_SLEEP | MODE1_AI);    
   writeRegister(i2caddr,PCA9685_PRESCALE, PRESCALE_50HZ);  
   writeRegister(i2caddr,PCA9685_MODE1,MODE1_AI);
@@ -83,15 +81,22 @@ void PWMServoDriver::setServo(byte servoNum, uint16_t value) {
   int pin=servoNum%16;
   
   if (setup(board)) {
-    DIAG(F("SetServo %d %d"),servoNum,value);  
-    uint8_t buffer[] = {(uint8_t)(PCA9685_FIRST_SERVO + 4 * pin), // 4 registers per pin
-      0, 0, (uint8_t)(value & 0xff), (uint8_t)(value >> 8)};
-    if (value == 4095) buffer[2] = 0x10;   // Full on
-    byte error=I2CManager.write(PCA9685_I2C_ADDRESS + board, buffer, sizeof(buffer));
-    if (error!=0) DIAG(F("SetServo error %d"),error); 
+    DIAG(F("\nSetServo %d %d\n"),servoNum,value);  
+    Wire.beginTransmission(PCA9685_I2C_ADDRESS + board);
+    Wire.write(PCA9685_FIRST_SERVO + 4 * pin); // 4 registers per pin
+    Wire.write(0);
+    Wire.write(0);
+    Wire.write(value);
+    Wire.write(value >> 8);
+    byte error=Wire.endTransmission();
+    if (error!=0) DIAG(F("\nSetServo error %d\n"),error); 
   }
 }
 
 void PWMServoDriver::writeRegister(uint8_t i2caddr,uint8_t hardwareRegister, uint8_t d) {
-  I2CManager.write(i2caddr, 2, hardwareRegister, d);
+  Wire.beginTransmission(i2caddr);
+  Wire.write(hardwareRegister);
+  Wire.write(d);
+  Wire.endTransmission();
+  delay(5); // allow registers to settle before continuing
 }

Release_Notes/release_notes_v3.0.0.md

@@ -1,85 +0,0 @@
-
-
-The DCC-EX Team is pleased to release CommandStation-EX-v3.0.0 as a Production Release.  This release is a major re-write of earlier versions.  We've re-architected the code-base so that it can better handle new features going forward.  Download the compressed files here:
-
-**Downloads (zip and tar.gz) below. These are named without version number in the folder name to make the Arduino IDE happy.**
-
-[CommandStation-EX.zip](https://github.com/DCC-EX/CommandStation-EX/files/5611333/CommandStation-EX.zip)
-[CommandStation-EX.tar.gz](https://github.com/DCC-EX/CommandStation-EX/files/5611335/CommandStation-EX.tar.gz)
-
-
-**Known Bugs:**
- - **Consisting through JMRI** - currently does not work in this release.  A number of testers were able to develop a work around.  If interested enter a Support Ticket.
- - **Wi-Fi** - works, but can be challenging to use if you want to switch between AP mode and STA station mode.
- - **Pololu Motor Shield** - is supported with this release, but the user may have to play around with some timings to enable programming mode due to limitation in its current sensing circuitry 
-
- **Summary of the key new features added to CommandStation-EX V3.0.0:**
- - **WiFi Support** - AP and station modes supported. Auto-detection of an ESP8266 WiFi module with AT firmware on a Mega's serial port. Connection to JMRI and WiThrottle clients.
- - **Withrottle Integrations** - Act as a host for four WiThrottle clients concurrently. 
- - **Add LCD/OLED support** - OLED supported on Mega only
- - **Improved CV programming routines** - checks for length of CV pulse, and breaks out of the wait state once it has received an ACK, now reading one CV per second.
- - **Improved current sensing** - rewrote current sensing routines for safer operation. Current thresholds based on milliamps, not magic numbers
- - **Individual track power control** - Ability to toggle power on either or both tracks, and to "JOIN" the tracks and make them output the same waveform for multiple power districts.
- - **Single or Dual-Pin PWM output** - Allows control of H-bridges with PH/EN or dual PWM inputs
- - **New, simpler function command** - ```<F>``` command allows setting functions based on their number, not based on a code as in ```<f>```
- - **Function reminders** - Function reminders are sent in addition to speed reminders
- - **Functions to F28** - All NMRA functions are now supported
- - **Filters and user functions** - Ability to filter commands in the parser and execute custom code based on them
- - **Diagnostic ```<D>``` commands** - See documentation for a full list of new diagnostic commands
- - **Rewrote DCC++ Parser** - more efficient operation, accepts multi-char input and uses less RAM
- - **Rewritten waveform generator** - capable of using any pin for DCC waveform out, eliminating the need for jumpers
- - **Rewritten packet generator** - Simplify and make smaller, remove idea of "registers" from original code
- - **Add free RAM messages** - Free RAM messages are now printed whenever there is a decerase in available RAM
- - **Fix EEPROM bugs**
- - **Number of locos discovery command** - ```<#>``` command 
- - **Support for more locomotives** - 20 locomotives on an UNO and 50 an a Mega.
- - **Automatic slot managment** - slot variable in throttle/function commands are ignored and slot management is taken care of automatically. ```<!>``` command added to release locos from memory.
-
-
-**Key Contributors**
-
-**Project Lead**
-- Fred Decker - Holly Springs, North Carolina, USA (FlightRisk)
-
-**CommandStation-EX Developers**
-- Chris Harlow - Bournemouth, UK (UKBloke)
-- Harald Barth - Stockholm, Sweden (Haba)
-- Fred Decker - Holly Springs, North Carolina, USA (FlightRisk)
-- Dave Cutting - Logan, Utah, USA (Dave Cutting/ David Cutting)
-- M Steve Todd - - Engine Driver and JMRI Interface
-- Scott Catalanno - Pennsylvania
-- Gregor Baues - Île-de-France, France (grbba)
-
-**exInstaller Software**
-- Anthony W - Dayton, Ohio, USA (Dex, Dex++)
-
-**Website and Documentation**
-- Mani Kumar - Bangalor, India (Mani / Mani Kumar)
-- Fred Decker - Holly Springs, North Carolina, USA (FlightRisk)
-- Dave Cutting - Logan, Utah, USA (Dave Cutting/ David Cutting)
-- Roger Beschizza - Dorset, UK (Roger Beschizza)
-- Keith Ledbetter - Chicago, Illinois, USA (Keith Ledbetter)
--Kevin Smith - (KCSmith)
-
-**Beta Testing / Release Management / Support**
-- Larry Dribin	- Release Management
-- Keith Ledbetter	
-- BradVan der Elst	
-- Andrew Pye	
-- Mike Bowers	
-- Randy McKenzie
-- Roberto Bravin
-- Sim Brigden
-- Alan Lautenslager
-- Martin Bafver	
-- Mário André Silva	
-- Anthony Kochevar	
-- Gajanatha Kobbekaduwe	
-- Sumner Patterson 
-- Paul - Virginia, USA
-
-**Downloads (zip and tar.gz) below. These are named without version number in the folder name to make the Arduino IDE happy.**
-
-[CommandStation-EX.zip](https://github.com/DCC-EX/CommandStation-EX/files/5611333/CommandStation-EX.zip)
-[CommandStation-EX.tar.gz](https://github.com/DCC-EX/CommandStation-EX/files/5611335/CommandStation-EX.tar.gz)
-

Release_Notes/release_notes_v3.1.0.md

@@ -1,170 +0,0 @@
-DCC-EX Team is pleased to release CommandStation-EX-v3.1.0 as a Production Release.  Release v3.1.0 is a minor release that adds additional features and fixes a number of bugs. The team is continually improving the architecture of DCC++EX to make it more flexible and optimizing the code so as to get more perfromance from the Arduino microprocessors.  This release includes  all of the Point Releases from v3.0.1 to v3.0.12.
-
-- **Wi-Fi** - works, but can be challenging to use if you want to switch between AP mode and STA station mode.
-- **Pololu Motor Shield** - is supported with this release, but the user may have to play around with some timings to enable programming mode due to limitation in its current sensing circuitry
-
-#### Summary of key features and/or bug fixes by Point Release
-
-**Summary of the key new features added to CommandStation-EX V3.0.12**
-
-- Fixed clear screen issue for nanoEvery and nanoWifi
-
-**Summary of the key new features added to CommandStation-EX V3.0.11**
-
-- Reorganized files for support of 128 speed steps
-
-**Summary of the key new features added to CommandStation-EX V3.0.10**
-
-- Includes support for the Arduino Teensy
-- No functional change just changes to avoid complier warnings for Teensy/nanoEvery
-
-**Summary of the key new features added to CommandStation-EX V3.0.9**
-
-- Rearranges serial newlines for the benefit of JMRI
-
-**Summary of the key new features added to CommandStation-EX V3.0.8**
-
-- Wraps <* *> around DIAGS for the benefit of JMRI
-
-**Summary of the key new features added to CommandStation-EX V3.0.7**
-
-- Implemented support for older 28 apeed step decoders - Option to turn on 28 step speed decoders in addition to 128. If set, all locos will use 28 steps.
-- Improved overload messages with raw values (relative to offset)
-
-**Summary of the key new features added to CommandStation-EX V3.0.6**
-
-- Prevent compiler warning about deprecated B constants
-- Fix Bug that did not let us transmit 5 byte sized packets - 5 Byte commands like PoM (programming on main) were not being sent correctly
-- Support for Huge function numbers (DCC BinaryStateControl) - Support Functions beyond F28
-- <!> ESTOP all - New command to emergency stop all locos on the main track
-- <- [cab]> estop and forget cab/all cabs - Stop and remove loco from the CS. Stops the repeating throttle messages
-- `<D RESET>` command to reboot Arduino
-- Automatic sensor offset detect
-- Improved startup msgs from Motor Drivers (accuracy and auto sense factors)
-- Drop post-write verify - No need to double check CV writes. Writes are now even faster.
-- Allow current sense pin set to UNUSED_PIN - No need to ground an unused analog current pin. Produce startup warning and callback -2 for prog track cmds.
-
-**Summary of the key new features added to CommandStation-EX V3.0.5**
-
-- Fix Fn Key startup with loco ID and fix state change for F16-28
-- Removed ethernet mac config and made it automatic
-- Show wifi ip and port on lcd
-- Auto load config.example.h with warning
-- Dropped example .ino files
-- Corrected .ino comments
-- Pololu fault pin handling
-- Waveform speed/simplicity improvements
-- Improved pin speed in waveform
-- Portability to nanoEvery and UnoWifiRev2 CPUs
-- Analog read speed improvements
-- Drop need for DIO2 library
-- Improved current check code
-- Linear command
-- Removed need for ArduinoTimers files
-- Removed option to choose different timer
-- Added EX-RAIL hooks for later
-- Fixed Turnout list
-- Allow command keywords in mixed case
-- Dropped unused memstream
-- PWM pin accuracy if requirements met
-
-**Summary of the key new features added to CommandStation-EX V3.0.4**
-
-- "Drive-Away" Feature - added so that throttles like Engine Driver can allow a loco to be programmed on a usable, electrically isolated programming track and then drive off onto the main track
-- WiFi Startup Fixes
-
-**Summary of the key new features added to CommandStation-EX V3.0.3**
-
-- Command to write loco address and clear consist
-- Command will allow for consist address
-- Startup commands implemented
-
-**Summary of the key new features added to CommandStation-EX V3.0.2:**
-
-- Create new output for current in mA for `<c>` command - New current response outputs current in mA, overlimit current, and maximum board capable current
-- Simultaneously update JMRI to handle new current meter
-
-**Summary of the key new features added to CommandStation-EX V3.0.1:**
-
-- Add back fix for jitter
-- Add Turnouts, Outputs and Sensors to `<s>` command output
-
-**CommandStation-EX V3.0.0:**
-
-**Release v3.0.0 was a major rewrite if earlier versions of DCC++.  The code base was re-architeced and core changes were made to the Waveform generator to reduce overhead and make better use of Arduino.** **Summary of the key new features added in Release v3.0.0 include:**
-
-- **New USB Browser Based Throttle** - WebThrottle-EX is a full front-end to controller to control the CS to run trains.
-- **WiFi Support** - AP and station modes supported. Auto-detection of an ESP8266 WiFi module with AT firmware on a Mega's serial port. Connection to JMRI and WiThrottle clients.
-- **Withrottle Integrations** - Act as a host for up to four WiThrottle clients concurrently.
-- **Add LCD/OLED support** - OLED supported on Mega only
-- **Improved CV programming routines** - checks for length of CV pulse, and breaks out of the wait state once it has received an ACK, now reading one CV per second.
-- **Improved current sensing** - rewrote current sensing routines for safer operation. Current thresholds based on milliamps, not magic numbers
-- **Individual track power control** - Ability to toggle power on either or both tracks, and to "JOIN" the tracks and make them output the same waveform for multiple power districts.
-- **Single or Dual-Pin PWM output** - Allows control of H-bridges with PH/EN or dual PWM inputs
-- **New, simpler function command** - `<F>` command allows setting functions based on their number, not based on a code as in `<f>`
-- **Function reminders** - Function reminders are sent in addition to speed reminders
-- **Functions to F28** - All NMRA functions are now supported
-- **Filters and user functions** - Ability to filter commands in the parser and execute custom code based on them. (ex: Redirect Turnout commands via NRF24)
-- **Diagnostic `<D>` commands** - See documentation for a full list of new diagnostic commands
-- **Rewrote DCC++ Parser** - more efficient operation, accepts multi-char input and uses less RAM
-- **Rewritten waveform generator** - capable of using any pin for DCC waveform out, eliminating the need for jumpers
-- **Rewritten packet generator** - Simplify and make smaller, remove idea of "registers" from original code
-- **Add free RAM messages** - Free RAM messages are now printed whenever there is a decerase in available RAM
-- **Fix EEPROM bugs**
-- **Number of locos discovery command** - `<#>` command
-- **Support for more locomotives** - 20 locomotives on an UNO and 50 an a Mega.
-- **Automatic slot managment** - slot variable in throttle/function commands are ignored and slot management is taken care of automatically. `<!>` command added to release locos from memory.
-
-**Key Contributors**
-
-**Project Lead**
-
-- Fred Decker - Holly Springs, North Carolina, USA (FlightRisk)
-
-**CommandStation-EX Developers**
-
-- Chris Harlow - Bournemouth, UK (UKBloke)
-- Harald Barth - Stockholm, Sweden (Haba)
-- Neil McKechnie - Worcestershire, UK (NeilMck)
-- Fred Decker - Holly Springs, North Carolina, USA (FlightRisk)
-- Dave Cutting - Logan, Utah, USA (Dave Cutting/ David Cutting)
-- M Steve Todd - - Engine Driver and JMRI Interface
-- Scott Catalanno - Pennsylvania
-- Gregor Baues - Île-de-France, France (grbba)
-
-**exInstaller Software**
-
-- Anthony W - Dayton, Ohio, USA (Dex, Dex++)
-
-**Website and Documentation**
-
-- Mani Kumar - Bangalor, India (Mani / Mani Kumar)
-- Fred Decker - Holly Springs, North Carolina, USA (FlightRisk)
-- Dave Cutting - Logan, Utah, USA (Dave Cutting/ David Cutting)
-- Roger Beschizza - Dorset, UK (Roger Beschizza)
-- Keith Ledbetter - Chicago, Illinois, USA (Keith Ledbetter)
-- Kevin Smith - (KCSmith)
-
-**WebThrotle-EX**
-
-- Fred Decker - Holly Springs, NC (FlightRisk/FrightRisk)
-- Mani Kumar - Bangalor, India (Mani /Mani Kumar)
-- Matt H - Somewhere in Europe
-
-**Beta Testing / Release Management / Support**
-
-- Larry Dribin - Release Management
-- Keith Ledbetter
-- BradVan der Elst
-- Andrew Pye
-- Mike Bowers
-- Randy McKenzie
-- Roberto Bravin
-- Sim Brigden
-- Alan Lautenslager
-- Martin Bafver
-- Mário André Silva
-- Anthony Kochevar
-- Gajanatha Kobbekaduwe
-- Sumner Patterson
-- Paul - Virginia, USA

RingStream.cpp

@@ -75,15 +75,9 @@ void RingStream::mark(uint8_t b) {
     _count=0;
 }
 
-// peekTargetMark is used by the parser stash routines to know which client
-// to send a callback response to some time later. 
-uint8_t RingStream::peekTargetMark() {
-  return _buffer[_mark];
-}
-
 bool RingStream::commit() {
   if (_overflow) {
-        DIAG(F("RingStream(%d) commit(%d) OVERFLOW"),_len, _count);
+        DIAG(F("\nRingStream(%d) commit(%d) OVERFLOW\n"),_len, _count);
         // just throw it away 
         _pos_write=_mark;
         _overflow=false;

RingStream.h

@@ -33,8 +33,7 @@ class RingStream : public Print {
     int freeSpace();
     void mark(uint8_t b);
     bool commit();
-    uint8_t peekTargetMark();
-    
+
  private:
    int _len;
    int _pos_write;

SSD1306Ascii.cpp

@@ -1,108 +0,0 @@
-/* Based on Arduino SSD1306Ascii Library, Copyright (C) 2015 by William Greiman
- * Modifications (C) 2021 Neil McKechnie
- *
- * This Library 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.
- *
- * This Library 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 the Arduino SSD1306Ascii Library.  If not, see
- * <http://www.gnu.org/licenses/>.
- */
-#include "SSD1306Ascii.h"
-#include "I2CManager.h"
-#include "FSH.h"
-
-
-// Maximum number of bytes we can send per transmission is 32.
-const uint8_t SSD1306AsciiWire::blankPixels[16] = 
-  {0x40,        // First byte specifies data mode
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};  
-
-//==============================================================================
-// SSD1306AsciiWire Method Definitions
-//------------------------------------------------------------------------------
-void SSD1306AsciiWire::clear() {
-  clear(0, displayWidth() - 1, 0, displayRows() - 1);
-}
-//------------------------------------------------------------------------------
-void SSD1306AsciiWire::clear(uint8_t columnStart, uint8_t columnEnd, 
-                             uint8_t rowStart, uint8_t rowEnd) {
-  const int maxBytes = sizeof(blankPixels);  // max number of bytes sendable over Wire
-  // Ensure only rows on display will be cleared.
-  if (rowEnd >= displayRows()) rowEnd = displayRows() - 1;
-  for (uint8_t r = rowStart; r <= rowEnd; r++) {
-    setCursor(columnStart, r);   // Position at start of row to be erased
-    for (uint8_t c = columnStart; c <= columnEnd; c += maxBytes-1) {
-      uint8_t len = min((uint8_t)(columnEnd-c+1), maxBytes-1) + 1;
-      I2CManager.write(m_i2cAddr, blankPixels, len);  // Write up to 15 blank columns
-    }
-  }
-}
-//------------------------------------------------------------------------------
-void SSD1306AsciiWire::begin(const DevType* dev, uint8_t i2cAddr) {
-  m_i2cAddr = i2cAddr;
-  m_col = 0;
-  m_row = 0;
-#ifdef __AVR__
-  const uint8_t* table = (const uint8_t*)pgm_read_word(&dev->initcmds);
-#else   // __AVR__
-  const uint8_t* table = dev->initcmds;
-#endif  // __AVR
-  uint8_t size = readFontByte(&dev->initSize);
-  m_displayWidth = readFontByte(&dev->lcdWidth);
-  m_displayHeight = readFontByte(&dev->lcdHeight);
-  m_colOffset = readFontByte(&dev->colOffset);
-  I2CManager.write_P(m_i2cAddr, table, size);
-}
-//------------------------------------------------------------------------------
-void SSD1306AsciiWire::setContrast(uint8_t value) {
-  I2CManager.write(m_i2cAddr, 2, 
-    0x00,     // Set to command mode
-    SSD1306_SETCONTRAST, value);
-}
-//------------------------------------------------------------------------------
-void SSD1306AsciiWire::setCursor(uint8_t col, uint8_t row) {
-  if (row < displayRows() && col < m_displayWidth) {
-    m_row = row;
-    m_col = col + m_colOffset;
-    I2CManager.write(m_i2cAddr, 4,
-      0x00,    // Set to command mode
-      SSD1306_SETLOWCOLUMN | (col & 0XF), 
-      SSD1306_SETHIGHCOLUMN | (col >> 4),
-      SSD1306_SETSTARTPAGE | m_row);
-  }
-}
-//------------------------------------------------------------------------------
-void SSD1306AsciiWire::setFont(const uint8_t* font) {
-  m_font = font;
-  m_fontFirstChar = readFontByte(m_font + FONT_FIRST_CHAR);
-  m_fontCharCount = readFontByte(m_font + FONT_CHAR_COUNT);
-}
-//------------------------------------------------------------------------------
-size_t SSD1306AsciiWire::write(uint8_t ch) {
-  const uint8_t* base = m_font + FONT_WIDTH_TABLE;
-
-  if (ch < m_fontFirstChar || ch >= (m_fontFirstChar + m_fontCharCount))
-    return 0;
-  ch -= m_fontFirstChar;
-  base += fontWidth * ch;
-  uint8_t buffer[1+fontWidth+letterSpacing];
-  buffer[0] = 0x40;     // set SSD1306 controller to data mode
-  uint8_t bufferPos = 1;
-  // Copy character pixel columns
-  for (uint8_t i = 0; i < fontWidth; i++) 
-    buffer[bufferPos++] = readFontByte(base++);
-  // Add blank pixels between letters
-  for (uint8_t i = 0; i < letterSpacing; i++) 
-    buffer[bufferPos++] = 0;
-  // Write the data to I2C display
-  I2CManager.write(m_i2cAddr, buffer, bufferPos);
-  return 1;
-}

SSD1306Ascii.h

@@ -1,97 +0,0 @@
-/* Based on Arduino SSD1306Ascii Library, Copyright (C) 2015 by William Greiman
- * Modifications (C) 2021 Neil McKechnie
- *
- * This Library 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.
- *
- * This Library 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 this software.  If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#ifndef SSD1306Ascii_h
-#define SSD1306Ascii_h
-
-#include "Arduino.h"
-#include "SSD1306font.h"
-#include "SSD1306init.h"
-
-class SSD1306AsciiWire : public Print {
- public:
-  using Print::write;
-  SSD1306AsciiWire() {}
-  // Initialize the display controller.
-  void begin(const DevType* dev, uint8_t i2cAddr);
-  // Clear the display and set the cursor to (0, 0).
-  void clear();
-  // Clear a region of the display.
-  void clear(uint8_t c0, uint8_t c1, uint8_t r0, uint8_t r1);
-  // The current column in pixels.
-  inline uint8_t col() const { return m_col; }
-  // The display hight in pixels.
-  inline uint8_t displayHeight() const { return m_displayHeight; }
-  // The display height in rows with eight pixels to a row.
-  inline uint8_t displayRows() const { return m_displayHeight / 8; }
-  // The display width in pixels.
-  inline uint8_t displayWidth() const { return m_displayWidth; }
-  // Set the cursor position to (0, 0).
-  inline void home() { setCursor(0, 0); }
-  // Initialize the display controller.
-  void init(const DevType* dev);
-  // the current row number with eight pixels to a row.
-  inline uint8_t row() const { return m_row; }
-  /**
-   * @brief Set the display contrast.
-   *
-   * @param[in] value The contrast level in th range 0 to 255.
-   */
-  void setContrast(uint8_t value);
-  /**
-   * @brief Set the cursor position.
-   *
-   * @param[in] col The column number in pixels.
-   * @param[in] row the row number in eight pixel rows.
-   */
-  void setCursor(uint8_t col, uint8_t row);
-  /**
-   * @brief Set the current font.
-   *
-   * @param[in] font Pointer to a font table.
-   */
-  void setFont(const uint8_t* font);
-  /**
-   * @brief Display a character.
-   *
-   * @param[in] c The character to display.
-   * @return one for success else zero.
-   */
-  size_t write(uint8_t c);
-
- private:
-  uint8_t m_col;                    // Cursor column.
-  uint8_t m_row;                    // Cursor RAM row.
-  uint8_t m_displayWidth;           // Display width.
-  uint8_t m_displayHeight;          // Display height.
-  uint8_t m_colOffset;              // Column offset RAM to SEG.
-  const uint8_t* m_font = NULL;     // Current font.
-
-  // Only fixed size 5x7 fonts in a 6x8 cell are supported.
-  const uint8_t fontWidth = 5;
-  const uint8_t fontHeight = 7;
-  const uint8_t letterSpacing = 1;
-  uint8_t m_fontFirstChar;
-  uint8_t m_fontCharCount;
-
-  uint8_t m_i2cAddr;
-
-  static const uint8_t blankPixels[];
-};
-
-#endif  // SSD1306Ascii_h

SSD1306font.h

@@ -1,180 +0,0 @@
-/*
- *
- * System5x7
- *
- *
- * File Name           : System5x7.h
- * Date                : 28 Oct 2008
- * Font size in bytes  : 470
- * Font width          : 5
- * Font height         : 7
- * Font first char     : 32
- * Font last char      : 127
- * Font used chars     : 94
- *
- * The font data are defined as
- *
- * struct _FONT_ {
- *     uint16_t   font_Size_in_Bytes_over_all_included_Size_it_self;
- *     uint8_t    font_Width_in_Pixel_for_fixed_drawing;
- *     uint8_t    font_Height_in_Pixel_for_all_characters;
- *     unit8_t    font_First_Char;
- *     uint8_t    font_Char_Count;
- *
- *     uint8_t    font_Char_Widths[font_Last_Char - font_First_Char +1];
- *                  // for each character the separate width in pixels,
- *                  // characters < 128 have an implicit virtual right empty row
- *
- *     uint8_t    font_data[];
- *                  // bit field of all characters
- */
-
-#ifndef SSD1306font_H
-#define SSD1306font_H
-
-#define SYSTEM5x7_WIDTH 5
-#define SYSTEM5x7_HEIGHT 7
-
-#ifdef __AVR__
-#include <avr/pgmspace.h>
-/** declare a font for AVR. */
-#define GLCDFONTDECL(_n) static const uint8_t __attribute__((progmem)) _n[]
-#define readFontByte(addr) pgm_read_byte(addr)
-#else  // __AVR__
-/** declare a font. */
-#define GLCDFONTDECL(_n) static const uint8_t _n[]
-/** Fake read from flash. */
-#define readFontByte(addr) (*(const unsigned char *)(addr))
-#endif  // __AVR__
-//------------------------------------------------------------------------------
-// Font Indices
-/** No longer used Big Endian length field. Now indicates font type.
- *
- * 00 00 (fixed width font with 1 padding pixel on right and below)
- *
- * 00 01 (fixed width font with no padding pixels)
- */
-#define FONT_LENGTH 0
-/** Maximum character width. */
-#define FONT_WIDTH 2
-/** Font hight in pixels */
-#define FONT_HEIGHT 3
-/** Ascii value of first character */
-#define FONT_FIRST_CHAR 4
-/** count of characters in font. */
-#define FONT_CHAR_COUNT 5
-/** Offset to width table. */
-#define FONT_WIDTH_TABLE 6
-//------------------------------------------------------------------------------
-
-GLCDFONTDECL(System5x7) = {
-    0x0, 0x0,  // size of zero indicates fixed width font,
-    0x05,      // width
-    0x07,      // height
-    0x20,      // first char
-    0x61,      // char count
-
-    // Fixed width; char width table not used !!!!
-
-    // font data
-    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,  // `
-    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
-    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
-
-};
-
-#endif

SSD1306init.h

@@ -1,207 +0,0 @@
-/* Based on Arduino SSD1306Ascii Library, Copyright (C) 2015 by William Greiman
- * Modifications (C) 2021 Neil McKechnie
- *
- * This Library 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.
- *
- * This Library 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 the Arduino SSD1306Ascii Library.  If not, see
- * <http://www.gnu.org/licenses/>.
- */
-/**
- * @file SSD1306init.h
- * @brief Display controller initialization commands.
- */
-#ifndef SSD1306init_h
-#define SSD1306init_h
-//------------------------------------------------------------------------------
-#ifndef __AVR__
-/** Handle AVR flash addressing. */
-#define MEM_TYPE
-#else  // __AVR__
-#define MEM_TYPE __attribute__ ((progmem))
-#endif  // __AVR__
-//------------------------------------------------------------------------------
-/** Set Lower Column Start Address for Page Addressing Mode. */
-#define SSD1306_SETLOWCOLUMN 0x00
-/** Set Higher Column Start Address for Page Addressing Mode. */
-#define SSD1306_SETHIGHCOLUMN 0x10
-/** Set Memory Addressing Mode. */
-#define SSD1306_MEMORYMODE 0x20
-/** Set display RAM display start line register from 0 - 63. */
-#define SSD1306_SETSTARTLINE 0x40
-/** Set Display Contrast to one of 256 steps. */
-#define SSD1306_SETCONTRAST 0x81
-/** Enable or disable charge pump.  Follow with 0X14 enable, 0X10 disable. */
-#define SSD1306_CHARGEPUMP 0x8D
-/** Set Segment Re-map between data column and the segment driver. */
-#define SSD1306_SEGREMAP 0xA0
-/** Resume display from GRAM content. */
-#define SSD1306_DISPLAYALLON_RESUME 0xA4
-/** Force display on regardless of GRAM content. */
-#define SSD1306_DISPLAYALLON 0xA5
-/** Set Normal Display. */
-#define SSD1306_NORMALDISPLAY 0xA6
-/** Set Inverse Display. */
-#define SSD1306_INVERTDISPLAY 0xA7
-/** Set Multiplex Ratio from 16 to 63. */
-#define SSD1306_SETMULTIPLEX 0xA8
-/** Set Display off. */
-#define SSD1306_DISPLAYOFF 0xAE
-/** Set Display on. */
-#define SSD1306_DISPLAYON 0xAF
-/**Set GDDRAM Page Start Address. */
-#define SSD1306_SETSTARTPAGE 0XB0
-/** Set COM output scan direction normal. */
-#define SSD1306_COMSCANINC 0xC0
-/** Set COM output scan direction reversed. */
-#define SSD1306_COMSCANDEC 0xC8
-/** Set Display Offset. */
-#define SSD1306_SETDISPLAYOFFSET 0xD3
-/** Sets COM signals pin configuration to match the OLED panel layout. */
-#define SSD1306_SETCOMPINS 0xDA
-/** This command adjusts the VCOMH regulator output. */
-#define SSD1306_SETVCOMDETECT 0xDB
-/** Set Display Clock Divide Ratio/ Oscillator Frequency. */
-#define SSD1306_SETDISPLAYCLOCKDIV 0xD5
-/** Set Pre-charge Period */
-#define SSD1306_SETPRECHARGE 0xD9
-/** Deactivate scroll */
-#define SSD1306_DEACTIVATE_SCROLL 0x2E
-/** No Operation Command. */
-#define SSD1306_NOP 0XE3
-//------------------------------------------------------------------------------
-/** Set Pump voltage value: (30H~33H) 6.4, 7.4, 8.0 (POR), 9.0. */
-#define SH1106_SET_PUMP_VOLTAGE 0X30
-/** First byte of set charge pump mode */
-#define SH1106_SET_PUMP_MODE 0XAD
-/** Second byte charge pump on. */
-#define SH1106_PUMP_ON 0X8B
-/** Second byte charge pump off. */
-#define SH1106_PUMP_OFF 0X8A
-//------------------------------------------------------------------------------
-/**
- * @struct DevType
- * @brief Device initialization structure.
- */
-struct DevType {
-  /**
-   * Pointer to initialization command bytes.
-   */
-  const uint8_t* initcmds;
-  /**
-   * Number of initialization bytes.
-   */
-  const uint8_t initSize;
-  /**
-   * Width of the diaplay in pixels.
-   */
-  const uint8_t lcdWidth;
-  /**
-   * Height of the display in pixels.
-   */
-  const uint8_t lcdHeight;
-  /**
-   * Column offset RAM to display.  Used to pick start column of SH1106.
-   */
-  const uint8_t colOffset;
-};
-//------------------------------------------------------------------------------
-// this section is based on https://github.com/adafruit/Adafruit_SSD1306
-/** Initialization commands for a 128x32 SSD1306 oled display. */
-static const uint8_t MEM_TYPE Adafruit128x32init[] = {
-    // Init sequence for Adafruit 128x32 OLED module
-    0x00,                              // Set to command mode
-    SSD1306_DISPLAYOFF,
-    SSD1306_SETDISPLAYCLOCKDIV, 0x80,  // the suggested ratio 0x80
-    SSD1306_SETMULTIPLEX, 0x1F,        // ratio 32
-    SSD1306_SETDISPLAYOFFSET, 0x0,     // no offset
-    SSD1306_SETSTARTLINE | 0x0,        // line #0
-    SSD1306_CHARGEPUMP, 0x14,          // internal vcc
-    SSD1306_MEMORYMODE, 0x02,          // page mode
-    SSD1306_SEGREMAP | 0x1,            // column 127 mapped to SEG0
-    SSD1306_COMSCANDEC,                // column scan direction reversed
-    SSD1306_SETCOMPINS, 0x02,          // sequential COM pins, disable remap
-    SSD1306_SETCONTRAST, 0x7F,         // contrast level 127
-    SSD1306_SETPRECHARGE, 0xF1,        // pre-charge period (1, 15)
-    SSD1306_SETVCOMDETECT, 0x40,       // vcomh regulator level
-    SSD1306_DISPLAYALLON_RESUME,
-    SSD1306_NORMALDISPLAY,
-    SSD1306_DISPLAYON
-};
-/** Initialize a 128x32 SSD1306 oled display. */
-static const DevType MEM_TYPE Adafruit128x32 = {
-  Adafruit128x32init,
-  sizeof(Adafruit128x32init),
-  128,
-  32,
-  0
-};
-//------------------------------------------------------------------------------
-// This section is based on https://github.com/adafruit/Adafruit_SSD1306
-/** Initialization commands for a 128x64 SSD1306 oled display. */
-static const uint8_t MEM_TYPE Adafruit128x64init[] = {
-    // Init sequence for Adafruit 128x64 OLED module
-    0x00,                              // Set to command mode
-    SSD1306_DISPLAYOFF,
-    SSD1306_SETDISPLAYCLOCKDIV, 0x80,  // the suggested ratio 0x80
-    SSD1306_SETMULTIPLEX, 0x3F,        // ratio 64
-    SSD1306_SETDISPLAYOFFSET, 0x0,     // no offset
-    SSD1306_SETSTARTLINE | 0x0,        // line #0
-    SSD1306_CHARGEPUMP, 0x14,          // internal vcc
-    SSD1306_MEMORYMODE, 0x02,          // page mode
-    SSD1306_SEGREMAP | 0x1,            // column 127 mapped to SEG0
-    SSD1306_COMSCANDEC,                // column scan direction reversed
-    SSD1306_SETCOMPINS, 0x12,          // alt COM pins, disable remap
-    SSD1306_SETCONTRAST, 0x7F,         // contrast level 127
-    SSD1306_SETPRECHARGE, 0xF1,        // pre-charge period (1, 15)
-    SSD1306_SETVCOMDETECT, 0x40,       // vcomh regulator level
-    SSD1306_DISPLAYALLON_RESUME,
-    SSD1306_NORMALDISPLAY,
-    SSD1306_DISPLAYON
-};
-/** Initialize a 128x64 oled display. */
-static const DevType MEM_TYPE Adafruit128x64 = {
-  Adafruit128x64init,
-  sizeof(Adafruit128x64init),
-  128,
-  64,
-  0
-};
-//------------------------------------------------------------------------------
-// This section is based on https://github.com/stanleyhuangyc/MultiLCD
-/** Initialization commands for a 128x64 SH1106 oled display. */
-static const uint8_t MEM_TYPE SH1106_128x64init[] = {
-  0x00,                                  // Set to command mode
-  SSD1306_DISPLAYOFF,
-  SSD1306_SETSTARTPAGE | 0X0,            // set page address
-  SSD1306_SETCONTRAST, 0x80,             // 128
-  SSD1306_SEGREMAP | 0X1,                // set segment remap
-  SSD1306_NORMALDISPLAY,                 // normal / reverse
-  SSD1306_SETMULTIPLEX, 0x3F,            // ratio 64
-  SH1106_SET_PUMP_MODE, SH1106_PUMP_ON,  // set charge pump enable
-  SH1106_SET_PUMP_VOLTAGE | 0X2,         // 8.0 volts
-  SSD1306_COMSCANDEC,                    // Com scan direction
-  SSD1306_SETDISPLAYOFFSET, 0X00,        // set display offset
-  SSD1306_SETDISPLAYCLOCKDIV, 0X80,      // set osc division
-  SSD1306_SETPRECHARGE, 0X1F,            // set pre-charge period
-  SSD1306_SETCOMPINS, 0X12,              // set COM pins
-  SSD1306_SETVCOMDETECT,  0x40,          // set vcomh
-  SSD1306_DISPLAYON
-};
-/** Initialize a 128x64 oled SH1106 display. */
-static const DevType MEM_TYPE SH1106_128x64 =  {
-  SH1106_128x64init,
-  sizeof(SH1106_128x64init),
-  128,
-  64,
-  2    // SH1106 is a 132x64 controller.  Use middle 128 columns.
-};
-#endif  // SSD1306init_h

Sensors.cpp

@@ -101,7 +101,7 @@ void Sensor::checkAll(Print *stream){
     // make the change
     readingSensor->active = !sensorstate;
     readingSensor->latchdelay=0; // reset 
-    if (stream != NULL) StringFormatter::send(stream, F("<%c %d>\n"), readingSensor->active ? 'Q' : 'q', readingSensor->data.snum);
+    if (stream != NULL) StringFormatter::send(stream, F("<%c %d>"), readingSensor->active ? 'Q' : 'q', readingSensor->data.snum);
   }
 
   readingSensor=readingSensor->nextSensor;
@@ -117,7 +117,7 @@ void Sensor::printAll(Print *stream){
 
   for(Sensor * tt=firstSensor;tt!=NULL;tt=tt->nextSensor){
     if (stream != NULL)
-      StringFormatter::send(stream, F("<%c %d>\n"), tt->active ? 'Q' : 'q', tt->data.snum);
+      StringFormatter::send(stream, F("<%c %d>"), tt->active ? 'Q' : 'q', tt->data.snum);
   } // loop over all sensors
 } // Sensor::printAll
 

StringFormatter.cpp

@@ -34,26 +34,23 @@ bool Diag::CMD=false;
 bool Diag::WIFI=false;
 bool Diag::WITHROTTLE=false;
 bool Diag::ETHERNET=false;
-bool Diag::LCN=false;
 
  
 void StringFormatter::diag( const FSH* input...) {
-  if (!diagSerial) return; 
-  diagSerial->print(F("<* "));   
+  if (!diagSerial) return;    
   va_list args;
   va_start(args, input);
   send2(diagSerial,input,args);
-  diagSerial->print(F(" *>\n"));
 }
 
 void StringFormatter::lcd(byte row, const FSH* input...) {
   va_list args;
 
   // Issue the LCD as a diag first
-  send(diagSerial,F("<* LCD%d:"),row);
+  diag(F("\nLCD%d:"),row);
   va_start(args, input);
   send2(diagSerial,input,args);
-  send(diagSerial,F(" *>\n"));
+  diag(F("\n"));
   
   if (!LCDDisplay::lcdDisplay) return;
   LCDDisplay::lcdDisplay->setRow(row);    

StringFormatter.h

@@ -33,7 +33,6 @@ class Diag {
   static bool WIFI;
   static bool WITHROTTLE;
   static bool ETHERNET;
-  static bool LCN;
   
 };
 

Turnouts.cpp

@@ -29,16 +29,17 @@
 // print all turnout states to stream
 void Turnout::printAll(Print *stream){
   for (Turnout *tt = Turnout::firstTurnout; tt != NULL; tt = tt->nextTurnout)
-    StringFormatter::send(stream, F("<H %d %d>\n"), tt->data.id, (tt->data.tStatus & STATUS_ACTIVE)!=0);
+    StringFormatter::send(stream, F("<H %d %d>"), tt->data.id, (tt->data.tStatus & STATUS_ACTIVE)!=0);
 } // Turnout::printAll
 
 bool Turnout::activate(int n,bool state){
 #ifdef EESTOREDEBUG
-  DIAG(F("Turnout::activate(%d,%d)"),n,state);
+  DIAG(F("\nTurnout::activate(%d,%d)\n"),n,state);
 #endif
   Turnout * tt=get(n);
   if (tt==NULL) return false;
   tt->activate(state);
+  EEStore::store();
   turnoutlistHash++;
   return true;
 }
@@ -52,13 +53,8 @@ bool Turnout::isActive(int n){
 // activate is virtual here so that it can be overridden by a non-DCC turnout mechanism
 void Turnout::activate(bool state) {
 #ifdef EESTOREDEBUG
-  DIAG(F("Turnout::activate(%d)"),state);
+  DIAG(F("\nTurnout::activate(%d)\n"),state);
 #endif
-  if (data.address==LCN_TURNOUT_ADDRESS) {
-     // A LCN turnout is transmitted to the LCN master.
-     LCN::send('T',data.id,state);
-     return;   // The tStatus will be updated by a message from the LCN master, later.    
-  }
   if (state)
     data.tStatus|=STATUS_ACTIVE;
   else
@@ -67,9 +63,7 @@ void Turnout::activate(bool state) {
     PWMServoDriver::setServo(data.tStatus & STATUS_PWMPIN, (data.inactiveAngle+(state?data.moveAngle:0)));
   else
     DCC::setAccessory(data.address,data.subAddress, state);
-  // Save state if stored in EEPROM
-  if (EEStore::eeStore->data.nTurnouts > 0 && num > 0) 
-    EEPROM.put(num, data.tStatus);
+  EEStore::store();
 }
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -108,7 +102,6 @@ void Turnout::load(){
     if (data.tStatus & STATUS_PWM) tt=create(data.id,data.tStatus & STATUS_PWMPIN, data.inactiveAngle,data.moveAngle);
     else tt=create(data.id,data.address,data.subAddress);
     tt->data.tStatus=data.tStatus;
-    tt->num=EEStore::pointer()+offsetof(TurnoutData,tStatus); // Save pointer to status byte within EEPROM
     EEStore::advance(sizeof(tt->data));
 #ifdef EESTOREDEBUG
     tt->print(tt);
@@ -128,7 +121,6 @@ void Turnout::store(){
 #ifdef EESTOREDEBUG
     tt->print(tt);
 #endif
-    tt->num=EEStore::pointer()+offsetof(TurnoutData,tStatus); // Save pointer to tstatus byte within EEPROM
     EEPROM.put(EEStore::pointer(),tt->data);
     EEStore::advance(sizeof(tt->data));
     tt=tt->nextTurnout;
@@ -173,9 +165,9 @@ Turnout *Turnout::create(int id){
 #ifdef EESTOREDEBUG
 void Turnout::print(Turnout *tt) {
     if (tt->data.tStatus & STATUS_PWM )
-      DIAG(F("Turnout %d ZeroAngle %d MoveAngle %d Status %d"),tt->data.id, tt->data.inactiveAngle, tt->data.moveAngle,tt->data.tStatus & STATUS_ACTIVE);
+      DIAG(F("Turnout %d ZeroAngle %d MoveAngle %d Status %d\n"),tt->data.id, tt->data.inactiveAngle, tt->data.moveAngle,tt->data.tStatus & STATUS_ACTIVE);
     else
-	DIAG(F("Turnout %d Addr %d Subaddr %d Status %d"),tt->data.id, tt->data.address, tt->data.subAddress,tt->data.tStatus & STATUS_ACTIVE);
+	DIAG(F("Turnout %d Addr %d Subaddr %d Status %d\n"),tt->data.id, tt->data.address, tt->data.subAddress,tt->data.tStatus & STATUS_ACTIVE);
 }
 #endif
 

Turnouts.h

@@ -21,12 +21,11 @@
 
 #include <Arduino.h>
 #include "DCC.h"
-#include "LCN.h"
 
 const byte STATUS_ACTIVE=0x80; // Flag as activated
 const byte STATUS_PWM=0x40; // Flag as a PWM turnout
 const byte STATUS_PWMPIN=0x3F; // PWM  pin 0-63
-const int  LCN_TURNOUT_ADDRESS=-1;  // spoof dcc address -1 indicates a LCN turnout
+
 struct TurnoutData {
    int id;
    uint8_t tStatus; // has STATUS_ACTIVE, STATUS_PWM, STATUS_PWMPIN  
@@ -54,8 +53,6 @@ class Turnout {
 #ifdef EESTOREDEBUG
   void print(Turnout *tt);
 #endif
-private:
-  int num;  // EEPROM address of tStatus in TurnoutData struct, or zero if not stored.
 }; // Turnout
   
 #endif

WiThrottle.cpp

@@ -76,7 +76,7 @@ bool WiThrottle::areYouUsingThrottle(int cab) {
  // One instance of WiThrottle per connected client, so we know what the locos are 
  
 WiThrottle::WiThrottle( int wificlientid) {
-   if (Diag::WITHROTTLE) DIAG(F("%l Creating new WiThrottle for client %d"),millis(),wificlientid); 
+   if (Diag::WITHROTTLE) DIAG(F("\n%l Creating new WiThrottle for client %d\n"),millis(),wificlientid); 
    nextThrottle=firstThrottle;
    firstThrottle= this;
    clientid=wificlientid;
@@ -104,7 +104,7 @@ void WiThrottle::parse(RingStream * stream, byte * cmdx) {
   byte * cmd=cmdx;
   
   heartBeat=millis();
-  if (Diag::WITHROTTLE) DIAG(F("%l WiThrottle(%d)<-[%e]"),millis(),clientid,cmd);
+  if (Diag::WITHROTTLE) DIAG(F("\n%l WiThrottle(%d)<-[%e]\n"),millis(),clientid,cmd);
 
   if (initSent) {
     // Send power state if different than last sent
@@ -184,7 +184,7 @@ void WiThrottle::parse(RingStream * stream, byte * cmdx) {
                 StringFormatter::send(stream, F("M%c-%c%d<;>\n"), myLocos[loco].throttle, LorS(myLocos[loco].cab), myLocos[loco].cab);
               }
             }
-            if (Diag::WITHROTTLE) DIAG(F("%l WiThrottle(%d) Quit"),millis(),clientid);
+            if (Diag::WITHROTTLE) DIAG(F("%l WiThrottle(%d) Quit\n"),millis(),clientid);
             delete this; 
             break;           
    }
@@ -207,7 +207,6 @@ int WiThrottle::getLocoId(byte * cmd) {
     if (cmd[0]!='L' && cmd[0]!='S') return 0; // should not match any locos
     return getInt(cmd+1); 
 }
-
 void WiThrottle::multithrottle(RingStream * stream, byte * cmd){ 
           char throttleChar=cmd[1];
           int locoid=getLocoId(cmd+3); // -1 for *
@@ -215,20 +214,9 @@ void WiThrottle::multithrottle(RingStream * stream, byte * cmd){
           while(*aval !=';' && *aval !='\0') aval++;
           if (*aval) aval+=2;  // skip ;>
 
-//       DIAG(F("Multithrottle aval=%c cab=%d"), aval[0],locoid);    
+//       DIAG(F("\nMultithrottle aval=%c cab=%d"), aval[0],locoid);    
        switch(cmd[2]) {
           case '+':  // add loco request
-                if (cmd[3]=='*') { 
-                  // M+* means get loco from prog track, then join tracks ready to drive away
-                  // Stash the things the callback will need later
-                  stashStream= stream;
-                  stashClient=stream->peekTargetMark();
-                  stashThrottleChar=throttleChar;
-                  stashInstance=this;
-                  // ask DCC to call us back when the loco id has been read
-                  DCC::getLocoId(getLocoCallback); // will remove any previous join                    
-                  return; // return nothing in stream as response is sent later in the callback 
-                }
                 //return error if address zero requested
                 if (locoid==0) { 
                   StringFormatter::send(stream, F("HMAddress '0' not supported!\n"), cmd[3] ,locoid);                    
@@ -248,7 +236,7 @@ void WiThrottle::multithrottle(RingStream * stream, byte * cmd){
                     //Get known Fn states from DCC 
                     for(int fKey=0; fKey<=28; fKey++) { 
                       int fstate=DCC::getFn(locoid,fKey);
-                        if (fstate>=0) StringFormatter::send(stream,F("M%cA%c%d<;>F%d%d\n"),throttleChar,cmd[3],locoid,fstate,fKey);                     
+                      if (fstate>=0) StringFormatter::send(stream,F("M%cA%c<;>F%d%d\n"),throttleChar,cmd[3],fstate,fKey);
                     }
                     StringFormatter::send(stream, F("M%cA%c%d<;>V%d\n"), throttleChar, cmd[3], locoid, DCCToWiTSpeed(DCC::getThrottleSpeed(locoid)));
                     StringFormatter::send(stream, F("M%cA%c%d<;>R%d\n"), throttleChar, cmd[3], locoid, DCC::getThrottleDirection(locoid));
@@ -272,7 +260,7 @@ void WiThrottle::multithrottle(RingStream * stream, byte * cmd){
 
 void WiThrottle::locoAction(RingStream * stream, byte* aval, char throttleChar, int cab){
     // Note cab=-1 for all cabs in the consist called throttleChar.  
-//    DIAG(F("Loco Action aval=%c%c throttleChar=%c, cab=%d"), aval[0],aval[1],throttleChar, cab);
+//    DIAG(F("\nLoco Action aval=%c%c throttleChar=%c, cab=%d"), aval[0],aval[1],throttleChar, cab);
      switch (aval[0]) {
            case 'V':  // Vspeed
              { 
@@ -366,10 +354,10 @@ void WiThrottle::loop(RingStream * stream) {
 void WiThrottle::checkHeartbeat() {
   // if eStop time passed... eStop any locos still assigned to this client and then drop the connection
   if(heartBeatEnable && (millis()-heartBeat > ESTOP_SECONDS*1000)) {
-  if (Diag::WITHROTTLE)  DIAG(F("%l WiThrottle(%d) eStop(%ds) timeout, drop connection"), millis(), clientid, ESTOP_SECONDS);
+  if (Diag::WITHROTTLE)  DIAG(F("\n\n%l WiThrottle(%d) eStop(%ds) timeout, drop connection\n"), millis(), clientid, ESTOP_SECONDS);
     LOOPLOCOS('*', -1) { 
       if (myLocos[loco].throttle!='\0') {
-        if (Diag::WITHROTTLE) DIAG(F("%l  eStopping cab %d"),millis(),myLocos[loco].cab);
+        if (Diag::WITHROTTLE) DIAG(F("%l  eStopping cab %d\n"),millis(),myLocos[loco].cab);
         DCC::setThrottle(myLocos[loco].cab, 1, DCC::getThrottleDirection(myLocos[loco].cab)); // speed 1 is eStop
       }
     }
@@ -379,24 +367,4 @@ void WiThrottle::checkHeartbeat() {
 
 char WiThrottle::LorS(int cab) {
     return (cab<127)?'S':'L';
-}
-
-// Drive Away feature. Callback handling
- 
-RingStream * WiThrottle::stashStream;
-WiThrottle * WiThrottle::stashInstance;
-byte         WiThrottle::stashClient;
-char         WiThrottle::stashThrottleChar;
-
-void WiThrottle::getLocoCallback(int16_t locoid) {
-  stashStream->mark(stashClient);
-  if (locoid<0) StringFormatter::send(stashStream,F("HMNo loco found on prog track\n"));
-  else {
-    char addcmd[20]={'M',stashThrottleChar,'+',LorS(locoid) };
-    itoa(locoid,addcmd+4,10);
-    stashInstance->multithrottle(stashStream, (byte *)addcmd);
-    DCCWaveform::progTrack.setPowerMode(POWERMODE::ON);
-    DCC::setProgTrackSyncMain(true);  // <1 JOIN> so we can drive loco away
-  }
-  stashStream->commit();
-}
+} 

WiThrottle.h

@@ -60,14 +60,6 @@ class WiThrottle {
       void multithrottle(RingStream * stream, byte * cmd);
       void locoAction(RingStream * stream, byte* aval, char throttleChar, int cab);
       void accessory(RingStream *, byte* cmd);
-      void checkHeartbeat(); 
-
-       // callback stuff to support prog track acquire
-       static RingStream * stashStream;
-       static WiThrottle * stashInstance;
-       static byte         stashClient;
-       static char         stashThrottleChar;
-       static void         getLocoCallback(int16_t locoid);
-
+      void checkHeartbeat();  
 };
 #endif

WifiInboundHandler.cpp

@@ -64,7 +64,7 @@ void WifiInboundHandler::loop1() {
     
 
     if (pendingCipsend) {
-         if (Diag::WIFI) DIAG( F("WiFi: [[CIPSEND=%d,%d]]"), clientPendingCIPSEND, currentReplySize);
+         if (Diag::WIFI) DIAG( F("\nWiFi: [[CIPSEND=%d,%d]]"), clientPendingCIPSEND, currentReplySize);
          StringFormatter::send(wifiStream, F("AT+CIPSEND=%d,%d\r\n"),  clientPendingCIPSEND, currentReplySize);
          pendingCipsend=false;
          return;
@@ -75,11 +75,11 @@ void WifiInboundHandler::loop1() {
       int clientId=inboundRing->read();
       if (clientId>=0) {
          int count=inboundRing->count();
-         if (Diag::WIFI) DIAG(F("Wifi EXEC: %d %d:"),clientId,count); 
+         if (Diag::WIFI) DIAG(F("\nWifi EXEC: %d %d:"),clientId,count); 
          byte cmd[count+1];
          for (int i=0;i<count;i++) cmd[i]=inboundRing->read();   
          cmd[count]=0;
-         if (Diag::WIFI) DIAG(F("%e"),cmd); 
+         if (Diag::WIFI) DIAG(F("%e\n"),cmd); 
          
          outboundRing->mark(clientId);  // remember start of outbound data 
          CommandDistributor::parse(clientId,cmd,outboundRing);
@@ -193,11 +193,11 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() {
             loopState=ANYTHING;
             break;
           }
-          if (Diag::WIFI) DIAG(F("Wifi inbound data(%d:%d):"),runningClientId,dataLength); 
+          if (Diag::WIFI) DIAG(F("\nWifi inbound data(%d:%d):"),runningClientId,dataLength); 
           if (inboundRing->freeSpace()<=(dataLength+1)) {
             // This input would overflow the inbound ring, ignore it  
             loopState=IPD_IGNORE_DATA;
-            if (Diag::WIFI) DIAG(F("Wifi OVERFLOW IGNORING:"));    
+            if (Diag::WIFI) DIAG(F("\nWifi OVERFLOW IGNORING:"));    
             break;
           }
           inboundRing->mark(runningClientId);
@@ -243,7 +243,7 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() {
 
 void WifiInboundHandler::purgeCurrentCIPSEND() {
          // A CIPSEND was sent but errored... or the client closed just toss it away
-         if (Diag::WIFI) DIAG(F("Wifi: DROPPING CIPSEND=%d,%d"),clientPendingCIPSEND,currentReplySize);
+         if (Diag::WIFI) DIAG(F("Wifi: DROPPING CIPSEND=%d,%d\n"),clientPendingCIPSEND,currentReplySize);
          for (int i=0;i<=currentReplySize;i++) outboundRing->read();
          pendingCipsend=false;  
          clientPendingCIPSEND=-1;

WifiInterface.cpp

@@ -35,9 +35,7 @@ Stream * WifiInterface::wifiStream;
 
 #ifndef WIFI_CONNECT_TIMEOUT
 // Tested how long it takes to FAIL an unknown SSID on firmware 1.7.4.
-// The ES should fail a connect in 15 seconds, we don't want to fail BEFORE that
-// or ot will cause issues with the following commands. 
-#define WIFI_CONNECT_TIMEOUT 16000
+#define WIFI_CONNECT_TIMEOUT 14000
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -72,7 +70,6 @@ bool WifiInterface::setup(long serial_link_speed,
   (void) wifiPassword;
   (void) hostname;
   (void) port;
-  (void) channel;
 #endif  
   
 #if NUM_SERIAL > 0
@@ -118,12 +115,12 @@ wifiSerialState WifiInterface::setup(Stream & setupStream,  const FSH* SSid, con
 
   wifiStream = &setupStream;
 
-  DIAG(F("++ Wifi Setup Try %d ++"), ntry);
+  DIAG(F("\n++ Wifi Setup Try %d ++\n"), ntry);
 
   wifiState = setup2( SSid, password, hostname,  port, channel);
 
   if (wifiState == WIFI_NOAT) {
-      DIAG(F("++ Wifi Setup NO AT ++"));
+      DIAG(F("\n++ Wifi Setup NO AT ++\n"));
       return wifiState;
   }
  
@@ -133,7 +130,7 @@ wifiSerialState WifiInterface::setup(Stream & setupStream,  const FSH* SSid, con
   }
 
     
-  DIAG(F("++ Wifi Setup %S ++"), wifiState == WIFI_CONNECTED ? F("CONNECTED") : F("DISCONNECTED"));
+  DIAG(F("\n++ Wifi Setup %S ++\n"), wifiState == WIFI_CONNECTED ? F("CONNECTED") : F("DISCONNECTED"));
   return wifiState;
 }
 
@@ -153,7 +150,7 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
   //  There may alrerady be a connection with data in the pipeline.
   // If there is, just shortcut the setup and continue to read the data as normal.
   if (checkForOK(200,F("+IPD"), true)) {
-    DIAG(F("Preconfigured Wifi already running with data waiting"));
+    DIAG(F("\nPreconfigured Wifi already running with data waiting\n"));
     return WIFI_CONNECTED; 
   }
 
@@ -169,18 +166,18 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
   checkForOK(2000, true, false);      // Makes this visible on the console
 
 #ifdef DONT_TOUCH_WIFI_CONF
-  DIAG(F("DONT_TOUCH_WIFI_CONF was set: Using existing config"));
+  DIAG(F("\nDONT_TOUCH_WIFI_CONF was set: Using existing config\n"));
 #else
+  StringFormatter::send(wifiStream, F("AT+CWMODE=1\r\n")); // configure as "station" = WiFi client
+  checkForOK(1000, true);                       // Not always OK, sometimes "no change"
+
   // Older ES versions have AT+CWJAP, newer ones have AT+CWJAP_CUR and AT+CWHOSTNAME
-  StringFormatter::send(wifiStream, F("AT+CWJAP_CUR?\r\n"));
-  if (!(checkForOK(2000, true))) {
+  StringFormatter::send(wifiStream, F("AT+CWJAP?\r\n"));
+  if (checkForOK(2000, true)) {
       oldCmd=true;
       while (wifiStream->available()) StringFormatter::printEscape( wifiStream->read()); /// THIS IS A DIAG IN DISGUISE
   }
 
-  StringFormatter::send(wifiStream, F("AT+CWMODE%s=1\r\n"), oldCmd ? "" : "_CUR"); // configure as "station" = WiFi client
-  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) {
@@ -199,40 +196,40 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
   } else {
       // SSID was configured, so we assume station (client) mode.
       if (oldCmd) {
-	      // AT command early version supports CWJAP/CWSAP
-	      StringFormatter::send(wifiStream, F("AT+CWJAP=\"%S\",\"%S\"\r\n"), SSid, password);
-	      ipOK = checkForOK(WIFI_CONNECT_TIMEOUT, true);
+	// AT command early version supports CWJAP/CWSAP
+	StringFormatter::send(wifiStream, F("AT+CWJAP=\"%S\",\"%S\"\r\n"), SSid, password);
+	ipOK = checkForOK(WIFI_CONNECT_TIMEOUT, true);
       } else {
       // later version supports CWJAP_CUR
         StringFormatter::send(wifiStream, F("AT+CWHOSTNAME=\"%S\"\r\n"), hostname); // Set Host name for Wifi Client
-      	checkForOK(2000, true); // dont care if not supported
+	checkForOK(2000, true); // dont care if not supported
       
         StringFormatter::send(wifiStream, F("AT+CWJAP_CUR=\"%S\",\"%S\"\r\n"), SSid, password);
-        ipOK = checkForOK(WIFI_CONNECT_TIMEOUT, true);
+	ipOK = checkForOK(WIFI_CONNECT_TIMEOUT, true);
       }
 
       if (ipOK) {
-	      // But we really only have the ESSID and password correct
+	// But we really only have the ESSID and password correct
         // Let's check for IP (via DHCP)
         ipOK = false;
-        StringFormatter::send(wifiStream, F("AT+CIFSR\r\n"));
-        if (checkForOK(5000, F("+CIFSR:STAIP"), true,false))
-        if (!checkForOK(1000, F("0.0.0.0"), true,false))
-        ipOK = true;
+	StringFormatter::send(wifiStream, F("AT+CIFSR\r\n"));
+	if (checkForOK(5000, F("+CIFSR:STAIP"), true,false))
+	  if (!checkForOK(1000, F("0.0.0.0"), true,false))
+	    ipOK = true;
       }
   }
 
   if (!ipOK) {
     // If we have not managed to get this going in station mode, go for AP mode
 
-  //    StringFormatter::send(wifiStream, F("AT+RST\r\n"));
-  //    checkForOK(1000, true); // Not always OK, sometimes "no change"
+//    StringFormatter::send(wifiStream, F("AT+RST\r\n"));
+//    checkForOK(1000, true); // Not always OK, sometimes "no change"
 
     int i=0;
     do {
       // configure as AccessPoint. Try really hard as this is the
-      // last way out to get any Wifi connectivity. 
-      StringFormatter::send(wifiStream, F("AT+CWMODE%s=2\r\n"), oldCmd ? "" : "_CUR"); 
+      // last way out to get any Wifi connectivity.
+      StringFormatter::send(wifiStream, F("AT+CWMODE=2\r\n")); 
     } while (!checkForOK(1000+i*500, true) && i++<10);
 
     while (wifiStream->available()) StringFormatter::printEscape( wifiStream->read()); /// THIS IS A DIAG IN DISGUISE
@@ -262,12 +259,12 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
                                           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",
+	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)
-	DIAG(F("Warning: Setting AP SSID and password failed"));       // but issue warning
+	DIAG(F("\nWarning: Setting AP SSID and password failed\n"));       // but issue warning
 
     if (!oldCmd) {
       StringFormatter::send(wifiStream, F("AT+CIPRECVMODE=0\r\n"), port); // make sure transfer mode is correct
@@ -306,7 +303,7 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
   }
   // suck up anything after the IP. 
   if (!checkForOK(1000, true, false)) return WIFI_DISCONNECTED;
-  LCD(5,F("PORT=%d"),port);
+  LCD(5,F("PORT=%d\n"),port);
    
   return WIFI_CONNECTED;
 }
@@ -324,7 +321,7 @@ void WifiInterface::ATCommand(const byte * command) {
   command++;
   if (*command=='X') {
      connected = true;
-     DIAG(F("++++++ Wifi Connction forced on ++++++++"));
+     DIAG(F("\n++++++ Wifi Connction forced on ++++++++\n"));
   }
   else {
         StringFormatter::  send(wifiStream, F("AT+%s\r\n"), command);
@@ -341,25 +338,25 @@ bool WifiInterface::checkForOK( const unsigned int timeout,  bool echo, bool esc
 bool WifiInterface::checkForOK( const unsigned int timeout, const FSH * waitfor, bool echo, bool escapeEcho) {
   unsigned long  startTime = millis();
   char *locator = (char *)waitfor;
-  DIAG(F("Wifi Check: [%E]"), waitfor);
+  DIAG(F("\nWifi Check: [%E]"), waitfor);
   while ( millis() - startTime < timeout) {
     while (wifiStream->available()) {
       int ch = wifiStream->read();
       if (echo) {
         if (escapeEcho) StringFormatter::printEscape( ch); /// THIS IS A DIAG IN DISGUISE
-        else StringFormatter::diagSerial->print((char)ch); 
+        else DIAG(F("%c"), ch); 
       }
       if (ch != GETFLASH(locator)) locator = (char *)waitfor;
       if (ch == GETFLASH(locator)) {
         locator++;
         if (!GETFLASH(locator)) {
-          DIAG(F("Found in %dms"), millis() - startTime);
+          DIAG(F("\nFound in %dms"), millis() - startTime);
           return true;
         }
       }
     }
   }
-  DIAG(F("TIMEOUT after %dms"), timeout);
+  DIAG(F("\nTIMEOUT after %dms\n"), timeout);
   return false;
 }
 

config.example.h

@@ -20,12 +20,12 @@ The configuration file for DCC-EX Command Station
 //  POLOLU_MOTOR_SHIELD   : Pololu MC33926 Motor Driver (not recommended for prog track)
 //  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
+//  FIREBOX_MK1S          : The Firebox MK1S    
 //   |
 //   +-----------------------v
 //
 #define MOTOR_SHIELD_TYPE STANDARD_MOTOR_SHIELD
+
 /////////////////////////////////////////////////////////////////////////////////////
 //
 // The IP port to talk to a WIFI or Ethernet shield.
@@ -60,7 +60,7 @@ The configuration file for DCC-EX Command Station
 // is set (recommended), that password will be used for AP mode.
 // The AP mode password must be at least 8 characters long.
 //
-// Your SSID may not contain ``"'' (double quote, ASCII 0x22).
+// Your SSID may not conain ``"'' (double quote, ASCII 0x22).
 #define WIFI_SSID "Your network name"
 //
 // WIFI_PASSWORD is the network password for your home network or if
@@ -72,11 +72,15 @@ The configuration file for DCC-EX Command Station
 // WIFI_HOSTNAME: You probably don't need to change this
 #define WIFI_HOSTNAME "dccex"
 //
-// WIFI_CHANNEL: If the line "#define ENABLE_WIFI true" is uncommented, 
-// WiFi will be enabled (Mega only). The default channel is set to "1" whether
-// 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.
+// WIFI_CHANNEL: 
 #define WIFI_CHANNEL 1
+//
+/////////////////////////////////////////////////////////////////////////////////////
+//
+// Wifi connect timeout in milliseconds. Default is 14000 (14 seconds). You only need
+// to set this if you have an extremely slow Wifi router.
+//
+//#define WIFI_CONNECT_TIMEOUT 14000
 
 /////////////////////////////////////////////////////////////////////////////////////
 //
@@ -105,10 +109,11 @@ The configuration file for DCC-EX Command Station
 // define LCD_DRIVER for I2C LCD address 0x3f,16 cols, 2 rows
 // #define LCD_DRIVER  0x3F,16,2
 
-//OR define OLED_DRIVER width,height in pixels (address auto detected)
-// 128x32 or 128x64 I2C SSD1306-based devices are supported.
-// Also 132x64 I2C SH1106 devices.
+//OR define OLED_DRIVER width,height in pixels (address auto detected) 
+// This will not work on a UNO due to memory constraints
 // #define OLED_DRIVER 128,32
 
 /////////////////////////////////////////////////////////////////////////////////////
-
+//
+// Enable warning as memory gets depleted
+#define ENABLE_FREE_MEM_WARNING false

defines.h

@@ -23,7 +23,7 @@
 // WIFI_ON: All prereqs for running with WIFI are met
 // Note: WIFI_CHANNEL may not exist in early config.h files so is added here if needed.
 
-#if ENABLE_WIFI && (defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560) || defined(ARDUINO_SAMD_ZERO)  || defined(TEENSYDUINO))
+#if ENABLE_WIFI && (defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560) || defined(ARDUINO_SAMD_ZERO))
 #define WIFI_ON true
 #ifndef WIFI_CHANNEL
 #define WIFI_CHANNEL 1
@@ -32,16 +32,12 @@
 #define WIFI_ON false
 #endif
 
-#if ENABLE_ETHERNET && (defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560) || defined(ARDUINO_SAMD_ZERO) || defined(TEENSYDUINO)) 
+#if ENABLE_ETHERNET && (defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560) || defined(ARDUINO_SAMD_ZERO))
 #define ETHERNET_ON true
 #else
 #define ETHERNET_ON false
 #endif
-
-#if WIFI_ON && ETHERNET_ON
- #error Command Station does not support WIFI and ETHERNET at the same time.
-#endif
-  
+ 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // This defines the speed at which the Arduino will communicate with the ESP8266 module.

freeMemory.cpp

@@ -1,6 +1,5 @@
 /*
  *  © 2020, Harald Barth
- *  © 2021, Neil McKechnie
  *  
  *  This file is part of Asbelos DCC-EX
  *
@@ -18,7 +17,6 @@
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <Arduino.h>
 #include "freeMemory.h"
 
 // thanks go to  https://github.com/mpflaga/Arduino-MemoryFree
@@ -32,80 +30,13 @@ extern char *__malloc_heap_start;
 #endif
 
 
-static volatile int minimum_free_memory = __INT_MAX__;
-
-#if !defined(__IMXRT1062__)
-static inline int freeMemory() {
+int freeMemory() {
   char top;
 #if defined(__arm__)
   return &top - reinterpret_cast<char*>(sbrk(0));
 #elif defined(__AVR__)
   return __brkval ? &top - __brkval : &top - __malloc_heap_start;
 #else
-#error bailed out already above
+#error bailed out alredy above
 #endif
 }
-
-// Return low memory value.
-int minimumFreeMemory() {
-  byte sreg_save = SREG;
-  noInterrupts(); // Disable interrupts
-  int retval = minimum_free_memory;
-  SREG = sreg_save; // Restore interrupt state
-  return retval;
-}
-
-#else
-#if defined(ARDUINO_TEENSY40)
-  static const unsigned DTCM_START = 0x20000000UL;
-  static const unsigned OCRAM_START = 0x20200000UL;
-  static const unsigned OCRAM_SIZE = 512;
-  static const unsigned FLASH_SIZE = 1984;
-#elif defined(ARDUINO_TEENSY41)
-  static const unsigned DTCM_START = 0x20000000UL;
-  static const unsigned OCRAM_START = 0x20200000UL;
-  static const unsigned OCRAM_SIZE = 512;
-  static const unsigned FLASH_SIZE = 7936;
-#if TEENSYDUINO>151
-  extern "C" uint8_t external_psram_size;
-#endif
-#endif
-
-static inline int freeMemory() {
-  extern unsigned long _ebss;
-  extern unsigned long _sdata;
-  extern unsigned long _estack;
-  const unsigned DTCM_START = 0x20000000UL;
-  unsigned dtcm = (unsigned)&_estack - DTCM_START;
-  unsigned stackinuse = (unsigned) &_estack -  (unsigned) __builtin_frame_address(0);
-  unsigned varsinuse = (unsigned)&_ebss - (unsigned)&_sdata;
-  unsigned freemem = dtcm - (stackinuse + varsinuse);
-  return freemem;
-}
-
-// Return low memory value.
-int minimumFreeMemory() {
-  //byte sreg_save = SREG;
-  //noInterrupts(); // Disable interrupts
-  int retval = minimum_free_memory;
-  //SREG = sreg_save; // Restore interrupt state
-  return retval;
-}
-#endif
-
-
-// Update low ram level.  Allow for extra bytes to be specified
-// by estimation or inspection, that may be used by other 
-// called subroutines.  Must be called with interrupts disabled.
-// 
-// Although __brkval may go up and down as heap memory is allocated
-// and freed, this function records only the worst case encountered.
-// So even if all of the heap is freed, the reported minimum free 
-// memory will not increase.
-//
-void updateMinimumFreeMemory(unsigned char extraBytes) {
-  int spare = freeMemory()-extraBytes;
-  if (spare < 0) spare = 0;
-  if (spare < minimum_free_memory) minimum_free_memory = spare;
-}
-

freeMemory.h

@@ -1,6 +1,5 @@
 /*
  *  © 2020, Harald Barth
- *  © 2021, Neil McKechnie
  *  
  *  This file is part of DCC-EX
  *
@@ -20,6 +19,5 @@
 
 #ifndef freeMemory_h
 #define freeMemory_h
-void updateMinimumFreeMemory(unsigned char extraBytes=0);
-int minimumFreeMemory();
+int freeMemory();
 #endif

objdump.bat

@@ -12,5 +12,5 @@ ECHO ++++++++++++++++++++++++++++++++++ >>%TMP%\OBJDUMP_%a%.txt
 avr-objdump -x -C %ELF% | find ".bss" | sort /+25 /R >>%TMP%\OBJDUMP_%a%.txt
 ECHO ++++++++++++++++++++++++++++++++++ >>%TMP%\OBJDUMP_%a%.txt
 avr-objdump -D -S %ELF%  >>%TMP%\OBJDUMP_%a%.txt
-%TMP%\OBJDUMP_%a%.txt
+notepad %TMP%\OBJDUMP_%a%.txt
 EXIT

platformio.ini

@@ -33,8 +33,13 @@ board = megaatmega2560
 framework = arduino
 lib_deps = 
 	${env.lib_deps}
+	DIO2
 	arduino-libraries/Ethernet
 	SPI
+	marcoschwartz/LiquidCrystal_I2C
+	Adafruit/Adafruit_BusIO
+	Adafruit/Adafruit_SSD1306
+	Adafruit/Adafruit-GFX-Library
 monitor_speed = 115200
 monitor_flags = --echo
 
@@ -44,8 +49,10 @@ board = uno
 framework = arduino
 lib_deps = 
 	${env.lib_deps}
+	DIO2
 	arduino-libraries/Ethernet
 	SPI
+	marcoschwartz/LiquidCrystal_I2C
 monitor_speed = 115200
 monitor_flags = --echo
 
@@ -55,8 +62,10 @@ board = uno_wifi_rev2
 framework = arduino
 lib_deps = 
 	${env.lib_deps}
+	DIO2
 	arduino-libraries/Ethernet
 	SPI
+	marcoschwartz/LiquidCrystal_I2C
 monitor_speed = 115200
 monitor_flags = --echo
 build_flags = "-DF_CPU=16000000L -DARDUINO=10813 -DARDUINO_AVR_UNO_WIFI_DEV_ED -DARDUINO_ARCH_AVR -DESP_CH_UART -DESP_CH_UART_BR=19200"g
@@ -67,7 +76,9 @@ board = uno
 framework = arduino
 lib_deps = 
 	${env.lib_deps}
+	DIO2
 	arduino-libraries/Ethernet
 	SPI
+	marcoschwartz/LiquidCrystal_I2C
 monitor_speed = 115200
 monitor_flags = --echo

release_notes.md

@@ -1,139 +0,0 @@
-The DCC-EX Team is pleased to release CommandStation-EX-v3.0.0 as a Production Release.  This release is a major re-write of earlier versions.  We've re-architected the code-base so that it can better handle new features going forward.  
-
-**Known Bugs:**
- - **Consisting through JMRI** - currently does not work in this release.  You may use the <M> command to do this manually.
- - **Wi-Fi** - works, but can be challenging to use if you want to switch between AP mode and STA station mode.
- - **Pololu Motor Shield** - is supported with this release, but the user may have to play around with some timings to enable programming mode due to limitation in its current sensing circuitry 
-
-**Summary of the key new features added to CommandStation-EX V3.0.7**
-  - **Support for 28 Speed steps** - Option to turn on 28 step speed decoders in addition to 128. If set, all locos will use 28 steps.
-  - **Improved overload messages with raw values (relative to offset)**
-
-**Summary of the key new features added to CommandStation-EX V3.0.6**
-
- - **Prevent compiler warning about deprecated B constants**
- - **Fix Bug that did not let us transmit 5 byte sized packets** - 5 Byte commands like PoM (programming on main) were not being sent correctly
- - **Huge function numbers (DCC BinaryStateControl)** - Support Functions beyond F28
- - **<!> ESTOP all** - New command to emergency stop all locos on the main track
- - **<- [cab]> estop and forget cab/all cabs** - Stop and remove loco from the CS. Stops the repeating throttle messages
- - **``<D RESET>`` command to reboot arduino**
- - **Automatic sensor offset detect** -
- - **Improved startup msgs from Motor Drivers (accuracy and auto sense factors)** -
- - **Drop post-write verify** - No need to double check CV writes. Writes are now even faster.
- - **Allow current sene pin set to UNUSED_PIN** - No need to ground an unused analog current pin. Produce startup warning and callback -2 for prog track cmds.
-
-**Summary of the key new features added to CommandStation-EX V3.0.5**
- - **Fix Fn Key startup with loco ID and fix state change for F16-28**
- - removed ethernet mac config and made it automatic
- - show wifi ip and port on lcd
- - auto load config.example.h with warningh
- - dropped example .ino files
- - corrected .ino comments 
- - pololu fault pin handling
- - waveform speed/simplicity improvements
- - improved pin speed in waveform 
- - portability to nanoEvery and UnoWifiRev2 CPUs
- - analog read speed improvements
- - drop need for DIO2 library
- - improved current check code
- - linear <a> command
- - removed need for ArduinoTimers files
- - removed <D DCC SLOW> 
- - Removed option to choose different timer
- - Added EX-RAIL hooks for later
- - fixed Turnout list
- - allow command keywords in mixed case
- - dropped unused memstream
- - PWM pin accuracy if requirements met.
-
-**Summary of the key new features added to CommandStation-EX V3.0.4**
- - **"Drive-Away" Feature added so that throttles like Engine Driver can allow a loco to be programmed on a usable, electrically isolated programming track and then drive off onto the main track.
- - **WiFi Startup Fixes**
- 
-**Summary of the key new features added to CommandStation-EX V3.0.3**
- - **<W addr> command to write loco address and clear consist** 
- - **<R> command will allow for consist address**
- - **Startup commands implemented**
- 
-**Summary of the key new features added to CommandStation-EX V3.0.2:**
-- **Create new output for current in mA for ``<c>`` command** - New current response outputs current in mA, overlimit current, and maximum board capable current
-- **Simultaneously update JMRI to handle new current meter**
-
-**Summary of the key new features added to CommandStation-EX V3.0.1:**
- - **Add back fix for jitter**
- - **Add Turnouts, Outputs and Sensors to ```<s>``` command output**
-
- **Summary of the key new features added to CommandStation-EX V3.0.0:**
-
- - **New USB Browser Based Throttle** - WebThrottle-EX is a full front-end to controller to control the CS to run trains.
- - **WiFi Support** - AP and station modes supported. Auto-detection of an ESP8266 WiFi module with AT firmware on a Mega's serial port. Connection to JMRI and WiThrottle clients.
- - **Withrottle Integrations** - Act as a host for up to four WiThrottle clients concurrently. 
- - **Add LCD/OLED support** - OLED supported on Mega only
- - **Improved CV programming routines** - checks for length of CV pulse, and breaks out of the wait state once it has received an ACK, now reading one CV per second.
- - **Improved current sensing** - rewrote current sensing routines for safer operation. Current thresholds based on milliamps, not magic numbers
- - **Individual track power control** - Ability to toggle power on either or both tracks, and to "JOIN" the tracks and make them output the same waveform for multiple power districts.
- - **Single or Dual-Pin PWM output** - Allows control of H-bridges with PH/EN or dual PWM inputs
- - **New, simpler function command** - ```<F>``` command allows setting functions based on their number, not based on a code as in ```<f>```
- - **Function reminders** - Function reminders are sent in addition to speed reminders
- - **Functions to F28** - All NMRA functions are now supported
- - **Filters and user functions** - Ability to filter commands in the parser and execute custom code based on them. (ex: Redirect Turnout commands via NRF24)
- - **Diagnostic ```<D>``` commands** - See documentation for a full list of new diagnostic commands
- - **Rewrote DCC++ Parser** - more efficient operation, accepts multi-char input and uses less RAM
- - **Rewritten waveform generator** - capable of using any pin for DCC waveform out, eliminating the need for jumpers
- - **Rewritten packet generator** - Simplify and make smaller, remove idea of "registers" from original code
- - **Add free RAM messages** - Free RAM messages are now printed whenever there is a decerase in available RAM
- - **Fix EEPROM bugs**
- - **Number of locos discovery command** - ```<#>``` command 
- - **Support for more locomotives** - 20 locomotives on an UNO and 50 an a Mega.
- - **Automatic slot managment** - slot variable in throttle/function commands are ignored and slot management is taken care of automatically. ```<!>``` command added to release locos from memory.
-
-
-**Key Contributors**
-
-**Project Lead**
-- Fred Decker - Holly Springs, North Carolina, USA (FlightRisk)
-
-**CommandStation-EX Developers**
-- Chris Harlow - Bournemouth, UK (UKBloke)
-- Harald Barth - Stockholm, Sweden (Haba)
-- Neil McKechnie - Worcestershire, UK (NeilMck)
-- Fred Decker - Holly Springs, North Carolina, USA (FlightRisk)
-- Dave Cutting - Logan, Utah, USA (Dave Cutting/ David Cutting)
-- M Steve Todd - - Engine Driver and JMRI Interface
-- Scott Catalanno - Pennsylvania
-- Gregor Baues - Île-de-France, France (grbba)
-
-**exInstaller Software**
-- Anthony W - Dayton, Ohio, USA (Dex, Dex++)
-
-**Website and Documentation**
-- Mani Kumar - Bangalor, India (Mani / Mani Kumar)
-- Fred Decker - Holly Springs, North Carolina, USA (FlightRisk)
-- Dave Cutting - Logan, Utah, USA (Dave Cutting/ David Cutting)
-- Roger Beschizza - Dorset, UK (Roger Beschizza)
-- Keith Ledbetter - Chicago, Illinois, USA (Keith Ledbetter)
-- Kevin Smith - (KCSmith)
-
-**WebThrotle-EX**
-- Fred Decker - Holly Springs, NC (FlightRisk/FrightRisk)
-- Mani Kumar - Bangalor, India (Mani /Mani Kumar)
-- Matt H - Somewhere in Europe
-
-
-
-**Beta Testing / Release Management / Support**
-- Larry Dribin	- Release Management
-- Keith Ledbetter	
-- BradVan der Elst	
-- Andrew Pye	
-- Mike Bowers	
-- Randy McKenzie
-- Roberto Bravin
-- Sim Brigden
-- Alan Lautenslager
-- Martin Bafver	
-- Mário André Silva	
-- Anthony Kochevar	
-- Gajanatha Kobbekaduwe	
-- Sumner Patterson 
-- Paul - Virginia, USA

version.h

@@ -3,22 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "3.0.16"
-// 3.0.16 Ignore CV1 bit 7 read rejected by decoder when identifying loco id.  
-// 3.0.15 only send function commands once, not 4 times
-// 3.0.14 gap in ack tolerant fix,  prog track power management over join fix. 
-// 3.0.13 Functions>127 fix
-// 3.0.12 Fix HOSTNAME function for STA mode for WiFi
-// 3.0.11 ?
-// 3.0.11 28 speedstep support
-// 3.0.10 Teensy Support
-// 3.0.9 rearranges serial newlines for the benefit of JMRI.
-// 3.0.8 Includes <* *> wraps around DIAGs for the benefit of JMRI.
-// 3.0.7 Includes merge from assortedBits (many changes) and ACK manager change for lazy decoders
-// 3.0.6 Includes:
-// Fix Bug that did not let us transmit 5 byte sized packets like PoM
-// 3.0.5 Includes:
-// Fix Fn Key startup with loco ID and fix state change for F16-28
+#define VERSION "3.0.4"
 // 3.0.4 Includes:
 // Wifi startup bugfixes
 // 3.0.3 Includes: