add TRACK_MODIFIER_RAILCOM to Trackmanager

Author: habazut

DCCWaveformRMT.cpp

@@ -54,9 +54,11 @@ void DCCWaveform::begin() {
       //DIAG(F("new MAIN channel with pins %d %d"), p.pin, p.invpin);
       rmtMainChannel = new RMTChannel(p, true); /* create new main channel */
     }
-    int16_t brakePin = md->getBrakePinSigned();
-    // if RC and so on XXX 
-    rmtMainChannel->addRCPin(brakePin);
+    // if RC and so on XXX
+    TRACK_MODE m = md->getMode();
+    if (m & TRACK_MODIFIER_RAILCOM) {
+      rmtMainChannel->addRCPin(md->getBrakePinSigned());
+    }
   }
   MotorDriver *md = TrackManager::getProgDriver();
   if (md) {

MotorDriver.h

@@ -33,15 +33,17 @@
 // For example TRACK_MODE_DC_INV is (TRACK_MODE_DC|TRACK_MODIFIER_INV)
 enum TRACK_MODE : byte {
   // main modes
-  TRACK_MODE_NONE = 1, TRACK_MODE_MAIN = 2, TRACK_MODE_PROG = 4,
-  TRACK_MODE_DC = 8, TRACK_MODE_EXT = 16,
+  TRACK_MODE_NONE = 0, TRACK_MODE_MAIN = 1, TRACK_MODE_PROG = 2,
+  TRACK_MODE_DC = 4, TRACK_MODE_EXT = 8,
   // modifiers
   TRACK_MODIFIER_INV = 64, TRACK_MODIFIER_AUTO = 128,
 #ifdef ARDUINO_ARCH_ESP32
+  TRACK_MODIFIER_RAILCOM = 16,
   TRACK_MODE_BOOST = 32,
   TRACK_MODE_BOOST_INV = TRACK_MODE_BOOST|TRACK_MODIFIER_INV,
   TRACK_MODE_BOOST_AUTO = TRACK_MODE_BOOST|TRACK_MODIFIER_AUTO,
 #else
+  TRACK_MODIFIER_RAILCOM = 0,
   TRACK_MODE_BOOST = 0,
   TRACK_MODE_BOOST_INV = 0,
   TRACK_MODE_BOOST_AUTO = 0,
@@ -220,6 +222,7 @@ class MotorDriver {
     };
     inline pinpair getSignalPin() { return pinpair(signalPin,signalPin2); };
     inline int16_t getBrakePinSigned() { return invertBrake ? -brakePin : brakePin; };
+    inline int16_t getBrakePin() { return brakePin; };
     void setDCSignal(byte speedByte, uint8_t frequency=0);
     void throttleInrush(bool on);
     inline void detachDCSignal() {

TrackManager.cpp

@@ -226,6 +226,13 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
       //DIAG(F("Track=%c remove ^pin %d"),trackToSet+'A', p.invpin);
       gpio_reset_pin((gpio_num_t)p.invpin);
     }
+    if (mode & TRACK_MODIFIER_RAILCOM) {
+      byte bp = track[trackToSet]->getBrakePin();
+      if (bp != UNUSED_PIN) {
+	gpio_reset_pin((gpio_num_t)bp);
+	digitalWrite(bp, LOW);
+      }
+    }
 #ifdef BOOSTER_INPUT
     if (mode & TRACK_MODE_BOOST) {
       //DIAG(F("Track=%c mode boost pin %d"),trackToSet+'A', p.pin);
@@ -400,12 +407,18 @@ bool TrackManager::parseEqualSign(Print *stream, int16_t params, int16_t p[])
     if (params>1 && (p[0]<0 || p[0]>=MAX_TRACKS)) 
         return false;
 
-    if (params==2  && p[1]=="MAIN"_hk)                     // <= id MAIN>
+    if (params==2  && p[1]=="MAIN"_hk)                                            // <= id MAIN>
         return setTrackMode(p[0],TRACK_MODE_MAIN);
-    if (params==2  && p[1]=="MAIN_INV"_hk)                 // <= id MAIN_INV>
+    if (TRACK_MODIFIER_RAILCOM != 0 && params==2  && p[1]=="MAIN_RAILCOM"_hk)     // <= id MAIN_RAILCOM>
+        return setTrackMode(p[0],TRACK_MODE_MAIN|TRACK_MODIFIER_RAILCOM);
+    if (params==2  && p[1]=="MAIN_INV"_hk)                                        // <= id MAIN_INV>
         return setTrackMode(p[0],TRACK_MODE_MAIN_INV);
-    if (params==2  && p[1]=="MAIN_AUTO"_hk)                // <= id MAIN_AUTO>
+    if (TRACK_MODIFIER_RAILCOM != 0 && params==2  && p[1]=="MAIN_INV_RAILCOM"_hk) // <= id MAIN_INV_RAILCOM>
+        return setTrackMode(p[0],TRACK_MODE_MAIN_INV|TRACK_MODIFIER_RAILCOM);
+    if (params==2  && p[1]=="MAIN_AUTO"_hk)                                       // <= id MAIN_AUTO>
         return setTrackMode(p[0],TRACK_MODE_MAIN_AUTO);
+    if (TRACK_MODIFIER_RAILCOM != 0 && params==2  && p[1]=="MAIN_AUTO_RAILCOM"_hk)// <= id MAIN_AUTO_RAILCOM>
+        return setTrackMode(p[0],TRACK_MODE_MAIN_AUTO|TRACK_MODIFIER_RAILCOM);
 
 #ifndef DISABLE_PROG
     if (params==2  && p[1]=="PROG"_hk)                     // <= id PROG>
@@ -459,7 +472,7 @@ const FSH* TrackManager::getModeName(TRACK_MODE tm) {
   else if (tm & TRACK_MODE_PROG)
     modename=F("PROG");
 #endif
-  else if (tm & TRACK_MODE_NONE)
+  else if (tm == TRACK_MODE_NONE)
     modename=F("NONE");
   else if(tm & TRACK_MODE_EXT)
     modename=F("EXT");
@@ -568,7 +581,7 @@ void TrackManager::setTrackPower(POWERMODE powermode, byte t) {
   }
   TRACK_MODE trackmode = driver->getMode();
   POWERMODE oldpower = driver->getPower();
-  if (trackmode & TRACK_MODE_NONE) {
+  if (trackmode == TRACK_MODE_NONE) {
     driver->setBrake(true);     // Track is unused. Brake is good to have.
     powermode = POWERMODE::OFF; // Track is unused. Force it to OFF
   } else if (trackmode & TRACK_MODE_DC) { // includes inverted DC (called DCX)