dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-07-28 09:53:45 +02:00
Code Releases Activity

Descriptions available

Browse Source
This commit is contained in:
peteGSX
2023-09-07 05:33:26 +10:00
parent 1f5f7754c1
commit 21ce87eb3e
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DCCEXParser.cpp
View File

@@ -702,6 +702,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
if (tto->isHidden()) continue;
StringFormatter::send(stream, F(" %d"),tto->getId());
}
StringFormatter::send(stream, F(">\n"));
} else { // <JO id>
Turntable *tto=Turntable::get(id);
if (!tto || tto->isHidden()) {
@@ -711,19 +712,25 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
uint8_t type = tto->isEXTT();
uint8_t posCount = tto->getPositionCount();
const FSH *todesc = NULL;
const FSH *tpdesc = NULL;
#ifdef EXRAIL_ACTIVE
todesc = RMFT2::getTurntableDescription(id);
#endif
if (todesc == NULL) todesc = F("");
StringFormatter::send(stream, F(" %d %d %d"), id, type, pos, todesc);
StringFormatter::send(stream, F(" %d %d %d %d \"%S\">\n"), id, type, pos, posCount, todesc);
for (uint8_t p = 0; p < posCount; p++) {
StringFormatter::send(stream, F("jO>"));
int16_t value = tto->getPositionValue(p);
StringFormatter::send(stream, F(" %d"), value);
#ifdef EXRAIL_ACTIVE
tpdesc = RMFT2::getTurntablePositionDescription(id, p);
#endif
if (tpdesc == NULL) todesc = F("");
StringFormatter::send(stream, F(" %d \"%S\""), value, tpdesc);
StringFormatter::send(stream, F(">\n"));
}
}
}
StringFormatter::send(stream, F(">\n"));
return;
#endif
default: break;