mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-12-23 21:01:25 +01:00
Bugfix for issue #299 TurnoutDescription NULL
This commit is contained in:
parent
2c0886bc2f
commit
9e5d780c14
@ -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
|
#endif
|
||||||
F("")
|
if (tdesc == NULL)
|
||||||
#endif
|
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;
|
||||||
|
@ -1 +1 @@
|
|||||||
#define GITHUB_SHA "devel-202301271500Z"
|
#define GITHUB_SHA "devel-202301271742Z"
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user