EXRAIL2.cpp

@@ -332,7 +332,7 @@ void RMFT2::setTurntableHiddenState(Turntable * tto) {
 char RMFT2::getRouteType(int16_t id) {
   int16_t progCounter=routeLookup->find(id);
   if (progCounter>=0) {
-    byte type=GET_OPCODE; 
+    OPCODE type=GET_OPCODE; 
     if (type==OPCODE_ROUTE) return 'R';
     if (type==OPCODE_AUTOMATION) return 'A';
   }

EXRAIL2Parser.cpp

@@ -122,7 +122,7 @@ void RMFT2::ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16
     
     case 'J':  // throttle info commands
         // This entire code block is compiled out if FEATURE_ROUTESTATE macros not used 
-        if (paramCount<1) return; 
+        if (paramCount<1 || !(compileFeatures & FEATURE_ROUTESTATE)) return; 
         switch(p[0]) 
           case HASH_KEYWORD_A: // <JA> returns automations/routes
             if (paramCount==1) {// <JA>
@@ -137,15 +137,13 @@ void RMFT2::ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16
               StringFormatter::send(stream,F("<jA %d %c \"%S\">\n"), 
                 id, getRouteType(id), getRouteDescription(id));
   
-              if (compileFeatures & FEATURE_ROUTESTATE) {
+              // Send any non-default button states or captions
-                // Send any non-default button states or captions
+              int16_t statePos=routeLookup->findPosition(id);
-                int16_t statePos=routeLookup->findPosition(id);
+              if (statePos>=0) {
-                if (statePos>=0) {
+                if (routeStateArray[statePos]) 
-                 if (routeStateArray[statePos]) 
+                StringFormatter::send(stream,F("<jB %d %d>\n"), id, routeStateArray[statePos]);
-                 StringFormatter::send(stream,F("<jB %d %d>\n"), id, routeStateArray[statePos]);
+                if (routeCaptionArray[statePos]) 
-                  if (routeCaptionArray[statePos]) 
+                StringFormatter::send(stream,F("<jB %d \"%S\">\n"), id,routeCaptionArray[statePos]);
-                  StringFormatter::send(stream,F("<jB %d \"%S\">\n"), id,routeCaptionArray[statePos]);
-                }
               }
               opcode=0;
               return;

MotorDriver.cpp

@@ -676,10 +676,8 @@ void MotorDriver::checkPowerOverload(bool useProgLimit, byte trackno) {
       power_sample_overload_wait *= 2;
       if (power_sample_overload_wait > POWER_SAMPLE_RETRY_MAX)
 	      power_sample_overload_wait = POWER_SAMPLE_RETRY_MAX;
-  #ifdef EXRAIL_ACTIVE
       DIAG(F("Calling EXRAIL"));
       RMFT2::powerEvent(trackno, true); // Tell EXRAIL we have an overload
-  #endif
       // power on test
       DIAG(F("TRACK %c POWER RESTORE (after %4M)"), trackno + 'A', mslpc);
       setPower(POWERMODE::ALERT);