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

Bugfix for issue #299 TurnoutDescription NULL

Browse Source
This commit is contained in:
Harald Barth 2023-01-27 18:42:26 +01:00
parent 2c0886bc2f
commit 9e5d780c14
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
DCCEXParser.cpp
View File

@ -626,14 +626,19 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
else { // <JT id> else { // <JT id>
Turnout * t=Turnout::get(id); Turnout * t=Turnout::get(id);
if (!t || t->isHidden()) StringFormatter::send(stream, F(" %d X"),id); if (!t || t->isHidden()) StringFormatter::send(stream, F(" %d X"),id);
else StringFormatter::send(stream, F(" %d %c \"%S\""), else {
id,t->isThrown()?'T':'C', const FSH *tdesc = NULL;
#ifdef EXRAIL_ACTIVE #ifdef EXRAIL_ACTIVE
RMFT2::getTurnoutDescription(id) tdesc = RMFT2::getTurnoutDescription(id);
#else
F("")
#endif #endif
); if (tdesc == NULL)
StringFormatter::send(stream, F(" %d %c"),
id,t->isThrown()?'T':'C');
else
StringFormatter::send(stream, F(" %d %c \"%S\""),
id,t->isThrown()?'T':'C',
tdesc);
}
} }
StringFormatter::send(stream, F(">\n")); StringFormatter::send(stream, F(">\n"));
return; return;

2
GITHUB_SHA.h
View File

@ -1 +1 @@
#define GITHUB_SHA "devel-202301271500Z" #define GITHUB_SHA "devel-202301271742Z"

3
version.h
View File

@ -4,7 +4,8 @@
#include "StringFormatter.h" #include "StringFormatter.h"
#define VERSION "4.2.11pre1" #define VERSION "4.2.12pre1"
// 4.2.12 Bugfix for issue #299 TurnoutDescription NULL
// 4.2.11 Exrail IFLOCO feature added // 4.2.11 Exrail IFLOCO feature added
// 4.2.10 SIGNAL/SIGNALH bug fix as they were inverted // 4.2.10 SIGNAL/SIGNALH bug fix as they were inverted
// IO_EXIOExpander.h input speed optimisation // IO_EXIOExpander.h input speed optimisation