dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-23 21:01:25 +01:00
Code Releases Activity

Merge branch 'ServoSignal' into TrackManager

Browse Source
This commit is contained in:
Asbelos 2022-04-19 11:35:17 +01:00
commit 21d1f482cf
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DCCEXParser.cpp
View File

@ -88,7 +88,7 @@ Print *DCCEXParser::stashStream = NULL;
RingStream *DCCEXParser::stashRingStream = NULL; RingStream *DCCEXParser::stashRingStream = NULL;
byte DCCEXParser::stashTarget=0; byte DCCEXParser::stashTarget=0;
// This is a JMRI command parser, one instance per incoming stream // This is a JMRI command parser.
// It doesnt know how the string got here, nor how it gets back. // It doesnt know how the string got here, nor how it gets back.
// It knows nothing about hardware or tracks... it just parses strings and // It knows nothing about hardware or tracks... it just parses strings and
// calls the corresponding DCC api. // calls the corresponding DCC api.
@ -159,9 +159,12 @@ int16_t DCCEXParser::splitValues(int16_t result[MAX_COMMAND_PARAMS], const byte
return parameterCount; return parameterCount;
} }
FILTER_CALLBACK DCCEXParser::filterCallback = 0; extern __attribute__((weak)) FILTER_CALLBACK myFilter();
FILTER_CALLBACK DCCEXParser::filterCallback = myFilter;
FILTER_CALLBACK DCCEXParser::filterRMFTCallback = 0; FILTER_CALLBACK DCCEXParser::filterRMFTCallback = 0;
AT_COMMAND_CALLBACK DCCEXParser::atCommandCallback = 0; AT_COMMAND_CALLBACK DCCEXParser::atCommandCallback = 0;
// deprecated
void DCCEXParser::setFilter(FILTER_CALLBACK filter) void DCCEXParser::setFilter(FILTER_CALLBACK filter)
{ {
filterCallback = filter; filterCallback = filter;

1
version.h
View File

@ -12,6 +12,7 @@
// Automatic ALIAS(name) // Automatic ALIAS(name)
// Command Parser now accepts Underscore in Alias Names // Command Parser now accepts Underscore in Alias Names
// 4.0.2 EXRAIL additions: // 4.0.2 EXRAIL additions:
// myFilter automatic detection (no need to call setFilter)
// FIX negative route ids in WIthrottle problem. // FIX negative route ids in WIthrottle problem.
// IFRED(signal_id), IFAMBER(signal_id), IFGREEN(signal_id) // IFRED(signal_id), IFAMBER(signal_id), IFGREEN(signal_id)
// </RED signal_id> </AMBER signal_id> </GREEN signal_id> commands // </RED signal_id> </AMBER signal_id> </GREEN signal_id> commands