IFSTASHED_HERE

Author: Asbelos

EXRAIL2.cpp

@@ -829,6 +829,10 @@ void RMFT2::loop2() {
   case OPCODE_IFSTASH:
     skipIf=Stash::get(operand)==0;
     break;
+  
+  case OPCODE_IFSTASHED_HERE:
+    skipIf=(Stash::get(operand) & 0x7FFF)!=loco;
+    break;
 
 #ifndef IO_NO_HAL
   case OPCODE_IFTTPOSITION: // do block if turntable at this position

EXRAIL2.h

@@ -98,6 +98,7 @@ enum OPCODE : byte {OPCODE_THROW,OPCODE_CLOSE,OPCODE_TOGGLE_TURNOUT,
              OPCODE_IFLOCO,
              OPCODE_IFTTPOSITION,
              OPCODE_IFSTASH,
+             OPCODE_IFSTASHED_HERE,
              OPCODE_IFBITMAP_ALL,OPCODE_IFBITMAP_ANY,
              };
 

EXRAIL2MacroReset.h

@@ -90,6 +90,7 @@
 #undef IFRED
 #undef IFRESERVE
 #undef IFSTASH
+#undef IFSTASHED_HERE
 #undef IFTHROWN
 #undef IFTIMEOUT
 #undef IFTTPOSITION
@@ -637,6 +638,13 @@
  * @param stash_id 
  */
 #define IFSTASH(stash_id) 
+/**
+ * @def IFSTASHED_HERE(stash_id)
+ * @brief Checks if given stash entry has the current loco
+ * @see IF
+ * @param stash_id 
+ */
+#define IFSTASHED_HERE(stash_id) 
 /**
  * @def IFTHROWN(turnout_id)
  * @brief Checks if given turnout is in THROWN state

EXRAILMacros.h

@@ -510,6 +510,7 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
 #define IFRED(signal_id) OPCODE_IFRED,V(signal_id),
 #define IFRESERVE(block) OPCODE_IFRESERVE,V(block),
 #define IFSTASH(stash_id) OPCODE_IFSTASH,V(stash_id),
+#define IFSTASHED_HERE(stash_id) OPCODE_IFSTASHED_HERE,V(stash_id),
 #define IFTHROWN(turnout_id) OPCODE_IFTHROWN,V(turnout_id),
 #define IFTIMEOUT OPCODE_IFTIMEOUT,0,0,
 #ifndef IO_NO_HAL