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

TM Power setting fixes

Browse Source
This commit is contained in:
Asbelos
2022-03-23 17:06:15 +00:00
parent 99c7ff6c3f
commit a10fca2b12
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
TrackManager.cpp
View File

@@ -79,7 +79,10 @@ void TrackManager::Setup(const FSH * shieldname,
void TrackManager::addTrack(byte t, MotorDriver* driver) {
track[t]=driver;
trackMode[t]=TRACK_MODE_OFF;
if (driver) lastTrack=t;
if (driver) {
lastTrack=t;
track[t]->setPower(POWERMODE::OFF);
}
}
void TrackManager::setDCCSignal( bool on) {
@@ -109,12 +112,14 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
if (mode==TRACK_MODE_PROG) {
// only allow 1 track to be prog
FOR_EACH_TRACK(t)
if (trackMode[t]==TRACK_MODE_PROG) trackMode[t]=TRACK_MODE_OFF;
if (trackMode[t]==TRACK_MODE_PROG) {
track[t]->setPower(POWERMODE::OFF);
trackMode[t]=TRACK_MODE_OFF;
}
}
trackMode[trackToSet]=mode;
trackDCAddr[trackToSet]=dcAddr;
// re-evaluate HighAccuracy mode
// We can only do this is all main and prog tracks agree
bool canDo=true;
@@ -122,6 +127,12 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
if (trackMode[t]==TRACK_MODE_MAIN ||trackMode[t]==TRACK_MODE_PROG)
canDo &= track[t]->isPWMCapable();
MotorDriver::usePWM=canDo;
// Normal running tracks are set to the global power state
track[trackToSet]->setPower(
(mode==TRACK_MODE_MAIN || mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX) ?
mainPowerGuess : POWERMODE::OFF);
return true;
}