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

EXRAIL LCD macro

Browse Source
This commit is contained in:
Asbelos 2021-08-12 08:53:52 +01:00
parent 22b5d5e4c4
commit 23291b499f
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
RMFTMacros.h
View File

@ -36,6 +36,8 @@
// PRINT(msg) is implemented in a separate pass to create a getMessageText(id) function // PRINT(msg) is implemented in a separate pass to create a getMessageText(id) function
#define V(val) ((int16_t)(val))&0x00FF,((int16_t)(val)>>8)&0x00FF #define V(val) ((int16_t)(val))&0x00FF,((int16_t)(val)>>8)&0x00FF
#define NOP 0,0 #define NOP 0,0
// remove normal code LCD macro (will be restored later)
#undef LCD
// CAUTION: The macros below are triple passed over myAutomation.h // CAUTION: The macros below are triple passed over myAutomation.h
@ -72,6 +74,7 @@
#define INVERT_DIRECTION #define INVERT_DIRECTION
#define JOIN #define JOIN
#define LATCH(sensor_id) #define LATCH(sensor_id)
#define LCD(row,msg)
#define ONCLOSE(turnout_id) #define ONCLOSE(turnout_id)
#define ONTHROW(turnout_id) #define ONTHROW(turnout_id)
#define PAUSE #define PAUSE
@ -111,10 +114,12 @@
#undef EXRAIL #undef EXRAIL
#undef PRINT #undef PRINT
#undef ENDEXRAIL #undef ENDEXRAIL
const int PrintMacroTracker1=__COUNTER__; #undef LCD
const int StringMacroTracker1=__COUNTER__;
#define EXRAIL void RMFT2::printMessage(uint16_t id) { switch(id) { #define EXRAIL void RMFT2::printMessage(uint16_t id) { switch(id) {
#define ENDEXRAIL default: DIAG(F("printMessage error %d %d"),id,PrintMacroTracker1); return ; }} #define ENDEXRAIL default: DIAG(F("printMessage error %d %d"),id,StringMacroTracker1); return ; }}
#define PRINT(msg) case (__COUNTER__ - PrintMacroTracker1) : printMessage2(F(msg));break; #define PRINT(msg) case (__COUNTER__ - StringMacroTracker1) : printMessage2(F(msg));break;
#define LCD(id,msg) case (__COUNTER__ - StringMacroTracker1) : StringFormatter::lcd(id,F(msg));break;
#include "myAutomation.h" #include "myAutomation.h"
#undef ALIAS #undef ALIAS
@ -146,6 +151,7 @@ const int PrintMacroTracker1=__COUNTER__;
#undef INVERT_DIRECTION #undef INVERT_DIRECTION
#undef JOIN #undef JOIN
#undef LATCH #undef LATCH
#undef LCD
#undef ONCLOSE #undef ONCLOSE
#undef ONTHROW #undef ONTHROW
#undef PAUSE #undef PAUSE
@ -207,10 +213,12 @@ const int PrintMacroTracker1=__COUNTER__;
#define INVERT_DIRECTION OPCODE_INVERT_DIRECTION,NOP, #define INVERT_DIRECTION OPCODE_INVERT_DIRECTION,NOP,
#define JOIN OPCODE_JOIN,NOP, #define JOIN OPCODE_JOIN,NOP,
#define LATCH(sensor_id) OPCODE_LATCH,V(sensor_id), #define LATCH(sensor_id) OPCODE_LATCH,V(sensor_id),
#define LCD(id,msg) OPCODE_PRINT,V(__COUNTER__ - StringMacroTracker2),
#define ONCLOSE(turnout_id) OPCODE_ONCLOSE,V(turnout_id), #define ONCLOSE(turnout_id) OPCODE_ONCLOSE,V(turnout_id),
#define ONTHROW(turnout_id) OPCODE_ONTHROW,V(turnout_id), #define ONTHROW(turnout_id) OPCODE_ONTHROW,V(turnout_id),
#define PAUSE OPCODE_PAUSE,NOP, #define PAUSE OPCODE_PAUSE,NOP,
#define POM(cv,value) OPCODE_POM,V(cv),OPCODE_PAD,V(value), #define POM(cv,value) OPCODE_POM,V(cv),OPCODE_PAD,V(value),
#define PRINT(msg) OPCODE_PRINT,V(__COUNTER__ - StringMacroTracker2),
#define READ_LOCO OPCODE_READ_LOCO1,NOP,OPCODE_READ_LOCO2,NOP, #define READ_LOCO OPCODE_READ_LOCO1,NOP,OPCODE_READ_LOCO2,NOP,
#define RED(signal_id) OPCODE_RED,V(signal_id), #define RED(signal_id) OPCODE_RED,V(signal_id),
#define RESERVE(blockid) OPCODE_RESERVE,V(blockid), #define RESERVE(blockid) OPCODE_RESERVE,V(blockid),
@ -227,17 +235,17 @@ const int PrintMacroTracker1=__COUNTER__;
#define SIGNAL(redpin,amberpin,greenpin) OPCODE_SIGNAL,V(redpin),OPCODE_PAD,V(amberpin),OPCODE_PAD,V(greenpin), #define SIGNAL(redpin,amberpin,greenpin) OPCODE_SIGNAL,V(redpin),OPCODE_PAD,V(amberpin),OPCODE_PAD,V(greenpin),
#define SERVO_TURNOUT(pin,activeAngle,inactiveAngle) OPCODE_SERVOTURNOUT,V(pin),OPCODE_PAD,V(actibeAngle),OPCODE #define SERVO_TURNOUT(pin,activeAngle,inactiveAngle) OPCODE_SERVOTURNOUT,V(pin),OPCODE_PAD,V(actibeAngle),OPCODE
#define PIN_TURNOUT(pin) OPCODE_PINTURNOUT,V(pin), #define PIN_TURNOUT(pin) OPCODE_PINTURNOUT,V(pin),
#define PRINT(msg) OPCODE_PRINT,V(__COUNTER__ - PrintMacroTracker2),
#define THROW(id) OPCODE_THROW,V(id), #define THROW(id) OPCODE_THROW,V(id),
#define TURNOUT(id,addr,subaddr) OPCODE_TURNOUT,V(id),OPCODE_PAD,V(addr),OPCODE_PAD,V(subaddr), #define TURNOUT(id,addr,subaddr) OPCODE_TURNOUT,V(id),OPCODE_PAD,V(addr),OPCODE_PAD,V(subaddr),
#define UNJOIN OPCODE_UNJOIN,NOP, #define UNJOIN OPCODE_UNJOIN,NOP,
#define UNLATCH(sensor_id) OPCODE_UNLATCH,V(sensor_id), #define UNLATCH(sensor_id) OPCODE_UNLATCH,V(sensor_id),
// PASS2 Build RouteCode // PASS2 Build RouteCode
const int PrintMacroTracker2=__COUNTER__; const int StringMacroTracker2=__COUNTER__;
#include "myAutomation.h" #include "myAutomation.h"
//================== // Restore normal code LCD macro
#undef LCD
#define LCD StringFormatter::lcd
#endif #endif