Code corrections

code corrections

DCCEXParser.cpp

@@ -556,6 +556,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
         bool prog=false;
         bool join=false;
         bool singletrack=false;
+        byte t=0;
         if (params > 1) break;
         if (params==0) { // All
             main=true;
@@ -576,8 +577,8 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
 	  }
 #endif
       else if (p[0] >= 'A' && p[0] <= 'H') { // <1 A-H>
-            byte t = (p[0] - 'A');
+            t = (p[0] - 'A');
-                DIAG(F("Processing track - %d "), t);
+                //DIAG(F("Processing track - %d "), t);
                 if (TrackManager::isProg(t)) {
                     main = false;
                     prog = true;
@@ -588,10 +589,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
                     prog=false;
                 }
             singletrack=true;
-            DIAG(F("Calling SetPower %d - %d - %d"),  POWERMODE::ON, false, t);
+
-            if (main) TrackManager::setTrackPower(POWERMODE::ON, t);
-            //if (main) TrackManager::SetMainTrackPower(POWERMODE::ON, t);
-            //if (prog) TrackManager::SetProgTrackPower(POWERMODE::ON, t);
       }
 	  else break; // will reply <X>
 	}
@@ -600,6 +598,12 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
             if (main) TrackManager::setMainPower(POWERMODE::ON);
             if (prog) TrackManager::setProgPower(POWERMODE::ON);
         }
+        else {
+            if (main) TrackManager::setTrackPower(false, POWERMODE::ON, t);
+            if (prog) {
+                TrackManager::setTrackPower(true, POWERMODE::ON, t);
+            }
+        }
         CommandDistributor::broadcastPower();
         return;
         }
@@ -609,6 +613,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
         bool main=false;
         bool prog=false;
         bool singletrack=false;
+        byte t=0;
         if (params > 1) break;
         if (params==0) { // All
 	  main=true;
@@ -622,10 +627,10 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
 	  else if (p[0]==HASH_KEYWORD_PROG) { // <0 PROG>
 	    prog=true;
 	  }
-#endif  
+#endif  <=
       else if (p[0] >= 'A' && p[0] <= 'H') { // <1 A-H>
-            byte t = (p[0] - 'A');
+            t = (p[0] - 'A');
-                DIAG(F("Processing track - %d "), t);
+                //DIAG(F("Processing track - %d "), t);
                 if (TrackManager::isProg(t)) {
                     main = false;
                     prog = true;
@@ -636,24 +641,28 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
                     prog=false;
                 }
             singletrack=true;         
-            DIAG(F("Calling SetPower %d - %d - %d"),  POWERMODE::OFF, false, t);
-            if (main) TrackManager::setTrackPower(POWERMODE::OFF, t);
       } 
-    
 	  else break; // will reply <X>
 	}
 
         TrackManager::setJoin(false);
         if (!singletrack) {
-        if (main) TrackManager::setMainPower(POWERMODE::OFF);
+            if (main) TrackManager::setMainPower(POWERMODE::OFF);
+                if (prog) {
+                    TrackManager::progTrackBoosted=false;  // Prog track boost mode will not outlive prog track off
+                    TrackManager::setProgPower(POWERMODE::OFF);
+                }
+            }
+        else {
+            if (main) TrackManager::setTrackPower(false, POWERMODE::OFF, t);
             if (prog) {
                 TrackManager::progTrackBoosted=false;  // Prog track boost mode will not outlive prog track off
-                TrackManager::setProgPower(POWERMODE::OFF);
+                TrackManager::setTrackPower(true, POWERMODE::OFF, t);
             }
         }
         CommandDistributor::broadcastPower();
         return;
-        }
+    }
 
     case '!': // ESTOP ALL  <!>
         DCC::setThrottle(0,1,1); // this broadcasts speed 1(estop) and sets all reminders to speed 1.

EXRAIL2.cpp

