IF_ALL,IF_ANY

Author: Asbelos

EXRAIL2.cpp

@@ -1761,4 +1761,24 @@ void RMFT2::manageRouteCaption(int16_t id,const FSH* caption) {
     CommandDistributor::broadcastRouteCaption(id,caption);
   }
 }
+
+void RMFT2::ifAnyFunc(const int16_t * vpinList, int16_t count) {
+  // Sets skipIf if none found
+  skipIf=false; 
+  for (int v=0;v<count;v++) {
+    int16_t vpin=vpinList[v];
+    if (vpin<0 && IODevice::read(-vpin)==0) return;
+    if (IODevice::read(vpin)>0) return;
+  }
+  skipIf=true; // none found 
+}
 
+void RMFT2::ifAllFunc(const int16_t * vpinList, int16_t count) {
+  skipIf=true; // return skipping if any are wrong
+  for (int v=0;v<count;v++) {
+    int16_t vpin=vpinList[v];
+    if (vpin<0 && IODevice::read(-vpin)>0) return;
+    if (IODevice::read(vpin)==0) return;
+  }
+  skipIf=false; // no failures found 
+}

EXRAIL2.h

@@ -245,6 +245,8 @@ class LookList {
                       OPCODE op2=OPCODE_ENDEXRAIL,OPCODE op3=OPCODE_ENDEXRAIL);
     static uint16_t getOperand(int progCounter,byte n);
     static void killBlinkOnVpin(VPIN pin,uint16_t count=1);
+    static void ifAllFunc(const int16_t * vpinList, int16_t count); 
+    static void ifAnyFunc(const int16_t * vpinList, int16_t count);
     static RMFT2 * loopTask;
     static RMFT2 * pausingTask;
     void delayMe(long millisecs);

EXRAIL2MacroBase.h

@@ -272,6 +272,14 @@
 ///brief Checks sensor state, If false jumps to matching nested ELSE or ENDIF
 ///param vpin  VPIN of sensor. Negative VPIN will invert sensor state.
 
+#define IF_ALL(vpinList...)
+///brief Checks sensor state, If any are false, it jumps to matching nested ELSE or ENDIF
+///param vpinlist  comma separated list of VPINs of sensors. Negative VPIN will invert sensor state.
+
+#define IF_ANY(vpinList...)
+///brief Checks sensor state, If all are false jumps to matching nested ELSE or ENDIF
+///param vpinlist  comma separated list of VPINs of sensors. Negative VPIN will invert sensor state.
+
 #define IFAMBER(signal_id)
 ///brief Checks if signal is in AMBER state.
 ///see IF

EXRAIL2MacroReset.h

@@ -82,6 +82,8 @@
 #undef HAL
 #undef HAL_IGNORE_DEFAULTS
 #undef IF 
+#undef IF_ALL
+#undef IF_ANY
 #undef IFAMBER
 #undef IFCLOSED
 #undef IFGREEN

EXRAILMacros.h

@@ -305,12 +305,30 @@ case (__COUNTER__ - StringMacroTracker1) : {\
 #define IFLOCO(locolist...) \
   case (__COUNTER__ - StringMacroTracker1) : \
   { \
-   const int16_t loco_id_list[]={locolist}; \
+   const int16_t temp[]={locolist}; \
    skipIf=true; \
-   for (size_t i=0; i<sizeof(loco_id_list)/sizeof(loco_id_list[0]); i++) { \
-      if (loco==(uint16_t)loco_id_list[i]) { skipIf=false; break;} \
+   for (size_t i=0; i<sizeof(temp)/sizeof(temp[0]); i++) { \
+      if (loco==(uint16_t)temp[i]) { skipIf=false; break;} \
     } \
-    break;\
+    return;\
+  }
+
+#undef IF_ALL
+#define IF_ALL(vpinList...) \
+  case (__COUNTER__ - StringMacroTracker1) : \
+  { \
+   const int16_t temp[]={vpinList}; \
+   ifAllFunc(temp,sizeof(temp)/sizeof(temp[0])); \
+   return;\
+  }
+
+#undef IF_ANY  
+#define IF_ANY(vpinList...) \
+  case (__COUNTER__ - StringMacroTracker1) : \
+  { \
+   const int16_t temp[]={vpinList}; \
+   ifAnyFunc(temp,sizeof(temp)/sizeof(temp[0])); \
+   return;\
   }
 
 #undef LCD
@@ -563,6 +581,8 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
 #define IFGREEN(signal_id) OPCODE_IFGREEN,V(signal_id),
 #define IFGTE(sensor_id,value) OPCODE_IFGTE,V(sensor_id),OPCODE_PAD,V(value),
 #define IFLOCO(loco_list...) OPCODE_IFLOCO,V(__COUNTER__ - StringMacroTracker2),
+#define IF_ALL(vpinlist...) OPCODE_IFLOCO,V(__COUNTER__ - StringMacroTracker2),
+#define IF_ANY(vpinlist...) OPCODE_IFLOCO,V(__COUNTER__ - StringMacroTracker2),
 #define IFLT(sensor_id,value) OPCODE_IFLT,V(sensor_id),OPCODE_PAD,V(value),
 #define IFNOT(sensor_id) OPCODE_IFNOT,V(sensor_id),
 #define IFRANDOM(percent) OPCODE_IFRANDOM,V(percent),

EXRAILTest.h

@@ -201,5 +201,81 @@ ROUTE(1771,"1771 Test IFLOCO with multiple loco ids")
     PRINT("IFLOCO 1,2,4 test failed")
   ELSE
     PRINT("IFLOCO 1,2,4 test passed")
-  DONE
-  
+  ENDIF
+
+  HAL(Bitmap,1700,10)
+  SET(1702) SET(1703) SET(1704)
+  
+  IF_ANY(1700,1701,1702) 
+    PRINT("IF_ANY 0,1,2 test OK")
+  ELSE
+    PRINT("IF_ANY 0,1,2 test failed")
+  ENDIF
+  
+  IF_ANY(1700,1701,1706) 
+    PRINT("IF_ANY 0,1,6 test failed")
+  ELSE
+    PRINT("IF_ANY 0,1,6 test passed")
+  ENDIF
+  
+  IF_ALL(1702,1703,1704) 
+    PRINT("IF_ALL 2,3,4 test OK")
+  ELSE
+    PRINT("IF_ALL 2,3,4 test failed")
+  ENDIF
+  
+  IF_ALL(1702,1703,1706) 
+    PRINT("IF_ALL 2,3,6 test failed")
+  ELSE
+    PRINT("IF_ALL 2,3,6 test passed")
+  ENDIF
+
+  IF_ANY(1701,-1706)
+    PRINT("IF_ANY 1,-1706 test passed")
+  ELSE
+    PRINT("IF_ANY 1,-1706 test failed")
+  ENDIF
+
+  IF_ALL(1701,-1706)
+    PRINT("IF_ALL 1,-1706 test failed")
+  ELSE
+    PRINT("IF_ALL 1,-1706 test passed")
+  ENDIF
+
+    DONE
+  
+
+
+// Speedometer example
+// Track is =TS1===TS2===TS3= timing between S2 and S3.
+
+ALIAS(TS1,181) ALIAS(TS2,182) ALIAS(TS3,183)
+STEALTH_GLOBAL(
+  byte testStartSpeed=2;
+  byte testEndSpeed=100;
+  byte testStep=10;
+  byte testSpeed;
+  unsigned long testStartTime;
+)
+
+AUTOMATION(9000,"Run Speed Test") // speed test setup
+  STEALTH(testSpeed=testStartSpeed;)
+  PRINT("Starting speed test")
+  REV(20) // reverse loco to start point
+
+SEQUENCE(9001)
+  // make sure loco is at start point
+  AT(TS1) ESTOP
+  // drive loco fwd at testSpeed 
+  STEALTH(DCC::setThrottle(loco,testSpeed,true);)
+  // At timing-start sensor(s2) record time
+  AT(TS2) STEALTH(testStartTime=millis();)
+ // at timing-end sensor(s3) stop and calculate and print speed
+ AT(TS3) ESTOP STEALTH(
+    StringFormatter::send(&USB_SERIAL, 
+       F("Speed %d Time %l\n"), testSpeed, millis()-testStartTime);
+    testSpeed+=testStep;
+    if (testSpeed>testEndSpeed) kill(); // test complete =DONE
+    )
+// Reverse back to start, and test again
+REV(127) FOLLOW(9001)