5.4.10

.github/workflows/docs.yml

@@ -1,35 +0,0 @@
-name: Docs
-
-on:
-  push:
-    branches:
-      - master-exraildoc
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-
-      - name: Install Requirements
-        run: |
-          python -m pip install --upgrade pip
-          pip3 install -r requirements.txt
-          sudo apt-get install doxygen
-
-      - name: Build Prod docs
-        run: |
-          cd docs
-          make html
-          touch _build/html/.nojekyll
-
-      - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@ba1486788b0490a235422264426c45848eac35c6
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          branch: gh-pages  # The branch the action should deploy to.
-          folder: docs/_build/html  # The folder the action should deploy.

.gitignore

@@ -15,6 +15,3 @@ my*.h
 compile_commands.json
 newcode.txt.old
 UserAddin.txt
-_build
-venv
-.DS_Store

CommandDistributor.cpp

@@ -280,6 +280,9 @@ void  CommandDistributor::broadcastPower() {
     state = '1';
   }
 
+  if (state != '2')
+    broadcastReply(COMMAND_TYPE, F("<p%c>\n"),state);
+
   // additional info about MAIN, PROG and JOIN
   bool main=TrackManager::getMainPower()==POWERMODE::ON;
   bool prog=TrackManager::getProgPower()==POWERMODE::ON;
