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

Merge branch 'devel-stm32-cmri' of https://github.com/DCC-EX/CommandStation-EX into devel-stm32-cmri

Browse Source
This commit is contained in:
Harald Barth 2024-01-10 09:17:00 +01:00
commit 6f797b2e15
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
EXRAIL2.cpp
View File

@ -333,13 +333,15 @@ if (compileFeatures & FEATURE_SIGNAL) {
} }
void RMFT2::setTurnoutHiddenState(Turnout * t) { void RMFT2::setTurnoutHiddenState(Turnout * t) {
// turnout descriptions are in low flash F strings // turnout descriptions are in low flash F strings
t->setHidden(GETFLASH(getTurnoutDescription(t->getId()))==0x01); const FSH *desc = getTurnoutDescription(t->getId());
if (desc) t->setHidden(GETFLASH(desc)==0x01);
} }
#ifndef IO_NO_HAL #ifndef IO_NO_HAL
void RMFT2::setTurntableHiddenState(Turntable * tto) { void RMFT2::setTurntableHiddenState(Turntable * tto) {
tto->setHidden(GETFLASH(getTurntableDescription(tto->getId()))==0x01); const FSH *desc = getTurntableDescription(tto->getId());
if (desc) tto->setHidden(GETFLASH(desc)==0x01);
} }
#endif #endif

2
EXRAIL2Parser.cpp
View File

@ -134,7 +134,7 @@ void RMFT2::ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16
return; return;
} }
if (paramCount==2) { // <JA id> if (paramCount==2) { // <JA id>
uint16_t id=p[1]; int16_t id=p[1];
StringFormatter::send(stream,F("<jA %d %c \"%S\">\n"), StringFormatter::send(stream,F("<jA %d %c \"%S\">\n"),
id, getRouteType(id), getRouteDescription(id)); id, getRouteType(id), getRouteDescription(id));

2
GITHUB_SHA.h
View File

@ -1 +1 @@
#define GITHUB_SHA "devel-202401081219Z" #define GITHUB_SHA "devel-202401100719Z"

3
version.h
View File

@ -3,7 +3,8 @@
#include "StringFormatter.h" #include "StringFormatter.h"
#define VERSION "5.2.21ethCdf" #define VERSION "5.2.22ethCdf"
// 5.2.22 - Bugfixes: Empty turnout descriptions ok; negative route numbers valid.
// 5.2.21 - Add STARTUP_DELAY config option to delay CS bootup // 5.2.21 - Add STARTUP_DELAY config option to delay CS bootup
// 5.2.20 - Check return of Ethernet.begin() // 5.2.20 - Check return of Ethernet.begin()
// 5.2.19 - ESP32: Determine if the RMT hardware can handle DCC // 5.2.19 - ESP32: Determine if the RMT hardware can handle DCC