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

Chgange IFANALOG to IFGTE/IFLT

Browse Source
This commit is contained in:
Asbelos 2021-11-30 13:52:22 +00:00
parent 259696a117
commit 0237c9721f
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
RMFT2.cpp
View File

@ -30,7 +30,7 @@
F10. [DONE] Alias anywhere F10. [DONE] Alias anywhere
F11. [DONE]EXRAIL/ENDEXRAIL unnecessary F11. [DONE]EXRAIL/ENDEXRAIL unnecessary
F12. [DONE] Allow guarded code (as effect of ALIAS anywhere) F12. [DONE] Allow guarded code (as effect of ALIAS anywhere)
F13. [DONE] IFANALOG function F13. [DONE] IFGTE/IFLT function
*/ */
/* EXRAILPlus planned TRANSPARENT additions /* EXRAILPlus planned TRANSPARENT additions
T1. [DONE] RAM based fast lookup for sequences ON* event catchers and signals. T1. [DONE] RAM based fast lookup for sequences ON* event catchers and signals.
@ -499,7 +499,8 @@ bool RMFT2::skipIfBlock() {
kill(F("missing ENDIF"), nest); kill(F("missing ENDIF"), nest);
return false; return false;
case OPCODE_IF: case OPCODE_IF:
case OPCODE_IFANALOG: case OPCODE_IFGTE:
case OPCODE_IFLT:
case OPCODE_IFNOT: case OPCODE_IFNOT:
case OPCODE_IFRANDOM: case OPCODE_IFRANDOM:
case OPCODE_IFRESERVE: case OPCODE_IFRESERVE:
@ -638,9 +639,13 @@ void RMFT2::loop2() {
if (!readSensor(operand)) if (!skipIfBlock()) return; if (!readSensor(operand)) if (!skipIfBlock()) return;
break; break;
case OPCODE_IFANALOG: // do next operand if sensor>= value case OPCODE_IFGTE: // do next operand if sensor>= value
if (IODevice::readAnalogue(operand)<(int)(GET_OPERAND(1))) if (!skipIfBlock()) return; if (IODevice::readAnalogue(operand)<(int)(GET_OPERAND(1))) if (!skipIfBlock()) return;
break; break;
case OPCODE_IFLT: // do next operand if sensor< value
if (IODevice::readAnalogue(operand)>=(int)(GET_OPERAND(1))) if (!skipIfBlock()) return;
break;
case OPCODE_IFNOT: // do next operand if sensor not set case OPCODE_IFNOT: // do next operand if sensor not set
if (readSensor(operand)) if (!skipIfBlock()) return; if (readSensor(operand)) if (!skipIfBlock()) return;

2
RMFT2.h
View File

@ -43,7 +43,7 @@ enum OPCODE : byte {OPCODE_THROW,OPCODE_CLOSE,
OPCODE_PAUSE, OPCODE_RESUME,OPCODE_POWEROFF, OPCODE_PAUSE, OPCODE_RESUME,OPCODE_POWEROFF,
OPCODE_ONCLOSE, OPCODE_ONTHROW, OPCODE_SERVOTURNOUT, OPCODE_PINTURNOUT, OPCODE_ONCLOSE, OPCODE_ONTHROW, OPCODE_SERVOTURNOUT, OPCODE_PINTURNOUT,
OPCODE_PRINT,OPCODE_DCCACTIVATE, OPCODE_PRINT,OPCODE_DCCACTIVATE,
OPCODE_ONACTIVATE,OPCODE_ONDEACTIVATE,OPCODE_IFANALOG, OPCODE_ONACTIVATE,OPCODE_ONDEACTIVATE,OPCODE_IFGTE,OPCODE_IFLT,
OPCODE_ROUTE,OPCODE_AUTOMATION,OPCODE_SEQUENCE,OPCODE_ENDTASK,OPCODE_ENDEXRAIL OPCODE_ROUTE,OPCODE_AUTOMATION,OPCODE_SEQUENCE,OPCODE_ENDTASK,OPCODE_ENDEXRAIL
}; };

6
RMFT2MacroReset.h
View File

@ -52,7 +52,8 @@
#undef FWD #undef FWD
#undef GREEN #undef GREEN
#undef IF #undef IF
#undef IFANALOG #undef IFGTE
#undef IFLT
#undef IFNOT #undef IFNOT
#undef IFRANDOM #undef IFRANDOM
#undef IFRESERVE #undef IFRESERVE
@ -134,7 +135,8 @@
#define FWD(speed) #define FWD(speed)
#define GREEN(signal_id) #define GREEN(signal_id)
#define IF(sensor_id) #define IF(sensor_id)
#define IFANALOG(sensor_id,value) #define IFGTE(sensor_id,value)
#define IFLT(sensor_id,value)
#define IFNOT(sensor_id) #define IFNOT(sensor_id)
#define IFRANDOM(percent) #define IFRANDOM(percent)
#define IFRESERVE(block) #define IFRESERVE(block)

3
RMFTMacros.h
View File

@ -152,7 +152,8 @@ void RMFT2::emitTurnoutDescription(Print* stream,int16_t turnoutid) {
#define FWD(speed) OPCODE_FWD,V(speed), #define FWD(speed) OPCODE_FWD,V(speed),
#define GREEN(signal_id) OPCODE_GREEN,V(signal_id), #define GREEN(signal_id) OPCODE_GREEN,V(signal_id),
#define IF(sensor_id) OPCODE_IF,V(sensor_id), #define IF(sensor_id) OPCODE_IF,V(sensor_id),
#define IFANALOG(sensor_id,value) OPCODE_IFANALOG,V(sensor_id),OPCODE_PAD,V(value), #define IFGTE(sensor_id,value) OPCODE_IFGTE,V(sensor_id),OPCODE_PAD,V(value),
#define IFLT(sensor_id,value) OPCODE_IFLT,V(sensor_id),OPCODE_PAD,V(value),
#define IFNOT(sensor_id) OPCODE_IFNOT,V(sensor_id), #define IFNOT(sensor_id) OPCODE_IFNOT,V(sensor_id),
#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),