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

Fix <1 JOIN>

Browse Source 
Fixed <1 JOIN> issue in TrackManager
This commit is contained in:
Colin Murdoch
2023-09-27 14:46:48 +01:00
parent 2a46b96083
commit 25bbfa4c68
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
TrackManager.cpp
View File

@@ -417,17 +417,17 @@ std::vector<MotorDriver *>TrackManager::getMainDrivers() {
}
#endif
void TrackManager::setPower2(bool setProg,POWERMODE mode) {
void TrackManager::setPower2(bool setProg,bool setJoin, POWERMODE mode) {
if (!setProg) mainPowerGuess=mode;
FOR_EACH_TRACK(t) {
TrackManager::setTrackPower(setProg, mode, t);
TrackManager::setTrackPower(setProg, setJoin, mode, t);
}
return;
}
void TrackManager::setTrackPower(bool setProg, POWERMODE mode, byte thistrack) {
void TrackManager::setTrackPower(bool setProg, bool setJoin, POWERMODE mode, byte thistrack) {
//DIAG(F("SetTrackPower Processing Track %d"), thistrack);
MotorDriver * driver=track[thistrack];
@@ -445,21 +445,23 @@ void TrackManager::setTrackPower(bool setProg, POWERMODE mode, byte thistrack) {
break;
case TRACK_MODE_DC:
case TRACK_MODE_DCX:
if (setProg) break;
DIAG(F("Processing track - %d setProg %d"), thistrack, setProg);
if (setProg || setJoin) {DIAG(F("Nowt to do")); break;}
driver->setBrake(true); // DC starts with brake on
applyDCSpeed(thistrack); // speed match DCC throttles
driver->setPower(mode);
DIAG(F("Doing it anyway"));
break;
case TRACK_MODE_PROG:
if (!setProg) break;
if (!setProg && !setJoin) break;
driver->setBrake(true);
driver->setBrake(false);
driver->setPower(mode);
break;
case TRACK_MODE_EXT:
driver->setBrake(true);
driver->setBrake(false);
driver->setPower(mode);
driver->setBrake(true);
driver->setBrake(false);
driver->setPower(mode);
break;
case TRACK_MODE_NONE:
break;