Merge branch 'devel-railcom2' of https://github.com/DCC-EX/CommandStation-EX into devel-railcom2

DCCEXParser.cpp

@@ -1121,7 +1121,7 @@ bool DCCEXParser::parseC(Print *stream, int16_t params, int16_t p[]) {
         DCC::setGlobalSpeedsteps(128);
 	DIAG(F("128 Speedsteps"));
         return true;
-#if defined(HAS_ENOUGH_MEMORY) && !defined(ARDUINO_ARCH_UNO)
+#if defined(HAS_ENOUGH_MEMORY) && !defined(ARDUINO_ARCH_UNO) && !defined(ARDUINO_ARCH_ESP32)
     case "RAILCOM"_hk:
         {   // <C RAILCOM ON|OFF|DEBUG >
             if (params<2) return false;

DCCRMT.cpp

@@ -84,7 +84,7 @@ void IRAM_ATTR interrupt(rmt_channel_t channel, void *t) {
     DCCTimer::updateMinimumFreeMemoryISR(0);
 }
 
-RMTChannel::RMTChannel(pinpair pins, bool isMain) {
+RMTChannel::RMTChannel(Pinpair pins, bool isMain) {
   byte ch;
   byte plen;
 
@@ -253,7 +253,7 @@ bool RMTChannel::addPin(byte pin, bool inverted) {
   if (err != ESP_OK) return false;
   return true;
 }
-bool RMTChannel::addPin(pinpair pins) {
+bool RMTChannel::addPin(Pinpair pins) {
   return addPin(pins.pin) && addPin(pins.invpin, true);
 }
 #endif //ESP32

DCCRMT.h

@@ -23,7 +23,7 @@
 #include "driver/rmt.h"
 #include "soc/rmt_reg.h"
 #include "soc/rmt_struct.h"
-#include "MotorDriver.h" // for class pinpair
+#include "Pinpair.h" // for class Pinpair
 
 // make calculations easy and set up for microseconds
 #define RMT_CLOCK_DIVIDER 80
@@ -32,9 +32,9 @@
 
 class RMTChannel {
  public:
-  RMTChannel(pinpair pins, bool isMain);
+  RMTChannel(Pinpair pins, bool isMain);
   bool addPin(byte pin, bool inverted=0);
-  bool addPin(pinpair pins);
+  bool addPin(Pinpair pins);
   void IRAM_ATTR RMTinterrupt();
   void RMTprefill();
   //int RMTfillData(dccPacket packet);

DCCWaveform.cpp

@@ -126,22 +126,6 @@ volatile bool DCCWaveform::railcomActive=false;     // switched on by user
 volatile bool DCCWaveform::railcomDebug=false;     // switched on by user
 volatile bool DCCWaveform::railcomSampleWindow=false; // true during packet transmit
 
-bool DCCWaveform::isRailcom() {
-  return railcomActive;
-}
-
-bool DCCWaveform::isRailcomSampleWindow() {
-  return railcomSampleWindow;
-}
-bool DCCWaveform::isRailcomPossible() {
-  return railcomPossible;
-}
-
-void DCCWaveform::setRailcomPossible(bool yes) {
-  railcomPossible=yes;
-  if (!yes) setRailcom(false,false);
-}
-
 bool DCCWaveform::setRailcom(bool on, bool debug) {
   if (on && railcomPossible) {
     // TODO check possible
@@ -165,23 +149,28 @@ void DCCWaveform::interrupt2() {
   if (remainingPreambles > 0 ) {
     state=WAVE_MID_1;  // switch state to trigger LOW on next interrupt
     
-    // predict railcom cutout on next interrupt 
-    cutoutNextTime= remainingPreambles==requiredPreambles
-           && railcomActive 
-           && isMainTrack;
-
     remainingPreambles--;
   
     // As we get to the end of the preambles, open the reminder window.
     // This delays any reminder insertion until the last moment so
     // that the reminder doesn't block a more urgent packet. 
-    reminderWindowOpen=transmitRepeats==0 && remainingPreambles<4 && remainingPreambles>1;
-    if (remainingPreambles==1) promotePendingPacket();
+    reminderWindowOpen=transmitRepeats==0 && remainingPreambles<10 && remainingPreambles>1;
+    if (remainingPreambles==1)
+      promotePendingPacket();
     else if (isMainTrack && railcomActive) {
+      if (remainingPreambles==(requiredPreambles-1)) {
+        // First look if we need to start a railcom cutout on next interrupt
+        cutoutNextTime= true;
+      } else if (remainingPreambles==(requiredPreambles-12)) {
         // cutout has ended so its now possible to poll the railcom detectors
-      if (remainingPreambles==5) railcomSampleWindow=true;
+        // requiredPreambles is one higher that preamble length so
+        // if preamble length is 16 then this evaluates to 5
+        railcomSampleWindow=true;
+      } else if (remainingPreambles==(requiredPreambles-3)) {
         // cutout can be ended when read
-      else if (remainingPreambles==14) DCCTimer::ackRailcomTimer();
+        // see above for requiredPreambles
+        DCCTimer::ackRailcomTimer();
+      }
     }
     // Update free memory diagnostic as we don't have anything else to do this time.
     // Allow for checkAck and its called functions using 22 bytes more.
@@ -266,11 +255,13 @@ void DCCWaveform::promotePendingPacket() {
       transmitRepeats = 0;
       if (getResets() < 250) sentResetsSincePacket++; // only place to increment (private!)
 }
-#endif
+#endif //not ARDUINO_ARCH_ESP32
 
 #ifdef ARDUINO_ARCH_ESP32
 #include "DCCWaveform.h"
+#include "TrackManager.h"
 #include "DCCACK.h"
+#include "Pinpair.h"
 
 DCCWaveform  DCCWaveform::mainTrack(PREAMBLE_BITS_MAIN, true);
 DCCWaveform  DCCWaveform::progTrack(PREAMBLE_BITS_PROG, false);
@@ -283,7 +274,7 @@ DCCWaveform::DCCWaveform(byte preambleBits, bool isMain) {
 }
 void DCCWaveform::begin() {
   for(const auto& md: TrackManager::getMainDrivers()) {
-    pinpair p = md->getSignalPin();
+    Pinpair p = md->getSignalPin();
     if(rmtMainChannel) {
       //DIAG(F("added pins %d %d to MAIN channel"), p.pin, p.invpin);
       rmtMainChannel->addPin(p); // add pin to existing main channel
@@ -294,7 +285,7 @@ void DCCWaveform::begin() {
   }
   MotorDriver *md = TrackManager::getProgDriver();
   if (md) {
-    pinpair p = md->getSignalPin();
+    Pinpair p = md->getSignalPin();
     if (rmtProgChannel) {
       //DIAG(F("added pins %d %d to PROG channel"), p.pin, p.invpin);
       rmtProgChannel->addPin(p); // add pin to existing prog channel
@@ -352,7 +343,9 @@ void IRAM_ATTR DCCWaveform::loop() {
 }
 
 bool DCCWaveform::setRailcom(bool on, bool debug) {
-  // TODO... ESP32 railcom waveform
+  // todo
+  (void)on;
+  (void)debug;
   return false;
 }
 

DCCWaveform.h

@@ -25,7 +25,7 @@
 #define DCCWaveform_h
 #ifdef ARDUINO_ARCH_ESP32
 #include "DCCRMT.h"
-#include "TrackManager.h"
+//#include "TrackManager.h"
 #endif
 
 
@@ -84,10 +84,19 @@ class DCCWaveform {
     bool isReminderWindowOpen();
     void promotePendingPacket();
     static bool setRailcom(bool on, bool debug);
-    static bool isRailcom();
-    static bool isRailcomSampleWindow();
-    static bool isRailcomPossible();
-    static void setRailcomPossible(bool yes);
+    inline static bool isRailcom() {
+      return railcomActive;
+    };
+    inline static bool isRailcomSampleWindow() {
+      return railcomSampleWindow;
+    };
+    inline static bool isRailcomPossible() {
+      return railcomPossible;
+    };
+    inline static void setRailcomPossible(bool yes) {
+      railcomPossible=yes;
+      if (!yes) setRailcom(false,false);
+    };
   private:
 #ifndef ARDUINO_ARCH_ESP32
     volatile bool packetPending;

EXRAIL2.cpp

@@ -87,6 +87,8 @@ LookList *  RMFT2::onClockLookup=NULL;
 LookList *  RMFT2::onRotateLookup=NULL;
 #endif
 LookList *  RMFT2::onOverloadLookup=NULL;
+LookList *  RMFT2::onBlockEnterLookup=NULL;
+LookList *  RMFT2::onBlockExitLookup=NULL;
 byte * RMFT2::routeStateArray=nullptr; 
 const FSH  * * RMFT2::routeCaptionArray=nullptr; 
 int16_t * RMFT2::stashArray=nullptr;
@@ -131,11 +133,11 @@ int16_t LookList::find(int16_t value) {
 void LookList::chain(LookList * chain) {
   m_chain=chain;
 }
-void LookList::handleEvent(const FSH* reason,int16_t id) {
+void LookList::handleEvent(const FSH* reason,int16_t id, int16_t loco) {
   // New feature... create multiple ONhandlers
   for (int i=0;i<m_size;i++) 
     if (m_lookupArray[i]==id)
-       RMFT2::startNonRecursiveTask(reason,id,m_resultArray[i]);
+       RMFT2::startNonRecursiveTask(reason,id,m_resultArray[i],loco);
 }
 
 
@@ -203,6 +205,12 @@ LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) {
   onRotateLookup=LookListLoader(OPCODE_ONROTATE);
 #endif
   onOverloadLookup=LookListLoader(OPCODE_ONOVERLOAD);
+
+  if (compileFeatures & FEATURE_BLOCK) {
+    onBlockEnterLookup=LookListLoader(OPCODE_ONBLOCKENTER);
+    onBlockExitLookup=LookListLoader(OPCODE_ONBLOCKEXIT);
+  }
+
   // onLCCLookup is not the same so not loaded here. 
 
   // Second pass startup, define any turnouts or servos, set signals red
@@ -379,7 +387,7 @@ char RMFT2::getRouteType(int16_t id) {
 }
 
 
-RMFT2::RMFT2(int progCtr) {
+RMFT2::RMFT2(int progCtr, int16_t _loco) {
   progCounter=progCtr;
 
   // get an unused  task id from the flags table
@@ -392,9 +400,7 @@ RMFT2::RMFT2(int progCtr) {
     }
   }
   delayTime=0;
-  loco=0;
-  speedo=0;
-  forward=true;
+  loco=_loco;
   invert=false;
   blinkState=not_blink_task;
   stackDepth=0;
@@ -412,7 +418,10 @@ RMFT2::RMFT2(int progCtr) {
 
 
 RMFT2::~RMFT2() {
-  driveLoco(1); // ESTOP my loco if any
+  // estop my loco if this is not an ONevent 
+  // (prevents DONE stopping loco at the end of an
+  //   ONBLOCKENTER or ONBLOCKEXIT )
+  if (loco>0 && this->onEventStartPosition==-1) DCC::setThrottle(loco,1,DCC::getThrottleDirection(loco));
   setFlag(taskId,0,TASK_FLAG); // we are no longer using this id
   if (next==this)
     loopTask=NULL;
@@ -428,23 +437,9 @@ RMFT2::~RMFT2() {
 void RMFT2::createNewTask(int route, uint16_t cab) {
       int pc=routeLookup->find(route);
       if (pc<0) return;
-      RMFT2* task=new RMFT2(pc);
-      task->loco=cab;
+      new RMFT2(pc,cab);
 }
 
-void RMFT2::driveLoco(byte speed) {
-  if (loco<=0) return;  // Prevent broadcast!
-  //if (diag) DIAG(F("EXRAIL drive %d %d %d"),loco,speed,forward^invert);
- /* TODO.....
- power on appropriate track if DC or main if dcc
-  if (TrackManager::getMainPowerMode()==POWERMODE::OFF) {
-    TrackManager::setMainPower(POWERMODE::ON);
-  }
-  **********/
-
-  DCC::setThrottle(loco,speed, forward^invert);
-  speedo=speed;
-}
 
 bool RMFT2::readSensor(uint16_t sensorId) {
   // Exrail operands are unsigned but we need the signed version as inserted by the macros.
@@ -499,7 +494,7 @@ bool RMFT2::skipIfBlock() {
   if (cv & LONG_ADDR_MARKER) {               // maker bit indicates long addr
     progtrackLocoId = cv ^ LONG_ADDR_MARKER; // remove marker bit to get real long addr
     if (progtrackLocoId <= HIGHEST_SHORT_ADDR ) {     // out of range for long addr
-      DIAG(F("Long addr %d <= %d unsupported"), progtrackLocoId, HIGHEST_SHORT_ADDR);
+      DIAG(F("Long addr %d <= %d unsupported\n"), progtrackLocoId, HIGHEST_SHORT_ADDR);
       progtrackLocoId = -1;
     }
   } else {
@@ -507,6 +502,15 @@ bool RMFT2::skipIfBlock() {
   }
 }
 
+void RMFT2::pause() {
+  if (loco)
+    pauseSpeed=DCC::getThrottleSpeedByte(loco);
+}
+void RMFT2::resume() {
+  if (loco)
+    DCC::setThrottle(loco,pauseSpeed & 0x7f, pauseSpeed & 0x80);
+}
+
 void RMFT2::loop() {
   if (compileFeatures & FEATURE_SENSOR) 
       EXRAILSensor::checkAll();
@@ -571,18 +575,15 @@ void RMFT2::loop2() {
 #endif
 
   case OPCODE_REV:
-    forward = false;
-    driveLoco(operand);
+    if (loco) DCC::setThrottle(loco,operand,invert);
     break;
     
   case OPCODE_FWD:
-      forward = true;
-      driveLoco(operand);
+    if (loco) DCC::setThrottle(loco,operand,!invert);
     break;
       
   case OPCODE_SPEED:
-    forward=DCC::getThrottleDirection(loco)^invert;
-    driveLoco(operand);
+    if (loco) DCC::setThrottle(loco,operand,DCC::getThrottleDirection(loco));
     break;
     
   case OPCODE_FORGET:
@@ -594,12 +595,11 @@ void RMFT2::loop2() {
 
   case OPCODE_INVERT_DIRECTION:
     invert= !invert;
-    driveLoco(speedo);
     break;
     
   case OPCODE_RESERVE:
     if (getFlag(operand,SECTION_FLAG)) {
-      driveLoco(0);
+      if (loco) DCC::setThrottle(loco,0,DCC::getThrottleDirection(loco));
       delayMe(500);
       return;
     }
@@ -697,6 +697,10 @@ void RMFT2::loop2() {
      break; 
 
   case OPCODE_PAUSE:
+    // all tasks save their speed bytes
+    pause();
+    for (RMFT2 * t=next; t!=this;t=t->next) t->pause();
+    
     DCC::setThrottle(0,1,true);  // pause all locos on the track
     pausingTask=this;
     break;
@@ -741,8 +745,8 @@ void RMFT2::loop2() {
 
   case OPCODE_RESUME:
     pausingTask=NULL;
-    driveLoco(speedo);
-    for (RMFT2 * t=next; t!=this;t=t->next) if (t->loco >0) t->driveLoco(t->speedo);
+    resume();
+    for (RMFT2 * t=next; t!=this;t=t->next) t->resume();
     break;
     
   case OPCODE_IF: // do next operand if sensor set
@@ -853,8 +857,7 @@ void RMFT2::loop2() {
     
   case OPCODE_DRIVE:
     {
-      byte analogSpeed=IODevice::readAnalogue(operand) *127 / 1024;
-      if (speedo!=analogSpeed) driveLoco(analogSpeed);
+      // Non functional but reserved 
       break;
     }
     
@@ -944,8 +947,6 @@ void RMFT2::loop2() {
     // which is intended so it can be checked
     // from within EXRAIL
     loco=progtrackLocoId;
-    speedo=0;
-    forward=true;
     invert=false;
     break;
 #endif
@@ -967,16 +968,13 @@ void RMFT2::loop2() {
     {
       int newPc=routeLookup->find(getOperand(1));
       if (newPc<0) break;
-      RMFT2* newtask=new RMFT2(newPc); // create new task
-      newtask->loco=operand;
+      new RMFT2(newPc,operand); // create new task
     }
     break;
     
   case OPCODE_SETLOCO:
     {
       loco=operand;
-      speedo=0;
-      forward=true;
       invert=false;
     }
     break;
@@ -1110,7 +1108,8 @@ void RMFT2::loop2() {
   case OPCODE_ONROTATE:
 #endif
   case OPCODE_ONOVERLOAD:
-  
+  case OPCODE_ONBLOCKENTER:
+  case OPCODE_ONBLOCKEXIT:
     break;
     
   default:
@@ -1302,6 +1301,14 @@ void RMFT2::activateEvent(int16_t addr, bool activate) {
   else onDeactivateLookup->handleEvent(F("DEACTIVATE"),addr);
 }
 
+void RMFT2::blockEvent(int16_t block, int16_t loco, bool entering) {
+  if (compileFeatures & FEATURE_BLOCK) {
+  // Hunt for an ONBLOCKENTER/ONBLOCKEXIT for this accessory
+  if (entering)  onBlockEnterLookup->handleEvent(F("BLOCKENTER"),block,loco);
+  else onBlockExitLookup->handleEvent(F("BLOCKEXIT"),block,loco);
+  }
+}
+
 void RMFT2::changeEvent(int16_t vpin, bool change) {
   // Hunt for an ONCHANGE for this sensor
   if (change)  onChangeLookup->handleEvent(F("CHANGE"),vpin);
@@ -1357,7 +1364,7 @@ void RMFT2::killBlinkOnVpin(VPIN pin, uint16_t count) {
   }
 }
   
-void RMFT2::startNonRecursiveTask(const FSH* reason, int16_t id,int pc) {  
+void RMFT2::startNonRecursiveTask(const FSH* reason, int16_t id,int pc, int16_t loco) {  
   // Check we dont already have a task running this handler
   RMFT2 * task=loopTask;
   while(task) {
@@ -1369,7 +1376,7 @@ void RMFT2::startNonRecursiveTask(const FSH* reason, int16_t id,int pc) {
     if (task==loopTask) break;
   }
   
-  task=new RMFT2(pc);  // new task starts at this instruction
+  task=new RMFT2(pc,loco);  // new task starts at this instruction
   task->onEventStartPosition=pc; // flag for recursion detector
 }
 

EXRAIL2.h

@@ -77,6 +77,7 @@ enum OPCODE : byte {OPCODE_THROW,OPCODE_CLOSE,OPCODE_TOGGLE_TURNOUT,
              OPCODE_STASH,OPCODE_CLEAR_STASH,OPCODE_CLEAR_ALL_STASH,OPCODE_PICKUP_STASH,
              OPCODE_ONBUTTON,OPCODE_ONSENSOR,
              OPCODE_NEOPIXEL,
+             OPCODE_ONBLOCKENTER,OPCODE_ONBLOCKEXIT,
              // OPcodes below this point are skip-nesting IF operations
              // placed here so that they may be skipped as a group
              // see skipIfBlock()
@@ -136,6 +137,7 @@ enum SignalType {
   static const byte FEATURE_STASH = 0x08;
   static const byte FEATURE_BLINK = 0x04;
   static const byte FEATURE_SENSOR = 0x02;
+  static const byte FEATURE_BLOCK = 0x01;
   
  
   // Flag bits for status of hardware and TPL
@@ -162,7 +164,7 @@ class LookList {
     int16_t findPosition(int16_t value); // finds index 
     int16_t size();
     void stream(Print * _stream); 
-    void handleEvent(const FSH* reason,int16_t id);
+    void handleEvent(const FSH* reason,int16_t id, int16_t loco=0);
 
   private:
      int16_t m_size;
@@ -176,8 +178,7 @@ class LookList {
    public:
     static void begin();
     static void loop();
-    RMFT2(int progCounter);
-    RMFT2(int route, uint16_t cab);
+    RMFT2(int progCounter, int16_t cab=0);
     ~RMFT2();
     static void readLocoCallback(int16_t cv);
     static void createNewTask(int route, uint16_t cab);
@@ -187,6 +188,7 @@ class LookList {
     static void clockEvent(int16_t clocktime, bool change);
     static void rotateEvent(int16_t id, bool change);
     static void powerEvent(int16_t track, bool overload);
+    static void blockEvent(int16_t block, int16_t loco, bool entering);
     static bool signalAspectEvent(int16_t address, byte aspect );    
     // Throttle Info Access functions built by exrail macros 
   static const byte rosterNameCount;
@@ -200,7 +202,7 @@ class LookList {
   static const FSH *  getRosterFunctions(int16_t id);
   static const FSH *  getTurntableDescription(int16_t id);
   static const FSH *  getTurntablePositionDescription(int16_t turntableId, uint8_t positionId);
-  static void startNonRecursiveTask(const FSH* reason, int16_t id,int pc);
+  static void startNonRecursiveTask(const FSH* reason, int16_t id,int pc, int16_t loco=0);
   static bool readSensor(uint16_t sensorId);
   static bool isSignal(int16_t id,char rag);
   static SIGNAL_DEFINITION getSignalSlot(int16_t slotno); 
@@ -224,7 +226,6 @@ private:
     static RMFT2 * loopTask;
     static RMFT2 * pausingTask;
     void delayMe(long millisecs);
-    void driveLoco(byte speedo);
     bool skipIfBlock();
     bool readLoco();
     void loop2();
@@ -233,6 +234,8 @@ private:
     void printMessage2(const FSH * msg);
     void thrungeString(uint32_t strfar, thrunger mode, byte id=0);
     uint16_t getOperand(byte n); 
+    void pause();
+    void resume();
     
    static bool diag;
    static const  HIGHFLASH3  byte RouteCode[];
@@ -254,6 +257,9 @@ private:
    static LookList * onRotateLookup;
 #endif
    static LookList * onOverloadLookup;
+   static LookList * onBlockEnterLookup;
+   static LookList * onBlockExitLookup;
+   
    
    static const int countLCCLookup;
    static int onLCCLookup[];
@@ -278,9 +284,8 @@ private:
     byte  taskId;
     BlinkState blinkState; // includes AT_TIMEOUT flag. 
     uint16_t loco;
-    bool forward;
     bool invert;
-    byte speedo;
+    byte pauseSpeed;
     int onEventStartPosition;
     byte stackDepth;
     int callStack[MAX_STACK_DEPTH];

EXRAIL2MacroReset.h

@@ -110,6 +110,8 @@
 #undef ONACTIVATE
 #undef ONACTIVATEL
 #undef ONAMBER
+#undef ONBLOCKENTER
+#undef ONBLOCKEXIT
 #undef ONDEACTIVATE
 #undef ONDEACTIVATEL 
 #undef ONCLOSE
@@ -281,6 +283,8 @@
 #define ONACTIVATE(addr,subaddr)
 #define ONACTIVATEL(linear)
 #define ONAMBER(signal_id) 
+#define ONBLOCKENTER(blockid)
+#define ONBLOCKEXIT(blockid)
 #define ONTIME(value)
 #define ONCLOCKTIME(hours,mins)
 #define ONCLOCKMINS(mins)

EXRAIL2Parser.cpp

@@ -210,6 +210,14 @@ void RMFT2::ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16
         default:
             break;
         }
+
+  case 'K': // <K blockid loco>  Block enter
+  case 'k': // <k blockid loco>  Block exit
+        if (paramCount!=2) break;
+        blockEvent(p[0],p[1],opcode=='K');
+        opcode=0;
+        break; 
+  
   default:  // other commands pass through
     break;
   }
@@ -228,11 +236,9 @@ bool RMFT2::parseSlash(Print * stream, byte & paramCount, int16_t p[]) {
 			    );
       }
       else {
-      StringFormatter::send(stream,F("\nID=%d,PC=%d,LOCO=%d%c,SPEED=%d%c"),
+      StringFormatter::send(stream,F("\nID=%d,PC=%d,LOCO=%d %c"),
 			    (int)(task->taskId),task->progCounter,task->loco,
-			    task->invert?'I':' ',
-			    task->speedo,
-			    task->forward?'F':'R'
+			    task->invert?'I':' '
 			    );
       }
       task=task->next;
@@ -276,17 +282,25 @@ bool RMFT2::parseSlash(Print * stream, byte & paramCount, int16_t p[]) {
   switch (p[0]) {
   case "PAUSE"_hk: // </ PAUSE>
     if (paramCount!=1) return false;
-    DCC::setThrottle(0,1,true);  // pause all locos on the track
+    { // pause all tasks 
+      RMFT2 * task=loopTask;
+      while(task) {
+	      task->pause();
+	      task=task->next;
+	      if (task==loopTask) break;
+      }
+    }
+    DCC::setThrottle(0,1,true);  // stop all locos on the track
     pausingTask=(RMFT2 *)1; // Impossible task address
     return true;
     
   case "RESUME"_hk: // </ RESUME>
     if (paramCount!=1) return false;
     pausingTask=NULL;
-    {
+    { // resume all tasks
       RMFT2 * task=loopTask;
       while(task) {
-	if (task->loco) task->driveLoco(task->speedo);
+	      task->resume();
 	      task=task->next;
 	      if (task==loopTask) break;
       }
@@ -301,8 +315,7 @@ bool RMFT2::parseSlash(Print * stream, byte & paramCount, int16_t p[]) {
       uint16_t cab=(paramCount==2)? 0 : p[1];
       int pc=routeLookup->find(route);
       if (pc<0) return false;
-      RMFT2* task=new RMFT2(pc);
-      task->loco=cab;
+      new RMFT2(pc,cab);
     }
     return true;
     

EXRAILMacros.h

@@ -226,6 +226,10 @@ bool exrailHalSetup() {
 #define ONBUTTON(vpin) | FEATURE_SENSOR
 #undef ONSENSOR
 #define ONSENSOR(vpin) | FEATURE_SENSOR
+#undef ONBLOCKENTER
+#define ONBLOCKENTER(blockid) | FEATURE_BLOCK
+#undef ONBLOCKEXIT
+#define ONBLOCKEXIT(blockid) | FEATURE_BLOCK
 
 const byte RMFT2::compileFeatures = 0
    #include "myAutomation.h"
@@ -570,6 +574,8 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
 #define ONACTIVATE(addr,subaddr) OPCODE_ONACTIVATE,V(addr<<2|subaddr),
 #define ONACTIVATEL(linear) OPCODE_ONACTIVATE,V(linear+3),
 #define ONAMBER(signal_id) OPCODE_ONAMBER,V(signal_id),
+#define ONBLOCKENTER(block_id) OPCODE_ONBLOCKENTER,V(block_id),
+#define ONBLOCKEXIT(block_id) OPCODE_ONBLOCKEXIT,V(block_id),
 #define ONCLOSE(turnout_id) OPCODE_ONCLOSE,V(turnout_id),
 #define ONLCC(sender,event) OPCODE_ONLCC,V(event),\
         OPCODE_PAD,V((((uint64_t)sender)>>32)&0xFFFF),\

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202409221903Z"
+#define GITHUB_SHA "devel-railcom2-202409282036Z"

MotorDriver.h

@@ -124,21 +124,9 @@ enum TRACK_MODE : byte {TRACK_MODE_NONE = 1, TRACK_MODE_MAIN = 2, TRACK_MODE_PRO
 
 // Virtualised Motor shield 1-track hardware Interface
 
-#ifndef UNUSED_PIN     // sync define with the one in MotorDrivers.h
-#define UNUSED_PIN 255 // inside uint8_t
-#endif
+#include "Pinpair.h" // for class Pinpair
 #define MAX_PIN 254
 
-class pinpair {
-public:
-  pinpair(byte p1, byte p2) {
-    pin = p1;
-    invpin = p2;
-  };
-  byte pin = UNUSED_PIN;
-  byte invpin = UNUSED_PIN;
-};
-
 #if defined(__IMXRT1062__) || defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_STM32)
 typedef uint32_t portreg_t;
 #else
@@ -209,7 +197,7 @@ class MotorDriver {
 	  pinMode(signalPin2, INPUT);
       }
     };
-    inline pinpair getSignalPin() { return pinpair(signalPin,signalPin2); };
+    inline Pinpair getSignalPin() { return Pinpair(signalPin,signalPin2); };
     inline int8_t getBrakePinSigned() { return invertBrake ? -brakePin : brakePin; };
     void setDCSignal(byte speedByte, uint8_t frequency=0);
     void throttleInrush(bool on);
@@ -285,7 +273,7 @@ class MotorDriver {
     else
       invertPhase = 0;
 #if defined(ARDUINO_ARCH_ESP32)
-    pinpair p = getSignalPin();
+    Pinpair p = getSignalPin();
     uint32_t *outreg = (uint32_t *)(GPIO_FUNC0_OUT_SEL_CFG_REG + 4*p.pin);
     if (invertPhase) // set or clear the invert bit in the gpio out register
       *outreg |=  ((uint32_t)0x1 << GPIO_FUNC0_OUT_INV_SEL_S);

Pinpair.h

@@ -0,0 +1,14 @@
+#pragma once
+#ifndef UNUSED_PIN     // sync define with the one in MotorDrivers.h
+#define UNUSED_PIN 255 // inside uint8_t
+#endif
+class Pinpair {
+public:
+  Pinpair(byte p1, byte p2) {
+    pin = p1;
+    invpin = p2;
+  };
+  byte pin = UNUSED_PIN;
+  byte invpin = UNUSED_PIN;
+};
+

TrackManager.cpp

@@ -218,7 +218,7 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
 
 #ifdef ARDUINO_ARCH_ESP32
     // remove pin from MUX matrix and turn it off
-    pinpair p = track[trackToSet]->getSignalPin();
+    Pinpair p = track[trackToSet]->getSignalPin();
     //DIAG(F("Track=%c remove  pin %d"),trackToSet+'A', p.pin);
     gpio_reset_pin((gpio_num_t)p.pin);
     if (p.invpin != UNUSED_PIN) {