dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-02-17 06:29:15 +01:00
Code Releases Activity

Separate <L> polling cycle

Browse Source
This commit is contained in:
Asbelos 2024-06-12 16:25:17 +01:00
parent 9f1257bc6c
commit b89508671c
1 changed files with 56 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
EXRAIL2Parser.cpp
View File

@ -61,62 +61,83 @@ void RMFT2::ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16
case 'L': case 'L':
// This entire code block is compiled out if LLC macros not used // This entire code block is compiled out if LLC macros not used
if (!(compileFeatures & FEATURE_LCC)) return; if (!(compileFeatures & FEATURE_LCC)) return;
static int lccProgCounter=0;
static int lccEventIndex=0;
if (paramCount==0) { //<L> LCC adapter introducing self if (paramCount==0) { //<L> LCC adapter introducing self
LCCSerial=stream; // now we know where to send events we raise LCCSerial=stream; // now we know where to send events we raise
opcode=0; // flag command as intercepted
// loop through all possible sent events // loop through all possible sent/waited events
for (int progCounter=0;; SKIPOP) { for (int progCounter=lccProgCounter;; SKIPOP) {
byte opcode=GET_OPCODE; byte exrailOpcode=GET_OPCODE;
if (opcode==OPCODE_ENDEXRAIL) break; switch (exrailOpcode) {
if (opcode==OPCODE_LCC) StringFormatter::send(stream,F("<LS x%h>\n"),getOperand(progCounter,0)); case OPCODE_ENDEXRAIL:
if (opcode==OPCODE_LCCX) { // long form LCC stream->print(F("<LR>\n")); // ready to roll
lccProgCounter=0; // allow a second pass
lccEventIndex=0;
return;
case OPCODE_LCC:
StringFormatter::send(stream,F("<LS x%h>\n"),getOperand(progCounter,0));
SKIPOP;
lccProgCounter=progCounter;
return;
case OPCODE_LCCX: // long form LCC
StringFormatter::send(stream,F("<LS x%h%h%h%h>\n"), StringFormatter::send(stream,F("<LS x%h%h%h%h>\n"),
getOperand(progCounter,1), getOperand(progCounter,1),
getOperand(progCounter,2), getOperand(progCounter,2),
getOperand(progCounter,3), getOperand(progCounter,3),
getOperand(progCounter,0) getOperand(progCounter,0)
); );
} SKIPOP;SKIPOP;SKIPOP;SKIPOP;
if (opcode==OPCODE_ACON) StringFormatter::send(stream,F("<LS x0%h%h>\n"), lccProgCounter=progCounter;
return;
case OPCODE_ACON: // CBUS ACON
case OPCODE_ACOF: // CBUS ACON
StringFormatter::send(stream,F("<LS x%c%h%h>\n"),
exrailOpcode==OPCODE_ACOF?'1':'0',
getOperand(progCounter,0),getOperand(progCounter,1)); getOperand(progCounter,0),getOperand(progCounter,1));
if (opcode==OPCODE_ACOF) StringFormatter::send(stream,F("<LS x1%h%h>\n"), SKIPOP;SKIPOP;
getOperand(progCounter,0),getOperand(progCounter,1)); lccProgCounter=progCounter;
} return;
// we stream the hex events we wish to listen to // we stream the hex events we wish to listen to
// and at the same time build the event index looku. // and at the same time build the event index looku.
case OPCODE_ONLCC:
int eventIndex=0; onLCCLookup[lccEventIndex]=progCounter;
for (int progCounter=0;; SKIPOP) {
byte opcode=GET_OPCODE;
if (opcode==OPCODE_ENDEXRAIL) break;
if (opcode==OPCODE_ONLCC) {
onLCCLookup[eventIndex]=progCounter; // TODO skip...
StringFormatter::send(stream,F("<LL %d x%h%h%h:%h>\n"), StringFormatter::send(stream,F("<LL %d x%h%h%h:%h>\n"),
eventIndex, lccEventIndex,
getOperand(progCounter,1), getOperand(progCounter,1),
getOperand(progCounter,2), getOperand(progCounter,2),
getOperand(progCounter,3), getOperand(progCounter,3),
getOperand(progCounter,0) getOperand(progCounter,0)
); );
eventIndex++; lccEventIndex++;
} SKIPOP;SKIPOP;SKIPOP;SKIPOP;
if (opcode==OPCODE_ONACON || opcode==OPCODE_ONACOF) { lccProgCounter=progCounter;
onLCCLookup[eventIndex]=progCounter; // TODO skip... return;
case OPCODE_ONACON:
case OPCODE_ONACOF:
onLCCLookup[lccEventIndex]=progCounter;
StringFormatter::send(stream,F("<LL %d x%c%h%h>\n"), StringFormatter::send(stream,F("<LL %d x%c%h%h>\n"),
eventIndex, lccEventIndex,
opcode==OPCODE_ONACON?'0':'1', exrailOpcode==OPCODE_ONACOF?'1':'0',
getOperand(progCounter,0),getOperand(progCounter,1) getOperand(progCounter,0),getOperand(progCounter,1)
); );
eventIndex++; lccEventIndex++;
} SKIPOP;SKIPOP;
} lccProgCounter=progCounter;
StringFormatter::send(stream,F("<LR>\n")); // Ready to rumble return;
opcode=0; default:
break; break;
} }
}
}
if (paramCount==1) { // <L eventid> LCC event arrived from adapter if (paramCount==1) { // <L eventid> LCC event arrived from adapter
int16_t eventid=p[0]; int16_t eventid=p[0];
bool reject = eventid<0 || eventid>=countLCCLookup; bool reject = eventid<0 || eventid>=countLCCLookup;