update for negative routes 5.2.22

DCC-EX · Jan 10, 2024 · 2ab2b61 · 2ab2b61
2 parents 8e56a1e + 796d5c4
commit 2ab2b61
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/EXRAIL2.cpp b/EXRAIL2.cpp
@@ -333,13 +333,15 @@ if (compileFeatures & FEATURE_SIGNAL) {
 }
 
 void RMFT2::setTurnoutHiddenState(Turnout * t) {
-  // turnout descriptions are in low flash F strings 
-  t->setHidden(GETFLASH(getTurnoutDescription(t->getId()))==0x01);     
+  // turnout descriptions are in low flash F strings
+  const FSH *desc = getTurnoutDescription(t->getId());
+  if (desc) t->setHidden(GETFLASH(desc)==0x01);
 }
 
 #ifndef IO_NO_HAL
 void RMFT2::setTurntableHiddenState(Turntable * tto) {
-  tto->setHidden(GETFLASH(getTurntableDescription(tto->getId()))==0x01);
+  const FSH *desc = getTurntableDescription(tto->getId());
+  if (desc) tto->setHidden(GETFLASH(desc)==0x01);
 }
 #endif
 

diff --git a/EXRAIL2Parser.cpp b/EXRAIL2Parser.cpp
@@ -134,7 +134,7 @@ void RMFT2::ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16
               return; 
             }
             if (paramCount==2) {  // <JA id>
-              uint16_t id=p[1]; 
+              int16_t id=p[1];
               StringFormatter::send(stream,F("<jA %d %c \"%S\">\n"), 
                 id, getRouteType(id), getRouteDescription(id));
 

diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h
@@ -1 +1 @@
-#define GITHUB_SHA "devel-202401081219Z"
+#define GITHUB_SHA "devel-202401100719Z"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define GITHUB_SHA "devel-202401081219Z"
		#define GITHUB_SHA "devel-202401100719Z"