1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-07-28 09:53:45 +02:00

Power control plus EXRAIL

Power Control <0 A> etc plus EXRAIL SET_POWER
Not yet fully tested.
This commit is contained in:
Colin Murdoch
2023-09-24 15:40:42 +01:00
parent 8052090e0f
commit aacb980dc8
9 changed files with 66 additions and 45 deletions

View File

@@ -576,7 +576,8 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
}
#endif
else if (p[0] >= 'A' && p[0] <= 'H') { // <1 A-H>
uint8_t t = (p[0] - 'A');
byte t = (p[0] - 'A');
DIAG(F("Processing track - %d "), t);
if (TrackManager::isProg(t)) {
main = false;
prog = true;
@@ -587,8 +588,10 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
prog=false;
}
singletrack=true;
if (main) TrackManager::SetMainTrackPower(POWERMODE::ON, t);
if (prog) TrackManager::SetProgTrackPower(POWERMODE::ON, t);
DIAG(F("Calling SetPower %d - %d - %d"), POWERMODE::ON, false, t);
if (main) TrackManager::setTrackPower(POWERMODE::ON, t);
//if (main) TrackManager::SetMainTrackPower(POWERMODE::ON, t);
//if (prog) TrackManager::SetProgTrackPower(POWERMODE::ON, t);
}
else break; // will reply <X>
}
@@ -621,8 +624,9 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
}
#endif
else if (p[0] >= 'A' && p[0] <= 'H') { // <1 A-H>
uint8_t t = (p[0] - 'A');
if (TrackManager::isProg(t)) {
byte t = (p[0] - 'A');
DIAG(F("Processing track - %d "), t);
if (TrackManager::isProg(t)) {
main = false;
prog = true;
}
@@ -632,8 +636,8 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
prog=false;
}
singletrack=true;
if (main) TrackManager::SetMainTrackPower(POWERMODE::OFF, t);
if (prog) TrackManager::SetProgTrackPower(POWERMODE::OFF, t);
DIAG(F("Calling SetPower %d - %d - %d"), POWERMODE::OFF, false, t);
if (main) TrackManager::setTrackPower(POWERMODE::OFF, t);
}
else break; // will reply <X>