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

Merge branch 'master' into devel

Browse Source
This commit is contained in:
Asbelos 2023-10-12 11:07:39 +01:00
commit 7db4a9575a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DCCEXParser.cpp
View File

@ -805,11 +805,15 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
SENDFLASHLIST(stream,RMFT2::rosterIdList) SENDFLASHLIST(stream,RMFT2::rosterIdList)
} }
else { else {
const FSH * functionNames= RMFT2::getRosterFunctions(id); auto rosterName= RMFT2::getRosterName(id);
StringFormatter::send(stream,F(" %d \"%S\" \"%S\""), if (!rosterName) rosterName=F("");
id, RMFT2::getRosterName(id),
functionNames == NULL ? RMFT2::getRosterFunctions(0) : functionNames); auto functionNames= RMFT2::getRosterFunctions(id);
} if (!functionNames) functionNames=RMFT2::getRosterFunctions(0);
if (!functionNames) functionNames=F("");
StringFormatter::send(stream,F(" %d \"%S\" \"%S\""),
id, rosterName, functionNames);
}
#endif #endif
StringFormatter::send(stream, F(">\n")); StringFormatter::send(stream, F(">\n"));
return; return;