From 7c1c6dafa1351923f18593a3e79baa370de26823 Mon Sep 17 00:00:00 2001 From: Asbelos Date: Thu, 31 Mar 2022 22:04:40 +0100 Subject: [PATCH] EXRAIL PARSE --- EXRAIL2MacroReset.h | 2 ++ EXRAILMacros.h | 3 +++ version.h | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/EXRAIL2MacroReset.h b/EXRAIL2MacroReset.h index 06318c7..e28452a 100644 --- a/EXRAIL2MacroReset.h +++ b/EXRAIL2MacroReset.h @@ -79,6 +79,7 @@ #undef ONDEACTIVATEL #undef ONCLOSE #undef ONTHROW +#undef PARSE #undef PAUSE #undef PIN_TURNOUT #undef PRINT @@ -180,6 +181,7 @@ #define PAUSE #define PIN_TURNOUT(id,pin,description...) #define PRINT(msg) +#define PARSE(msg) #define POM(cv,value) #define POWEROFF #define POWERON diff --git a/EXRAILMacros.h b/EXRAILMacros.h index 07b75d2..e0b078c 100644 --- a/EXRAILMacros.h +++ b/EXRAILMacros.h @@ -71,6 +71,8 @@ void RMFT2::emitWithrottleDescriptions(Print * stream) { const int StringMacroTracker1=__COUNTER__; #undef BROADCAST #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 #define PRINT(msg) case (__COUNTER__ - StringMacroTracker1) : printMessage2(F(msg));break; #undef LCN @@ -231,6 +233,7 @@ const FLASH int16_t RMFT2::SignalDefinitions[] = { #define POWEROFF OPCODE_POWEROFF,0,0, #define POWERON OPCODE_POWERON,0,0, #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 RED(signal_id) OPCODE_RED,V(signal_id), #define RESERVE(blockid) OPCODE_RESERVE,V(blockid), diff --git a/version.h b/version.h index 9abcc7b..563b10d 100644 --- a/version.h +++ b/version.h @@ -6,8 +6,9 @@ #define VERSION "4.0.2" // 4.0.2 EXRAIL additions: +// PARSE <> commands // VIRTUAL_TURNOUT -// command to stop all tasks. +// and KILLALL command to stop all tasks. // FORGET forgets the current loco in DCC reminder tables. // Servo signals (SERVO_SIGNAL) // High-On signal pins (SIGNALH)