@@ -288,7 +291,7 @@ void  CommandDistributor::broadcastPower() {
   const FSH * reason=F("");
   if (join) {
     reason = F(" JOIN"); // with space at start so we can append without space
-    broadcastReply(COMMAND_TYPE, F("<p1 %S>\n"),reason);
+    broadcastReply(COMMAND_TYPE, F("<p1%S>\n"),reason);
   } else {
     if (main) {
       //reason = F("MAIN");
@@ -299,9 +302,6 @@ void  CommandDistributor::broadcastPower() {
       broadcastReply(COMMAND_TYPE, F("<p1 PROG>\n"));
     }
   }
-
-  if (state != '2')
-    broadcastReply(COMMAND_TYPE, F("<p%c>\n"),state);
 #ifdef CD_HANDLE_RING
   // send '1' if all main are on, otherwise global state (which in that case is '0' or '2')
   broadcastReply(WITHROTTLE_TYPE, F("PPA%c\n"), main?'1': state);

DCC.cpp

@@ -523,6 +523,7 @@ const ackOp FLASH LOCO_ID_PROG[] = {
       V0, WACK, MERGE,
       V0, WACK, MERGE,
       VB, WACK, NAKSKIP, // bad read of cv20, assume its 0 
+      BAD20SKIP,     // detect invalid cv20 value and ignore 
       STASHLOCOID,   // keep cv 20 until we have cv19 as well.
       SETCV, (ackOp)19, 
       STARTMERGE,           // Setup to read cv 19
@@ -628,7 +629,9 @@ const ackOp FLASH CONSIST_ID_PROG[] = {
       BASELINE,
       SETCV,(ackOp)20,
       SETBYTEH,    // high byte to CV 20
-      WB,WACK,     // ignore dedcoder without cv20 support
+      WB,WACK,ITSKIP,
+      FAIL_IF_NONZERO_NAK, // fail if writing long address to decoder that cant support it
+      SKIPTARGET,
       SETCV,(ackOp)19,
       SETBYTEL,   // low byte of word
       WB,WACK,ITC1,   // If ACK, we are done - callback(1) means Ok
@@ -759,7 +762,15 @@ void DCC::issueReminders() {
   if (!DCCWaveform::mainTrack.isReminderWindowOpen()) return;
   // Move to next loco slot.  If occupied, send a reminder.
   int reg = lastLocoReminder+1;
-  if (reg > highestUsedReg) reg = 0;  // Go to start of table
+  if (reg > highestUsedReg) {
+    if (loopStatus == 0 /*only needed if numLocos == 1 but we do not have a counter*/) {
+      // insert idle packet in the speed packet loop to fullfill the *censored*
+      // >5ms between packets to same decoder rule
+      const byte idlepacket[] = {0xFF, 0x00};
+      DCCWaveform::mainTrack.schedulePacket(idlepacket, 2, 0);
+    }
+    reg = 0;  // Go to start of table
+  }
   if (speedTable[reg].loco > 0) {
     // have found loco to remind
     if (issueReminder(reg))
@@ -780,40 +791,23 @@ bool DCC::issueReminder(int reg) {
          break;
        case 1: // remind function group 1 (F0-F4)
           if (flags & FN_GROUP_1)
-#ifndef DISABLE_FUNCTION_REMINDERS
 	    setFunctionInternal(loco,0, 128 | ((functions>>1)& 0x0F) | ((functions & 0x01)<<4),0); // 100D DDDD
-#else
-	    setFunctionInternal(loco,0, 128 | ((functions>>1)& 0x0F) | ((functions & 0x01)<<4),2);
-          flags&= ~FN_GROUP_1;  // dont send them again
-#endif
           break;
        case 2: // remind function group 2 F5-F8
           if (flags & FN_GROUP_2)
-#ifndef DISABLE_FUNCTION_REMINDERS
   	    setFunctionInternal(loco,0, 176 | ((functions>>5)& 0x0F),0);                           // 1011 DDDD
-#else
-	    setFunctionInternal(loco,0, 176 | ((functions>>5)& 0x0F),2);
-          flags&= ~FN_GROUP_2;  // dont send them again
-#endif
           break;
        case 3: // remind function group 3 F9-F12
           if (flags & FN_GROUP_3)
-#ifndef DISABLE_FUNCTION_REMINDERS
 	    setFunctionInternal(loco,0, 160 | ((functions>>9)& 0x0F),0);                           // 1010 DDDD
-#else
-	    setFunctionInternal(loco,0, 160 | ((functions>>9)& 0x0F),2);
-          flags&= ~FN_GROUP_3;  // dont send them again
-#endif
           break;
        case 4: // remind function group 4 F13-F20
           if (flags & FN_GROUP_4)
-	    setFunctionInternal(loco,222, ((functions>>13)& 0xFF),2);
-          flags&= ~FN_GROUP_4;  // dont send them again
+	    setFunctionInternal(loco,222, ((functions>>13)& 0xFF),0);
           break;
        case 5: // remind function group 5 F21-F28
           if (flags & FN_GROUP_5)
-	    setFunctionInternal(loco,223, ((functions>>21)& 0xFF),2);
-          flags&= ~FN_GROUP_5;  // dont send them again
+	    setFunctionInternal(loco,223, ((functions>>21)& 0xFF),0);
           break;
       }
       loopStatus++;

DCCACK.cpp

@@ -347,6 +347,20 @@ void DCCACK::loop() {
             opcode=GETFLASH(ackManagerProg);
           }
           break;
+     case BAD20SKIP:
+          if (ackManagerByte > 120) {
+            // skip to SKIPTARGET if cv20 is >120 (some decoders respond with 255)
+            if (Diag::ACK) DIAG(F("XX cv20=%d "),ackManagerByte);
+            while (opcode!=SKIPTARGET) {
+              ackManagerProg++;
+              opcode=GETFLASH(ackManagerProg);
+            }
+          }
+          break; 
+     case FAIL_IF_NONZERO_NAK: // fail if writing long address to decoder that cant support it
+          if (ackManagerByte==0) break;
+          callback(-4);  
+          return;           
      case SKIPTARGET:
           break;
      default:

DCCACK.h

@@ -58,6 +58,8 @@ enum ackOp : byte
   ITSKIP,           // skip to SKIPTARGET if ack true
   NAKSKIP,          // skip to SKIPTARGET if ack false
   COMBINE1920,      // combine cvs 19 and 20 and callback
+  BAD20SKIP,        // skip to SKIPTARGET if cv20 is >120 (some decoders respond with 255) 
+  FAIL_IF_NONZERO_NAK, // fail if writing long address to decoder that cant support it
   SKIPTARGET = 0xFF // jump to target
 };
 

DCCEXParser.cpp

@@ -270,15 +270,19 @@ void DCCEXParser::parse(Print *stream,  byte *com,  RingStream *ringStream) {
   // This function can get stings of the form "<C OMM AND>" or "C OMM AND>"
   // found is true first after the leading "<" has been passed which results
   // in parseOne() getting c="C OMM AND>"
+  byte *cForLater = NULL;
   bool found = (com[0] != '<');
   for (byte *c=com; c[0] != '\0'; c++) {
     if (found) {
-      parseOne(stream, c,  ringStream);
+      cForLater = c;
       found=false;
     }
-    if (c[0] == '<')
+    if (c[0] == '<') {
+      if (cForLater) parseOne(stream, cForLater, ringStream);
       found = true;
+    }
   }
+  if (cForLater) parseOne(stream, cForLater, ringStream);
 }
 
 void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
@@ -1448,6 +1452,7 @@ void DCCEXParser::callback_Wloco(int16_t result)
 
 void DCCEXParser::callback_Wconsist(int16_t result)
 {
+    if (result==-4) DIAG(F("Long Consist %d not supported by decoder"),stashP[1]);
     if (result==1) result=stashP[1]; // pick up original requested id from command
     StringFormatter::send(getAsyncReplyStream(), F("<w CONSIST %d%S>\n"),
      result, stashP[2]=="REVERSE"_hk ? F(" REVERSE") : F(""));

DCCTimerESP.cpp

@@ -78,11 +78,17 @@ int DCCTimer::freeMemory() {
 ////////////////////////////////////////////////////////////////////////
 #ifdef ARDUINO_ARCH_ESP32
 
+#if __has_include("esp_idf_version.h")
 #include "esp_idf_version.h"
-#if ESP_IDF_VERSION_MAJOR > 4
+#endif
+#if ESP_IDF_VERSION_MAJOR == 4
+// all well correct IDF version
+#else
 #error "DCC-EX does not support compiling with IDF version 5.0 or later. Downgrade your ESP32 library to a version that contains IDF version 4. Arduino ESP32 library 3.0.0 is too new. Downgrade to one of 2.0.9 to 2.0.17"
 #endif
 
+// protect all the rest of the code from IDF version 5
+#if ESP_IDF_VERSION_MAJOR == 4
 #include "DIAG.h"
 #include <driver/adc.h>
 #include <soc/sens_reg.h>
@@ -322,5 +328,5 @@ void ADCee::scan() {
 
 void ADCee::begin() {
 }
-
+#endif //IDF v4
 #endif //ESP32

DCCWaveform.cpp

@@ -145,7 +145,7 @@ void DCCWaveform::interrupt2() {
     // As we get to the end of the preambles, open the reminder window.
     // This delays any reminder insertion until the last moment so
     // that the reminder doesn't block a more urgent packet. 
-    reminderWindowOpen=transmitRepeats==0 && remainingPreambles<4 && remainingPreambles>1;
+    reminderWindowOpen=transmitRepeats==0 && remainingPreambles<12 && remainingPreambles>1;
     if (remainingPreambles==1) promotePendingPacket();
     else if (remainingPreambles==10 && isMainTrack && railcomActive) DCCTimer::ackRailcomTimer();
     // Update free memory diagnostic as we don't have anything else to do this time.

EXRAIL2.cpp

@@ -931,8 +931,9 @@ void RMFT2::loop2() {
 
 #ifndef DISABLE_PROG
   case OPCODE_JOIN:
-    TrackManager::setPower(POWERMODE::ON);
     TrackManager::setJoin(true);
+    TrackManager::setMainPower(POWERMODE::ON);
+    TrackManager::setProgPower(POWERMODE::ON);
     break;
 
   case OPCODE_UNJOIN:

TrackManager.cpp

@@ -668,7 +668,8 @@ void TrackManager::setJoin(bool joined) {
       if (track[t]->getMode() & TRACK_MODE_PROG) {       // find PROG track
 	tempProgTrack = t;                               // remember PROG track
 	setTrackMode(t, TRACK_MODE_MAIN);
-	track[t]->setPower(POWERMODE::ON);               // if joined, always on
+	// setPower() of the track called after
+	// seperately after setJoin() instead
 	break;                                           // there is only one prog track, done
       }
     }
@@ -680,8 +681,6 @@ void TrackManager::setJoin(bool joined) {
       setTrackMode(tempProgTrack, TRACK_MODE_PROG);         // set track mode back to prog
       track[tempProgTrack]->setPower(tPTmode);              // set power status as it was before
       tempProgTrack = MAX_TRACKS+1;
-    } else {
-      DIAG(F("Unjoin but no remembered prog track"));
     }
   }
 #endif

WiThrottle.cpp

@@ -500,9 +500,9 @@ void WiThrottle::getLocoCallback(int16_t locoid) {
   char addcmd[20]={'M',stashThrottleChar,'+', addrchar};
   itoa(locoid,addcmd+4,10);
   stashInstance->multithrottle(stashStream, (byte *)addcmd);
+  TrackManager::setJoin(true);          // <1 JOIN> so we can drive loco away
   TrackManager::setMainPower(POWERMODE::ON);
   TrackManager::setProgPower(POWERMODE::ON);
-  TrackManager::setJoin(true);          // <1 JOIN> so we can drive loco away
   DIAG(F("LocoCallback commit success"));
   stashStream->commit();
 }

docs/Makefile

@@ -1,20 +0,0 @@
-# Minimal makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line, and also
-# from the environment for the first two.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-SOURCEDIR     = .
-BUILDDIR      = _build
-
-# Put it first so that "make" without argument is like "make help".
-help:
-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-.PHONY: help Makefile
-
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/_static/css/dccex_theme.css

@@ -1,888 +0,0 @@
-@import url(https://fonts.googleapis.com/css?family=Audiowide);
-@import url(https://fonts.googleapis.com/css?family=Roboto);
-
-h1, .h1 {
-  font-family: Audiowide,Helvetica,Arial,sans-serif !important;
-  font-weight: 500 !important;
-  color: #00353d !important;
-  /* font-size: 200% !important; */
-  font-size: 180% !important;
-  text-shadow: 1px 1px #ffffff78;
-}
-html[data-theme='dark'] h1, .h1 {
-  color: #ffffff !important;
-  text-shadow: 1px 1px #00353d;
-}
-
-h2, .h2 {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  color: #00353d !important;
-  /* font-size: 190% !important; */
-  font-size: 160% !important;
-  text-shadow: 1px 1px #ffffff78;
-}
-html[data-theme='dark'] h2, .h2 {
-  color: #ffffff !important;
-  text-shadow: 1px 1px #00353d;
-}
-html[data-theme='dark'] h2 a, 
-html[data-theme='dark'] h2 a:visited {
-  color: #00a3b9ff !important;
-}
-
-h3, .h3 {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  color: #00353d !important;
-  /* font-size: 160% !important; */
-  font-size: 140% !important;
-  font-style: italic !important;
-  text-shadow: 1px 1px #ffffff78;
-}
-html[data-theme='dark'] h3, .h3 {
-  color: #ffffff !important;
-  text-shadow: 1px 1px #00353d;
-}
-html[data-theme='dark'] h3 a, 
-html[data-theme='dark'] h3 a:visited {
-  color: #00a3b9ff !important;
-}
-h4, .h4 {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  color: #00353d !important;
-  /* font-size: 130% !important; */
-  font-size: 120% !important;
-  text-shadow: 1px 1px #ffffff78;
-}
-html[data-theme='dark'] h4, .h4 {
-  color: #00a3b9ff !important;
-  text-shadow: 1px 1px #00353d;
-}
-html[data-theme='dark'] h4 a, 
-html[data-theme='dark'] h4 a:visited {
-  color: #00a3b9ff !important;
-  text-shadow: 1px 1px #00353d;
-}
-h5, .h5 {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  color: #00a3b9ff !important;
-  /* font-size: 110% !important; */
-  font-size: 100% !important;
-}
-
-h6, .h6 {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  color: #00a3b9ff !important;
-  font-size: 90% !important;
-  font-style: italic !important;
-}
-
-.clearer {
-  clear: both;
-}
-
-.wy-nav-side {
-  background: #031c20 !important;
-  /* background: #031214 !important; */
-}
-
-.caption-text {
-  color: #00a3b9ff !important;
-}
-
-.wy-nav-top {
-  background:#00a3b9ff !important;
-  font-size: 80% !important; 
-}
-
-.wy-nav-top a {
-  font-family: Audiowide,Helvetica,Arial,sans-serif !important;
-  font-weight: 100 !important;
-}
-
-.wy-nav-content {
-  max-width: 1024px;
-}
-
-.wy-breadcrumbs {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  font-size: 80% !important;
-}
-
-.wy-side-nav-search>a img.logo {
-    width: 100%;
-}
-
-.rst-content table.docutils th {
-  background-color: #F3F6F6;
-}
-
-.rst-content table.docutils td {
-  background-color: #F3F6F6;
-}
-
-.rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td {
-  background-color: #E0E0E0;
-}
-html[data-theme='dark'] .rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td {
-  background-color: #ffffff08 !important;
-}
-
-.caption-number {
-  font-size: small !important;
-}
-
-.caption-text {
-  font-size: small !important;
-}
-
-table.intro-table {
-  max-width: 600px;
-}
-
-.intro-table img {
-  width: 70%;
-  height: auto;
-  margin: 5% 15%;
-}
-
-html[data-theme='dark'] .btn-neutral {
-  color: #c1c1c1 !important;
-}
-
-#ex-rail-command-summary .wy-table-responsive {
-  overflow: visible;
-}
-
-/* product titles */
-.ex-prefix {
-  font-weight: bold; 
-  color: #00a3b9; 
-  font-size: 110%;
-}
-.ex-suffix {
-  font-weight: bold; 
-  color: #00353d;
-  font-size: 110%;
-}
-html[data-theme='dark'] .ex-suffix {
-  font-weight: bold; 
-  color: #006979;
-  font-size: 110%;
-}
-
-/* main dcc-ex text only */
-.dccex-prefix {
-  font-family: Audiowide,Helvetica,Arial,sans-serif;
-  font-weight: 600; 
-  color: #00353d;
-  font-size: 110%;
-}
-html[data-theme='dark'] .dccex-prefix {
-  font-family: Audiowide,Helvetica,Arial,sans-serif;
-  font-weight: 600; 
-  color: #006979;
-  font-size: 110%;
-}
-.dccex-suffix {
-  font-family: Audiowide,Helvetica,Arial,sans-serif;
-  font-weight: 600; 
-  color: #00a3b9; 
-  font-size: 110%;
-}
-
-/***************************/
-
-.command-table thead th {
-  text-align: center;
-}
-
-.command-table tbody td {
-  white-space: normal;
-  margin: 10px;
-  padding: 8px 8px 8px 8px !important;
-}
-
-.command-table tbody tr:first-child td p code {
-  white-space: nowrap !important;
-}
-
-.command-table tbody tr td p code {
-  font-size: 110% !important;
-}
-
-.command-table tbody tr td p {
-  font-size: 90% !important;
-}
-
-.command-table tbody tr td ol li p {
-  font-size: 90% !important;
-}
-
-.command-table tbody tr td ol {
-  margin-bottom: 0px !important;
-}
-
-.command-table .category {
-  display: block;
-  text-align: center;
-}
-
-.command-table tr:nth-child(odd) {
-  background-color: #f1f1f1 !important;  
-}
-
-.command-table tr:nth-child(even) {
-  background-color: #f8f8f8 !important;  
-}
-html[data-theme='dark']  .command-table tr:nth-child(even) {
-  background-color: #ffffff08 !important;
-}
-
-.command-table td {
-  background-color: #ffffff00  !important;  
-}
-
-/* html[data-theme='dark'] .rst-content table.docutils tr:nth-child(odd) {
-  background-color: #ffffff08 !important;
-} */
-html[data-theme='dark'] .rst-content table.docutils td, .wy-table-bordered-all td {
-  background-color: #fff40000 !important;
-}
-/* html[data-theme='dark']  .rst-content table.docutils .row-odd {
-  background-color: #36ff0000 !important;
-} */
-
-html[data-theme='dark'] .rst-content table.docutils th {
-  background-color: #36ff0000 !important;
-  color: white !important;
-  font-style: italic !important;;
-  font-weight: 700 !important;;
-}
-
-/* *************************************** */
-
-html[data-theme='dark'] .sd-card {
-  background-color: #0000008a;
-  box-shadow: 0 0.5rem 1rem rgb(32 88 91 / 25%) !important;
-}
-
-
-/* *************************************** */
-
-.dcclink a {
-  background-color: #00a3b9ff;
-  box-shadow: 0 2px 0 #00353dff;
-  color: white !important;
-  padding: 0.5em 0.5em;
-  position: relative;
-  text-decoration: none;
-  text-transform: none;
-  border-radius: 5px;
-}
-
-.dcclink-right a {
-  background-color: #00a3b9ff;
-  box-shadow: 0 2px 0 #00353dff;
-  color: white !important;
-  padding: 0.5em 0.5em;
-  position: relative;
-  text-decoration: none;
-  text-transform: none;
-  border-radius: 10px;
-  float:right;
-  margin: 0px 0px 0px 10px;
-}
-
-.dcclink a:visited {
-  color: whitesmoke !important;
-}
-
-.dcclink a:hover {
-  background-color: darkslategrey;
-  cursor: pointer;
-}
-
-.dcclink a:active {
-  box-shadow: none;
-  top: 5px;
-}
-
-html[data-theme='dark'] .rst-content .guilabel {
-  color: black;
-}
-
-.hr-dashed {
-  margin: -10px 0px -10px 0px; 
-  border-top: 1px dashed #d2dfe3;
-}
-
-.hr-heavy {
-  margin: -10px 0px -10px 0px; 
-  border-top: 5px solid #d2dfe3;
-}
-
-html[data-theme='dark'] .hr-dashed {
-  border-top: 1px dashed #114759;
-}
-
-/* *************************************** */
-
-a.githublink, .githublink a {
-  background-color: #f7b656;
-  box-shadow: 0 2px 0 #00353dff;
-  color: white;
-  padding: 3px 5px 3px 5px;
-  position: relative;
-  font-size: 90% !important;
-  text-decoration: none;
-  text-transform: none;
-  border-radius: 5px;
-}
-
-.githublink-right a {
-  background-color: #f7b656;
-  box-shadow: 0 2px 0 #00353dff;
-  color: white;
-  padding: 3px 5px 3px 5px;
-  position: relative;
-  font-size: 90% !important;
-  text-decoration: none;
-  text-transform: none;
-  border-radius: 10px;
-  float:right;
-  margin: 0px 0px 0px 0px;
-}
-
-.githublink a:visited {
-  color: whitesmoke
-}
-
-.githublink a:hover {
-  background-color: rgb(172, 95, 7);
-  cursor: pointer;
-}
-
-.githublink a:active {
-  box-shadow: none;
-  top: 5px;
-}
-
-/* *************************************** */
-
-svg {
-  max-width: 100%;
-  height: auto;
-}
-
-.responsive-image {
-  max-width: 100%;
-  height: auto;
-}
-
-/* *************************************** */
-
-.warning-float-right {
-  float: right;
-  width: 40%;
-}
-
-.warning-float-right-narrow {
-  float: right;
-  width: 20%;
-}
-
-.warning-float-right-wide {
-  float: right;
-  width: 60%;
-}
-
-.note-float-right {
-  float: right;
-  width: 40%;
-}
-
-.note-float-right-narrow {
-  float: right;
-  width: 20%;
-}
-
-.code-block-float-right {
-  float: right;
-  width: 40%;
-  margin: 0px 0px 0px 24px;
-}
-
-.note {
-  background: #f7fcff !important;
-  clear: none !important;
-}
-html[data-theme='dark'] .note {
-  background: #ffffff24 !important;
-}
-
-.note p.admonition-title {
-  background: #cbe1ef !important;
-}
-html[data-theme='dark'] .note p.admonition-title {
-  background: #256a97 !important;
-}
-
-.tip {
-  background: #eef5f4 !important;
-  clear: none !important;
-}
-html[data-theme='dark'] .tip {
-  background: #ffffff24 !important;
-  clear: none !important;
-}
-
-.tip p.admonition-title {
-  background: #9cd7cb !important;
-}
-html[data-theme='dark'] .tip p.admonition-title {
-  background: #256a97 !important;
-}
-
-.admonition-todo {
-  background: #f9f0e0 !important;
-  clear: none !important;
-}
-html[data-theme='dark'] .admonition-todo {
-  background: #ffffff24 !important;
-  clear: none !important;
-}
-
-.admonition-todo p.admonition-title {
-  background: #f7d1b0 !important;
-}
-html[data-theme='dark'] .admonition-todo p.admonition-title {
-  background: #6d3403 !important;
-}
-
-/* *************************************** */
-
-.menuselection {
-  font-style: italic;
-  font-weight: 700;
-}
-
-/* *************************************** */
-
-.wy-table-responsive {
-    margin-bottom: 12px !important;
-}
-
-/* override table width restrictions */ 
-.table-wrap-text p, .table-grid-homepage p, .table-list-homepage p { 
-  white-space: normal !important; 
-  font-size: 110% !important;
-  line-height: 140% !important;
-}
-
-.table-wrap-text tr:nth-child(odd), .table-grid-homepage tr:nth-child(odd), .table-list-homepage tr:nth-child(odd) {
-  background-color: white !important;  
-  border-style: none !important;
-  border-width:0px !important;
-}
-html[data-theme='dark'] tr:nth-child(odd), .table-grid-homepage tr:nth-child(odd), .table-list-homepage tr:nth-child(odd) {
-  background-color: #ffffff08 !important;
-}
-
-.table-wrap-text tr:nth-child(even), .table-grid-homepage tr:nth-child(even), .table-list-homepage tr:nth-child(even) {
-  background-color: #ffffff00 !important;  
-  border-style: none !important;
-  border-width:0px !important;
-}
-
-.table-wrap-text td {
-  background-color: white !important;  
-  border-style: none !important;
-  border-width:0px !important;
-}
-html[data-theme='dark'] .table-wrap-text td {
-  background-color: ffffff08 !important;  
-}
-
-.table-grid-homepage td, .table-list-homepage td {
-  font-size: 80% !important;
-  color: #666666 !important;
-  vertical-align:top !important;
-  background-color: #ffffff00 !important;  
-  border-style: none !important;
-  border-width: 0px !important;
-}
-
-.table-wrap-text, .table-grid-homepage, .table-list-homepage { 
-  margin-bottom: 24px; 
-  max-width: 100% !important; 
-  overflow: visible !important; 
-  border-style: none !important;
-  border-width: 0px !important;
-} 
-
-@media screen and (max-width: 900px) {
-  .table-grid-homepage {
-    display: none;
-  }
-  .table-list-homepage {
-    display: block;
-  }
-}
-
-@media not screen and (max-width: 900px) {
-  .table-grid-homepage {
-    display: block;
-  }
-  .table-list-homepage {
-    display: none;
-  }
-}
-
-
-.table-wrap-text th p, table-wrap-text-align-top th p { 
-    margin-bottom: unset; 
-} 
-
-/* *************************************** */
-
-.image-min-width-144 {
-  min-width: 144px;
-  height: auto !important;
-}
-
-.image-min-width-72 {
-  min-width: 72px;
-  height: auto !important;
-}
-
-.image-float-right img {
-	float:right;
-}
-
-.image-product-logo-float-right img {
-	float:right;
-}
-
-@media screen and (max-width: 1000px) {
-  .image-product-logo-float-right img {
-    display: none;
-  }
-}
-
-/* *************************************** */
-/* Google search */
-
-.gsc-input-box {
-  border: 0px !important;
-}
-
-.gsib_a input {
-  padding: 5px !important;
-  background-color: #141414 !important;
-  color:white !important;
-}
-
-.gsc-search-button .gsc-search-button-v2 {
-  width: 40px !important;
-  height: 21px !important;
-  padding: 4px 4px !important;
-  background-color: #00a3b9ff !important;
-  border-color: #00a3b9ff !important;
-  border-radius: 5px;
-}
-
-/* .gsc-search-button .gsc-search-button-v2 {
-  width: 0px !important;
-  padding: 7px 7px !important;
-  border-color: #009300 !important;
-  background-color: #009300 !important;
-} */
-
-/* *************************************** */
-
-/* sidebar level 3 bullet points */
-nav#on-this-page ul.simple li ul li p {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  font-size: 80% !important;
-  line-height: 120% !important;
-  margin-bottom: 0px !important;
-}
-
-/* sidebar level 3 bullet points */
-nav#on-this-page ul.simple li ul li {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  line-height: 120% !important;
-  margin-bottom: 0px !important;
-}
-
-/* sidebar level 2 bullet points */
-nav#on-this-page ul.simple li p {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  font-size: 80% !important;
-  line-height: 120% !important;
-  margin-bottom: 0px !important;
-}
-
-/* sidebar level 2 bullet points */
-nav#on-this-page ul.simple li {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  line-height: 120% !important;
-  margin-bottom: 0px !important;
-}
-
-nav#on-this-page ul.simple {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  margin-bottom: 0px !important;
-}
-
-nav#on-this-page p {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  margin-top: 0px !important;
-  margin-bottom: 6px !important;
-}
-
-nav#on-this-page {
-  margin-bottom: 10px !important;
-}
-
-
-/* in-this-section level 3 bullet points */
-nav.in-this-section ul.simple li ul li p {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  font-size: 80% !important;
-  line-height: 120% !important;
-  margin-bottom: 0px !important;
-}
-
-/* in-this-section level 3 bullet points */
-nav.in-this-section ul.simple li ul li {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  line-height: 120% !important;
-  margin-bottom: 0px !important;
-}
-
-/* in-this-section level 2 bullet points */
-nav.in-this-section ul.simple li p {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  font-size: 80% !important;
-  line-height: 120% !important;
-  margin-bottom: 0px !important;
-}
-
-/* in-this-section level 2 bullet points */
-nav.in-this-section ul.simple li {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  line-height: 120% !important;
-  margin-bottom: 0px !important;
-}
-
-nav.in-this-section ul.simple {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  margin-bottom: 0px !important;
-}
-
-nav.in-this-section p {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  font-style: italic;
-  font-size: 90%;
-  margin-top: 0px !important;
-  margin-bottom: 6px !important;
-  margin-left: -30px;
-}
-
-nav.in-this-section {
-  margin-bottom: 20px !important;
-  margin-left: 30px;
-}
-
-
-/* sidebars */
-.rst-content .sidebar {
-  padding: 12px 24px 12px 24px !important;
-  border-radius: 10px;
-}
-
-html[data-theme='dark'] .rst-content .sidebar {
-  background: #000000ff !important;
-  border:#000000ff !important;
-}
-
-.sidebar-title {
-  border-radius: 10px;
-}
-
-html[data-theme='dark'] .sidebar-title {
-  background: #002735 !important;
-}
-
-
-
-
-/* news */
-section#dcc-ex-model-railroading aside p.sidebar-title {	
-  font-size: 110% !important;
-  font-family: Audiowide,Helvetica,Arial,sans-serif !important;
-  font-weight: 500 !important;  
-  color: #00a3b9ff;
-  text-shadow: 1px 1px 0 #00353dff;
-  margin: -24px -24px 12px !important;
-}
-
-/* news */
-p.ablog-post-title {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  font-size: 90% !important;
-  line-height: 130% !important;
-  margin-bottom: 0px !important;
-  font-weight: bold !important;
-}
-
-p.ablog-post-excerpt {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  font-size: 90% !important;
-  line-height: 130% !important;
-  margin-bottom: 0px !important;
-  margin-top: 6px !important;
-}
-
-p.ablog-post-expand {
-  font-family: Roboto,Helvetica,Arial,sans-serif !important;
-  font-size: 80% !important;
-  line-height: 130% !important;
-  margin-bottom: 10px !important;
-  margin-top: 0px !important;
-  margin-left: 20px;
-}
-
-li.ablog-post {
-  list-style-type: none !important;
-  margin: 0px !important;
-}
-
-img.sd-card-img-top {
-  max-width: 30% !important;
-  display: block !important;
-  margin-left: auto !important;
-  margin-right: auto !important;
-  margin-top: 10px;
-  margin-bottom: -5px !important;
-}
-
-.sd-card-header {
-  margin-bottom: -10px !important;
-  margin-top: 10px !important;
-  padding-top: 0px !important;
-  padding-bottom: 0px !important;
-}
-
-.sd-card-header p {
-  line-height: 18px !important;
-}
-
-html[data-theme='dark'] .sd-card-header {
-  border-bottom: 1px solid rgb(255 253 253 / 13%);
-}
-
-.sd-card-body ul li p {
-  margin-bottom: 5px !important;
-}
-
-.sd-card-text {
-  margin: 0 0 12px !important;
-}
-
-/* code */
-.rst-content code {
-  font-size: 100% !important;
-}
-.rst-content code.literal, .rst-content tt.literal {
-  color: #ba2121 !important;
-  font-size: 100% important;
-}
-html[data-theme='dark'] .rst-content code.literal, .rst-content tt.literal {
-  color: #ff6000 !important;
-}
-
-/* general purpose */
-
-.dcc-ex-red {
-  color:red;
-}
-
-.dcc-ex-red-bold {
-  color:red;
-  font-weight: bold !important;
-}
-
-.dcc-ex-red-bold-italic {
-  color:red;
-  font-weight: bold !important;
-  font-style: italic !important;
-}
-
-.dcc-ex-code {
-  color:#ba2121;
-  font-weight: bold !important;
-}
-
-.dcc-ex-text-size-200pct {
-  font-size: 200% !important;
-  line-height: 110% !important;
-}
-
-.dcc-ex-text-size-80pct {
-  font-size: 80% !important;
-}
-
-.dcc-ex-text-size-60pct {
-  font-size: 80% !important;
-}
-
-.new-in-v5 {
-  font-family: Audiowide,Helvetica,Arial,sans-serif;  
-  font-weight: bold; 
-  font-style: italic; 
-  color: #00a3b9; 
-  font-size: 110%; 
-}
-
-html[data-theme='dark'] .new-in-v5 {
-  font-weight: normal; 
-  color: #ffffff; 
-  text-shadow: 0px 0px 10px #00a3b9;
-}
-
-/* *************************************** */
-
-@media not screen and (max-width: 900px) {
-  div.rst-footer-buttons {
-    position: fixed;
-    bottom:5px;
-    width:350px;
-    background: #c9c9c999;
-    padding: 10px; 
-    border-radius: 10px;
-    border-color: white !important;
-    border: 4px solid;
-    transform: translateX(50%);
-  }
-  html[data-theme='dark'] div.rst-footer-buttons {
-    border-color: #141414 !important;
-    background: #c9c9c92e;
-  }
-  footer {
-    padding-bottom: 40px;
-    font-size: 80% !important;
-  }
-}
-
-@media screen and (max-width: 900px) {
-  div.rst-footer-buttons {
-    display:block;
-    font-size: 80% !important;
-  }
-}
-
-html[data-theme='dark'] .rst-content span.descname {
-  color: #dbdd7c !important;
-}

docs/_static/css/sphinx_design_overrides.css

@@ -1,9 +0,0 @@
-/* Override for the sphinx-design extension classes */
-.sd-card-header {	
-  font-size: 110% !important;
-  font-family: Audiowide,Helvetica,Arial,sans-serif !important;
-  font-weight: 500 !important;  
-  color: #00a3b9ff;
-  text-shadow: 1px 1px 0 #00353dff;
-  margin-bottom: .5rem !important;
-}

docs/conf.py

@@ -1,94 +0,0 @@
-# Configuration file for the Sphinx documentation builder.
-#
-# For the full list of built-in configuration values, see the documentation:
-# https://www.sphinx-doc.org/en/master/usage/configuration.html
-
-import os
-import subprocess
-
-# Doxygen
-subprocess.call('doxygen DoxyfileEXRAIL', shell=True)
-
-# -- Project information -----------------------------------------------------
-# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
-
-project = 'EXRAIL Language'
-copyright = '2025 - Peter Cole'
-author = 'Peter Cole'
-
-# -- General configuration ---------------------------------------------------
-# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
-
-extensions = [
-  'sphinx_sitemap',
-  'sphinxcontrib.spelling',
-  'sphinx_rtd_dark_mode',
-  'breathe'
-]
-
-autosectionlabel_prefix_document = True
-
-# Don't make dark mode the user default
-default_dark_mode = False
-
-spelling_lang = 'en_UK'
-tokenizer_lang = 'en_UK'
-spelling_word_list_filename = ['spelling_wordlist.txt']
-
-templates_path = ['_templates']
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
-
-highlight_language = 'c++'
-
-numfig = True
-
-numfig_format = {'figure': 'Figure %s'}
-
-# -- Options for HTML output -------------------------------------------------
-# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
-html_theme = 'sphinx_rtd_theme'
-html_static_path = ['_static']
-
-html_logo = "./_static/images/product-logo-ex-rail.png"
-
-html_favicon = "./_static/images/favicon.ico"
-
-html_theme_options = {
-    'style_nav_header_background': 'white',
-    'logo_only': True,
-    # Toc options
-    'includehidden': True,
-    'titles_only': False,
-    # 'titles_only': True,
-    'collapse_navigation': False,
-    # 'navigation_depth': 3,
-    'navigation_depth': 1,
-    'analytics_id': 'G-L5X0KNBF0W',
-}
-
-html_context = {
-    'display_github': True,
-    'github_user': 'DCC-EX',
-    'github_repo': 'CommandStation-EX',
-    'github_version': 'sphinx/docs/',
-}
-
-html_css_files = [
-    'css/dccex_theme.css',
-    'css/sphinx_design_overrides.css',
-]
-
-html_baseurl = 'https://dcc-ex.com/CommandStation-EX/'
-
-# Sphinx sitemap
-html_extra_path = [
-  'robots.txt',
-]
-
-# -- Breathe configuration -------------------------------------------------
-
-breathe_projects = {
-  "EXRAIL Language": "_build/xml/"
-}
-breathe_default_project = "EXRAIL Language"
-breathe_default_members = ()

docs/index.rst

@@ -1,15 +0,0 @@
-EXRAIL Language documentation
-=============================
-
-Introduction
-------------
-
-EXRAIL - Extended Railroad Automation Instruction Language
-
-This page is a reference to all EXRAIL commands available with EX-CommandStation.
-
-Macros
-------
-
-.. doxygenfile:: EXRAIL2MacroReset.h
-   :project: EXRAIL Language

docs/make.bat

@@ -1,35 +0,0 @@
-@ECHO OFF
-
-pushd %~dp0
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set SOURCEDIR=.
-set BUILDDIR=_build
-
-%SPHINXBUILD% >NUL 2>NUL
-if errorlevel 9009 (
-	echo.
-	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-	echo.installed, then set the SPHINXBUILD environment variable to point
-	echo.to the full path of the 'sphinx-build' executable. Alternatively you
-	echo.may add the Sphinx directory to PATH.
-	echo.
-	echo.If you don't have Sphinx installed, grab it from
-	echo.https://www.sphinx-doc.org/
-	exit /b 1
-)
-
-if "%1" == "" goto help
-
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
-goto end
-
-:help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
-
-:end
-popd

docs/robots.txt

@@ -1,3 +0,0 @@
-User-agent: *
-
-Sitemap: https://dcc-ex.com/CommandStation-EX/sitemap.xml

requirements.txt

@@ -1,39 +0,0 @@
-alabaster==1.0.0
-attrs==25.1.0
-babel==2.17.0
-breathe==4.35.0
-cattrs==24.1.2
-certifi==2025.1.31
-charset-normalizer==3.4.1
-colorama==0.4.6
-docutils==0.21.2
-esbonio==0.16.5
-exceptiongroup==1.2.2
-idna==3.10
-imagesize==1.4.1
-Jinja2==3.1.5
-lsprotocol==2023.0.1
-MarkupSafe==3.0.2
-packaging==24.2
-platformdirs==4.3.6
-pyenchant==3.2.2
-pygls==1.3.1
-Pygments==2.19.1
-pyspellchecker==0.8.2
-requests==2.32.3
-snowballstemmer==2.2.0
-Sphinx==8.1.3
-sphinx-rtd-dark-mode==1.3.0
-sphinx-rtd-theme==3.0.2
-sphinx-sitemap==2.6.0
-sphinxcontrib-applehelp==2.0.0
-sphinxcontrib-devhelp==2.0.0
-sphinxcontrib-htmlhelp==2.1.0
-sphinxcontrib-jquery==4.1
-sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-qthelp==2.0.0
-sphinxcontrib-serializinghtml==2.0.0
-sphinxcontrib-spelling==8.0.1
-tomli==2.2.1
-typing_extensions==4.12.2
-urllib3==2.3.0

version.h

@@ -3,7 +3,15 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.4.4"
+#define VERSION "5.4.10"
+// 5.4.10 - Bugfix: MEGA DCC waveform starvation (sends too many idles)
+// 5.4.9  - Handle non-compliant decoders returning 255 for cv 20 and confusing <R> with bad consist addresses.
+//        - <W CONSIST longaddr> handles non-compliant decoders which NAK cv 20 writes.
+// 5.4.8  - Bugfix: Insert idle packet at end of speed reminder loop; treat all function groups equal
+// 5.4.7  - Bugfix: EXRAIL fix CLEAR_ALL_STASH
+// 5.4.6  - Bugfix: Do not drop further commands in same packet
+// 5.4.5  - ESP32: Better detection of correct IDF version
+//        - track power is always turned on after setJoin() not by setJoin()
 // 5.4.4  - bugfix in parser, input buffer overrun and trailing > that did break <+>
 // 5.4.3  - bugfix changeFn for functions 29..31
 // 5.4.2  - Reversed turnout bugfix