mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-24 16:46:13 +01:00
Compare commits
No commits in common. "29ea7460621b7948c45703121a131b6ea95662e2" and "a7096e782c148f0d07dc694612a9048c2818cdb4" have entirely different histories.
29ea746062
...
a7096e782c
|
@ -668,7 +668,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
case '=': // TRACK MANAGER CONTROL <= [params]>
|
case '=': // TRACK MANAGER CONTROL <= [params]>
|
||||||
if (TrackManager::parseEqualSign(stream, params, p))
|
if (TrackManager::parseJ(stream, params, p))
|
||||||
return;
|
return;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
#define GITHUB_SHA "devel-202311211053Z"
|
#define GITHUB_SHA "devel-202311200731Z"
|
||||||
|
|
|
@ -350,7 +350,7 @@ void TrackManager::applyDCSpeed(byte t) {
|
||||||
track[t]->setDCSignal(speedByte);
|
track[t]->setDCSignal(speedByte);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TrackManager::parseEqualSign(Print *stream, int16_t params, int16_t p[])
|
bool TrackManager::parseJ(Print *stream, int16_t params, int16_t p[])
|
||||||
{
|
{
|
||||||
|
|
||||||
if (params==0) { // <=> List track assignments
|
if (params==0) { // <=> List track assignments
|
||||||
|
@ -397,8 +397,8 @@ bool TrackManager::parseEqualSign(Print *stream, int16_t params, int16_t p[])
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// null stream means send to commandDistributor for broadcast
|
|
||||||
void TrackManager::streamTrackState(Print* stream, byte t) {
|
void TrackManager::streamTrackState(Print* stream, byte t) {
|
||||||
|
// null stream means send to commandDistributor for broadcast
|
||||||
if (track[t]==NULL) return;
|
if (track[t]==NULL) return;
|
||||||
auto format=F("<= %d XXX>\n");
|
auto format=F("<= %d XXX>\n");
|
||||||
TRACK_MODE tm = track[t]->getMode();
|
TRACK_MODE tm = track[t]->getMode();
|
||||||
|
@ -433,12 +433,10 @@ void TrackManager::streamTrackState(Print* stream, byte t) {
|
||||||
format=F("<= %c DC %d>\n");
|
format=F("<= %c DC %d>\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stream) { // null stream means send to commandDistributor for broadcast
|
if (stream)
|
||||||
StringFormatter::send(stream,format,'A'+t, trackDCAddr[t]);
|
StringFormatter::send(stream,format,'A'+t, trackDCAddr[t]);
|
||||||
} else {
|
else
|
||||||
CommandDistributor::broadcastTrackState(format,'A'+t, trackDCAddr[t]);
|
CommandDistributor::broadcastTrackState(format,'A'+t, trackDCAddr[t]);
|
||||||
CommandDistributor::broadcastPower();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,7 @@ class TrackManager {
|
||||||
|
|
||||||
static const int16_t MAX_TRACKS=8;
|
static const int16_t MAX_TRACKS=8;
|
||||||
static bool setTrackMode(byte track, TRACK_MODE mode, int16_t DCaddr=0);
|
static bool setTrackMode(byte track, TRACK_MODE mode, int16_t DCaddr=0);
|
||||||
static bool parseEqualSign(Print * stream, int16_t params, int16_t p[]);
|
static bool parseJ(Print * stream, int16_t params, int16_t p[]);
|
||||||
static void loop();
|
static void loop();
|
||||||
static POWERMODE getMainPower();
|
static POWERMODE getMainPower();
|
||||||
static POWERMODE getProgPower();
|
static POWERMODE getProgPower();
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
|
|
||||||
#include "StringFormatter.h"
|
#include "StringFormatter.h"
|
||||||
|
|
||||||
#define VERSION "5.2.6"
|
#define VERSION "5.2.5"
|
||||||
// 5.2.6 - Trackmanager broadcast power state on track mode change
|
|
||||||
// 5.2.5 - Trackmanager: Do not treat TRACK_MODE_ALL as TRACK_MODE_DC
|
// 5.2.5 - Trackmanager: Do not treat TRACK_MODE_ALL as TRACK_MODE_DC
|
||||||
// 5.2.4 - LCD macro will not do diag if that duplicates @ to same target.
|
// 5.2.4 - LCD macro will not do diag if that duplicates @ to same target.
|
||||||
// - Added ROUTE_DISABLED macro in EXRAIL
|
// - Added ROUTE_DISABLED macro in EXRAIL
|
||||||
|
|
Loading…
Reference in New Issue
Block a user