mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-24 00:26:13 +01:00
Compare commits
No commits in common. "796d5c47748a4c189f2b04c1e3215f6f54a2c9b2" and "c336ab0bb49c2be2c4cd2468fea73fd62b63578b" have entirely different histories.
796d5c4774
...
c336ab0bb4
|
@ -334,14 +334,12 @@ 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
|
||||||
const FSH *desc = getTurnoutDescription(t->getId());
|
t->setHidden(GETFLASH(getTurnoutDescription(t->getId()))==0x01);
|
||||||
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) {
|
||||||
const FSH *desc = getTurntableDescription(tto->getId());
|
tto->setHidden(GETFLASH(getTurntableDescription(tto->getId()))==0x01);
|
||||||
if (desc) tto->setHidden(GETFLASH(desc)==0x01);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -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>
|
||||||
int16_t id=p[1];
|
uint16_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));
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
#define GITHUB_SHA "devel-202401100719Z"
|
#define GITHUB_SHA "devel-202401081219Z"
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
|
|
||||||
#include "StringFormatter.h"
|
#include "StringFormatter.h"
|
||||||
|
|
||||||
#define VERSION "5.2.22"
|
#define VERSION "5.2.21"
|
||||||
// 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
|
||||||
|
|
Loading…
Reference in New Issue
Block a user