From 506b65d0eaf0d0d58abd46657df0a630a4334e59 Mon Sep 17 00:00:00 2001
From: Asbelos <asbelos@btinternet.com>
Date: Wed, 18 May 2022 17:44:41 +0100
Subject: [PATCH] Fix </> command for signals

---
 EXRAIL2.cpp | 18 ++++++++++++++----
 version.h   |  3 ++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/EXRAIL2.cpp b/EXRAIL2.cpp
index 60c66c6..6e8b0a3 100644
--- a/EXRAIL2.cpp
+++ b/EXRAIL2.cpp
@@ -320,12 +320,22 @@ bool RMFT2::parseSlash(Print * stream, byte & paramCount, int16_t p[]) {
     // Now stream the flags
     for (int id=0;id<MAX_FLAGS; id++) {
       byte flag=flags[id];
-      if (flag & ~TASK_FLAG) { // not interested in TASK_FLAG only. Already shown above
-	StringFormatter::send(stream,F("\nflags[%d} "),id);
-	if (flag & SECTION_FLAG) StringFormatter::send(stream,F(" RESERVED"));
-	if (flag & LATCH_FLAG) StringFormatter::send(stream,F(" LATCHED"));
+      if (flag & ~TASK_FLAG & ~SIGNAL_MASK) { // not interested in TASK_FLAG only. Already shown above
+	      StringFormatter::send(stream,F("\nflags[%d] "),id);
+	      if (flag & SECTION_FLAG) StringFormatter::send(stream,F(" RESERVED"));
+	      if (flag & LATCH_FLAG) StringFormatter::send(stream,F(" LATCHED"));
       }
     }
+    // do the signals
+    // flags[n] represents the state of the nth signal in the table  
+    for (int id=0;id<MAX_FLAGS; id++) {
+      byte flag=flags[id] & SIGNAL_MASK;
+      if (flag==0) break; // no more will be found
+      VPIN sigid=GETFLASHW(RMFT2::SignalDefinitions+4*id) & (~ SERVO_SIGNAL_FLAG) & (~ACTIVE_HIGH_SIGNAL_FLAG);
+      StringFormatter::send(stream,F("\nSignal[%d] %S"), sigid, 
+      (flag == SIGNAL_RED)? F("RED") : (flag==SIGNAL_GREEN) ? F("GREEN") : F("AMBER")); 
+    }
+    
     StringFormatter::send(stream,F(" *>\n"));
     return true;
   }
diff --git a/version.h b/version.h
index cc95b56..846ad3a 100644
--- a/version.h
+++ b/version.h
@@ -4,9 +4,10 @@
 #include "StringFormatter.h"
 
 
-#define VERSION "4.1.1 rc2"
+#define VERSION "4.1.1 rc3"
 // 4.1.1 Bugfix: preserve turnout format
 //       Bugfix: parse multiple commands in one buffer string correct
+//       Bugfix: </> command signal status in Exrail
 // 4.1.0 ...
 //
 // 4.0.2 EXRAIL additions: