dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-23 08:06:13 +01:00
Code Releases Activity

ATTIMEOUT / IFTIMEOUT

Browse Source
This commit is contained in:
Asbelos 2022-01-03 10:15:10 +00:00
parent 1ad4e57332
commit 230a119cd0
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
RMFT2.cpp
View File

@ -432,6 +432,7 @@ RMFT2::RMFT2(int progCtr) {
speedo=0; speedo=0;
forward=true; forward=true;
invert=false; invert=false;
timeoutFlag=false;
stackDepth=0; stackDepth=0;
onTurnoutId=0; // Not handling an ONTHROW/ONCLOSE onTurnoutId=0; // Not handling an ONTHROW/ONCLOSE
@ -508,6 +509,7 @@ bool RMFT2::skipIfBlock() {
case OPCODE_IFRANDOM: case OPCODE_IFRANDOM:
case OPCODE_IFRESERVE: case OPCODE_IFRESERVE:
case OPCODE_IFTHROWN: case OPCODE_IFTHROWN:
case OPCODE_IFTIMEOUT:
nest++; nest++;
break; break;
case OPCODE_ENDIF: case OPCODE_ENDIF:
@ -591,10 +593,29 @@ void RMFT2::loop2() {
break; break;
case OPCODE_AT: case OPCODE_AT:
timeoutFlag=false;
if (readSensor(operand)) break; if (readSensor(operand)) break;
delayMe(50); delayMe(50);
return; return;
case OPCODE_ATTIMEOUT1: // ATTIMEOUT(vpin,timeout) part 1
timeoutStart=millis();
timeoutFlag=false;
break;
case OPCODE_ATTIMEOUT2:
if (readSensor(operand)) break; // success without timeout
if (millis()-timeoutStart > 100*GET_OPERAND(1)) {
timeoutFlag=true;
break; // and drop through
}
delayMe(50);
return;
case OPCODE_IFTIMEOUT: // do next operand if timeout flag set
if (!timeoutFlag) if (!skipIfBlock()) return;
break;
case OPCODE_AFTER: // waits for sensor to hit and then remain off for 0.5 seconds. (must come after an AT operation) case OPCODE_AFTER: // waits for sensor to hit and then remain off for 0.5 seconds. (must come after an AT operation)
if (readSensor(operand)) { if (readSensor(operand)) {
// reset timer to half a second and keep waiting // reset timer to half a second and keep waiting

7
RMFT2.h
View File

@ -31,6 +31,7 @@ enum OPCODE : byte {OPCODE_THROW,OPCODE_CLOSE,
OPCODE_FWD,OPCODE_REV,OPCODE_SPEED,OPCODE_INVERT_DIRECTION, OPCODE_FWD,OPCODE_REV,OPCODE_SPEED,OPCODE_INVERT_DIRECTION,
OPCODE_RESERVE,OPCODE_FREE, OPCODE_RESERVE,OPCODE_FREE,
OPCODE_AT,OPCODE_AFTER,OPCODE_AUTOSTART, OPCODE_AT,OPCODE_AFTER,OPCODE_AUTOSTART,
OPCODE_ATTIMEOUT1,OPCODE_ATTIMEOUT2,OPCODE_IFTIMEOUT,
OPCODE_LATCH,OPCODE_UNLATCH,OPCODE_SET,OPCODE_RESET, OPCODE_LATCH,OPCODE_UNLATCH,OPCODE_SET,OPCODE_RESET,
OPCODE_IF,OPCODE_IFNOT,OPCODE_ENDIF,OPCODE_IFRANDOM,OPCODE_IFRESERVE, OPCODE_IF,OPCODE_IFNOT,OPCODE_ENDIF,OPCODE_IFRANDOM,OPCODE_IFRESERVE,
OPCODE_IFCLOSED, OPCODE_IFTHROWN,OPCODE_ELSE, OPCODE_IFCLOSED, OPCODE_IFTHROWN,OPCODE_ELSE,
@ -127,8 +128,12 @@ private:
RMFT2 *next; // loop chain RMFT2 *next; // loop chain
int progCounter; // Byte offset of next route opcode in ROUTES table int progCounter; // Byte offset of next route opcode in ROUTES table
unsigned long delayStart; // Used by opcodes that must be recalled before completing unsigned long delayStart; // Used by opcodes that must be recalled before completing
unsigned long waitAfter; // Used by OPCODE_AFTER
unsigned long delayTime; unsigned long delayTime;
union {
unsigned long waitAfter; // Used by OPCODE_AFTER
unsigned long timeoutStart; // Used by OPCODE_ATTIMEOUT
};
bool timeoutFlag;
byte taskId; byte taskId;
uint16_t loco; uint16_t loco;

4
RMFT2MacroReset.h
View File

@ -28,6 +28,7 @@
#undef ALIAS #undef ALIAS
#undef AMBER #undef AMBER
#undef AT #undef AT
#undef ATTIMEOUT
#undef AUTOMATION #undef AUTOMATION
#undef AUTOSTART #undef AUTOSTART
#undef CALL #undef CALL
@ -60,6 +61,7 @@
#undef IFRANDOM #undef IFRANDOM
#undef IFRESERVE #undef IFRESERVE
#undef IFTHROWN #undef IFTHROWN
#undef IFTIMEOUT
#undef INVERT_DIRECTION #undef INVERT_DIRECTION
#undef JOIN #undef JOIN
#undef LATCH #undef LATCH
@ -115,6 +117,7 @@
#define ALIAS(name,value) #define ALIAS(name,value)
#define AMBER(signal_id) #define AMBER(signal_id)
#define AT(sensor_id) #define AT(sensor_id)
#define ATTIMEOUT(sensor_id,timeout_ms)
#define AUTOMATION(id, description) #define AUTOMATION(id, description)
#define AUTOSTART #define AUTOSTART
#define CALL(route) #define CALL(route)
@ -147,6 +150,7 @@
#define IFRANDOM(percent) #define IFRANDOM(percent)
#define IFTHROWN(turnout_id) #define IFTHROWN(turnout_id)
#define IFRESERVE(block) #define IFRESERVE(block)
#define IFTIMEOUT
#define INVERT_DIRECTION #define INVERT_DIRECTION
#define JOIN #define JOIN
#define LATCH(sensor_id) #define LATCH(sensor_id)

2
RMFTMacros.h
View File

@ -157,6 +157,7 @@ const FSH * RMFT2::getRosterFunctions(int16_t cabid) {
#define ALIAS(name,value) #define ALIAS(name,value)
#define AMBER(signal_id) OPCODE_AMBER,V(signal_id), #define AMBER(signal_id) OPCODE_AMBER,V(signal_id),
#define AT(sensor_id) OPCODE_AT,V(sensor_id), #define AT(sensor_id) OPCODE_AT,V(sensor_id),
#define ATTIMEOUT(sensor_id,timeout) OPCODE_ATTIMEOUT1,0,0,OPCODE_ATTIMEOUT2,V(sensor_id),OPCODE_PAD,V(timeout/100L),
#define AUTOMATION(id, description) OPCODE_AUTOMATION, V(id), #define AUTOMATION(id, description) OPCODE_AUTOMATION, V(id),
#define AUTOSTART OPCODE_AUTOSTART,0,0, #define AUTOSTART OPCODE_AUTOSTART,0,0,
#define CALL(route) OPCODE_CALL,V(route), #define CALL(route) OPCODE_CALL,V(route),
@ -189,6 +190,7 @@ const FSH * RMFT2::getRosterFunctions(int16_t cabid) {
#define IFRANDOM(percent) OPCODE_IFRANDOM,V(percent), #define IFRANDOM(percent) OPCODE_IFRANDOM,V(percent),
#define IFRESERVE(block) OPCODE_IFRESERVE,V(block), #define IFRESERVE(block) OPCODE_IFRESERVE,V(block),
#define IFTHROWN(turnout_id) OPCODE_IFTHROWN,V(turnout_id), #define IFTHROWN(turnout_id) OPCODE_IFTHROWN,V(turnout_id),
#define IFTIMEOUT OPCODE_IFTIMEOUT,0,0,
#define INVERT_DIRECTION OPCODE_INVERT_DIRECTION,0,0, #define INVERT_DIRECTION OPCODE_INVERT_DIRECTION,0,0,
#define JOIN OPCODE_JOIN,0,0, #define JOIN OPCODE_JOIN,0,0,
#define LATCH(sensor_id) OPCODE_LATCH,V(sensor_id), #define LATCH(sensor_id) OPCODE_LATCH,V(sensor_id),