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

EXRAIL PARSE

Browse Source
This commit is contained in:
Asbelos 2022-03-31 22:04:40 +01:00
parent 731d838e83
commit 7c1c6dafa1
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EXRAIL2MacroReset.h
View File

@ -79,6 +79,7 @@
#undef ONDEACTIVATEL #undef ONDEACTIVATEL
#undef ONCLOSE #undef ONCLOSE
#undef ONTHROW #undef ONTHROW
#undef PARSE
#undef PAUSE #undef PAUSE
#undef PIN_TURNOUT #undef PIN_TURNOUT
#undef PRINT #undef PRINT
@ -180,6 +181,7 @@
#define PAUSE #define PAUSE
#define PIN_TURNOUT(id,pin,description...) #define PIN_TURNOUT(id,pin,description...)
#define PRINT(msg) #define PRINT(msg)
#define PARSE(msg)
#define POM(cv,value) #define POM(cv,value)
#define POWEROFF #define POWEROFF
#define POWERON #define POWERON

3
EXRAILMacros.h
View File

@ -71,6 +71,8 @@ void RMFT2::emitWithrottleDescriptions(Print * stream) {
const int StringMacroTracker1=__COUNTER__; const int StringMacroTracker1=__COUNTER__;
#undef BROADCAST #undef BROADCAST
#define BROADCAST(msg) case (__COUNTER__ - StringMacroTracker1) : CommandDistributor::broadcastText(F(msg));break; #define BROADCAST(msg) case (__COUNTER__ - StringMacroTracker1) : CommandDistributor::broadcastText(F(msg));break;
#undef PARSE
#define PARSE(msg) case (__COUNTER__ - StringMacroTracker1) : DCCEXParser::parse(F(msg));break;
#undef PRINT #undef PRINT
#define PRINT(msg) case (__COUNTER__ - StringMacroTracker1) : printMessage2(F(msg));break; #define PRINT(msg) case (__COUNTER__ - StringMacroTracker1) : printMessage2(F(msg));break;
#undef LCN #undef LCN
@ -231,6 +233,7 @@ const FLASH int16_t RMFT2::SignalDefinitions[] = {
#define POWEROFF OPCODE_POWEROFF,0,0, #define POWEROFF OPCODE_POWEROFF,0,0,
#define POWERON OPCODE_POWERON,0,0, #define POWERON OPCODE_POWERON,0,0,
#define PRINT(msg) OPCODE_PRINT,V(__COUNTER__ - StringMacroTracker2), #define PRINT(msg) OPCODE_PRINT,V(__COUNTER__ - StringMacroTracker2),
#define PARSE(msg) PRINT(msg)
#define READ_LOCO OPCODE_READ_LOCO1,0,0,OPCODE_READ_LOCO2,0,0, #define READ_LOCO OPCODE_READ_LOCO1,0,0,OPCODE_READ_LOCO2,0,0,
#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),

3
version.h
View File

@ -6,8 +6,9 @@
#define VERSION "4.0.2" #define VERSION "4.0.2"
// 4.0.2 EXRAIL additions: // 4.0.2 EXRAIL additions:
// PARSE <> commands
// VIRTUAL_TURNOUT // VIRTUAL_TURNOUT
// </KILL ALL> command to stop all tasks. // </KILL ALL> and KILLALL command to stop all tasks.
// FORGET forgets the current loco in DCC reminder tables. // FORGET forgets the current loco in DCC reminder tables.
// Servo signals (SERVO_SIGNAL) // Servo signals (SERVO_SIGNAL)
// High-On signal pins (SIGNALH) // High-On signal pins (SIGNALH)