@@ -783,13 +783,13 @@ void RMFT2::loop2() {
   
   case OPCODE_SET_POWER:
       // operand is TRACK_POWER , trackid
-
+        //byte thistrack=getOperand(1);
         switch (operand) {
           case TRACK_POWER_0:
-            TrackManager::setTrackPower(POWERMODE::OFF, getOperand(1));
+            TrackManager::setTrackPower(TrackManager::isProg(getOperand(1)), POWERMODE::OFF, getOperand(1));
           break;
           case TRACK_POWER_1:
-            TrackManager::setTrackPower(POWERMODE::ON, getOperand(1));
+            TrackManager::setTrackPower(TrackManager::isProg(getOperand(1)), POWERMODE::ON, getOperand(1));
           break;
         }
 

EXRAILMacros.h

@@ -412,7 +412,7 @@ const  HIGHFLASH  int16_t RMFT2::SignalDefinitions[] = {
 #define SERVO_TURNOUT(id,pin,activeAngle,inactiveAngle,profile,description...) OPCODE_SERVOTURNOUT,V(id),OPCODE_PAD,V(pin),OPCODE_PAD,V(activeAngle),OPCODE_PAD,V(inactiveAngle),OPCODE_PAD,V(PCA9685::ProfileType::profile),
 #define SET(pin) OPCODE_SET,V(pin),
 #define SET_TRACK(track,mode)  OPCODE_SET_TRACK,V(TRACK_MODE_##mode  <<8 | TRACK_NUMBER_##track),
-#define SET_POWER(track,onoff) OPCODE_SET_POWER,V(TRACK_POWER_##onoff, TRACK_NUMBER_##track),
+#define SET_POWER(track,onoff) OPCODE_SET_POWER,V(TRACK_POWER_##onoff),OPCODE_PAD, V(TRACK_NUMBER_##track),
 #define SETLOCO(loco) OPCODE_SETLOCO,V(loco),
 #define SIGNAL(redpin,amberpin,greenpin) 
 #define SIGNALH(redpin,amberpin,greenpin) 

TrackManager.cpp

@@ -364,16 +364,16 @@ void TrackManager::streamTrackState(Print* stream, byte t) {
       break;
 #endif
   case TRACK_MODE_NONE:
-      if (pstate) {format=F("<= %c NONE %ON>\n");} else {format=F("<= %c NONE %OFF>\n");}
+      if (pstate) {format=F("<= %c NONE ON>\n");} else {format=F("<= %c NONE OFF>\n");}
       break;
   case TRACK_MODE_EXT:
       if (pstate) {format=F("<= %c EXT ON>\n");} else {format=F("<= %c EXT OFF>\n");}
       break;
   case TRACK_MODE_DC:
-      if (pstate) {format=F("<= %c DC ON  %d>\n");} else {format=F("<= %c DC OFF  %d>\n");}
+      if (pstate) {format=F("<= %c DC %d ON>\n");} else {format=F("<= %c DC %d OFF>\n");}
       break;
   case TRACK_MODE_DCX:
-      if (pstate) {format=F("<= %c DCX ON  %d>\n");} else {format=F("<= %c DCX OFF  %d>\n");}
+      if (pstate) {format=F("<= %c DCX %d ON>\n");} else {format=F("<= %c DCX %d OFF>\n");}
       break;
   default:
       break; // unknown, dont care    
@@ -416,9 +416,51 @@ std::vector<MotorDriver *>TrackManager::getMainDrivers() {
 void TrackManager::setPower2(bool setProg,POWERMODE mode) {
     if (!setProg) mainPowerGuess=mode; 
     FOR_EACH_TRACK(t) {
-      MotorDriver * driver=track[t]; 
+      TrackManager::setTrackPower(setProg, mode, t);
-      if (!driver) continue; 
+      // MotorDriver * driver=track[t]; 
-      switch (track[t]->getMode()) {
+      // if (!driver) continue; 
+      // switch (track[t]->getMode()) {
+      //     case TRACK_MODE_MAIN:
+      //         if (setProg) break; 
+      //         // toggle brake before turning power on - resets overcurrent error
+      //         // on the Pololu board if brake is wired to ^D2.
+      //         // XXX see if we can make this conditional
+      //         driver->setBrake(true);
+      //         driver->setBrake(false); // DCC runs with brake off
+      //         driver->setPower(mode);  
+      //         break; 
+      //     case TRACK_MODE_DC:
+      //     case TRACK_MODE_DCX:
+      //         if (setProg) break; 
+      //         driver->setBrake(true); // DC starts with brake on
+      //         applyDCSpeed(t);        // speed match DCC throttles
+      //         driver->setPower(mode);
+      //         break;  
+      //     case TRACK_MODE_PROG:
+      //         if (!setProg) break; 
+      //         driver->setBrake(true);
+      //         driver->setBrake(false);
+      //         driver->setPower(mode);
+      //         break;  
+      //     case TRACK_MODE_EXT:
+      //   driver->setBrake(true);
+      //   driver->setBrake(false);
+      //   driver->setPower(mode);
+      //   break;
+      //     case TRACK_MODE_NONE:
+      //         break;
+      //   }
+      
+    }
+}
+
+void TrackManager::setTrackPower(bool setProg, POWERMODE mode, byte thistrack) {
+
+      DIAG(F("SetTrackPower Processing Track %d"), thistrack);
+      MotorDriver * driver=track[thistrack]; 
+      if (!driver) return; 
+
+      switch (track[thistrack]->getMode()) {
           case TRACK_MODE_MAIN:
               if (setProg) break; 
               // toggle brake before turning power on - resets overcurrent error
@@ -432,7 +474,7 @@ void TrackManager::setPower2(bool setProg,POWERMODE mode) {
           case TRACK_MODE_DCX:
               if (setProg) break; 
               driver->setBrake(true); // DC starts with brake on
-              applyDCSpeed(t);        // speed match DCC throttles
+              applyDCSpeed(thistrack);        // speed match DCC throttles
               driver->setPower(mode);
               break;  
           case TRACK_MODE_PROG:
@@ -449,17 +491,9 @@ void TrackManager::setPower2(bool setProg,POWERMODE mode) {
           case TRACK_MODE_NONE:
               break;
         }
-      
+      if (mode == POWERMODE::ON) {DIAG(F("Power Track %d ON"), thistrack);}
-    }
+        else {DIAG(F("Power Track %d OFF"), thistrack);}
-}
+      //driver->setPower(mode);  
-
-void TrackManager::setTrackPower(POWERMODE mode, byte thistrack) {
-
-      DIAG(F("SetPower Processing Track %d"), thistrack);
-      MotorDriver * driver=track[thistrack]; 
-      if (!driver) return; 
-
-      driver->setPower(mode);  
 
  }
 

TrackManager.h

@@ -64,7 +64,7 @@ class TrackManager {
 #ifdef ARDUINO_ARCH_ESP32
   static std::vector<MotorDriver *>getMainDrivers();
 #endif
-    static void setTrackPower(POWERMODE mode, byte thistrack);
+    static void setTrackPower(bool setProg, POWERMODE mode, byte thistrack);
     static void setPower2(bool progTrack,POWERMODE mode);
     static void setPower(POWERMODE mode) {setMainPower(mode); setProgPower(mode);}
     static void setMainPower(POWERMODE mode) {setPower2(false,mode);}