mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2025-07-28 09:53:45 +02:00
Nucleo-F4 Timer Sync - speed fix
This commit is contained in:
@@ -738,3 +738,38 @@ TRACK_MODE TrackManager::getMode(byte t) {
|
||||
int16_t TrackManager::returnDCAddr(byte t) {
|
||||
return (trackDCAddr[t]);
|
||||
}
|
||||
|
||||
// Set track power for EACH track, independent of mode
|
||||
// This updates the settings so that speed is correct
|
||||
// following a frequency change - DC mode
|
||||
void TrackManager::setTrackPowerF439ZI(byte t) {
|
||||
MotorDriver *driver=track[t];
|
||||
if (driver == NULL) { // track is not defined at all
|
||||
// DIAG(F("Error: Track %c does not exist"), t+'A');
|
||||
return;
|
||||
}
|
||||
TRACK_MODE trackmode = driver->getMode();
|
||||
POWERMODE powermode = driver->getPower(); // line added to enable processing for DC mode tracks
|
||||
POWERMODE oldpower = driver->getPower();
|
||||
//if (trackmode & TRACK_MODE_NONE) {
|
||||
// driver->setBrake(true); // Track is unused. Brake is good to have.
|
||||
// powermode = POWERMODE::OFF; // Track is unused. Force it to OFF
|
||||
//} else
|
||||
if (trackmode & TRACK_MODE_DC) { // includes inverted DC (called DCX)
|
||||
if (powermode == POWERMODE::ON) {
|
||||
driver->setBrake(true); // DC starts with brake on
|
||||
applyDCSpeed(t); // speed match DCC throttles
|
||||
}
|
||||
}
|
||||
//else /* MAIN PROG EXT BOOST */ {
|
||||
// if (powermode == POWERMODE::ON) {
|
||||
// // toggle brake before turning power on - resets overcurrent error
|
||||
// // on the Pololu board if brake is wired to ^D2.
|
||||
// driver->setBrake(true);
|
||||
// driver->setBrake(false); // DCC runs with brake off
|
||||
// }
|
||||
//}
|
||||
driver->setPower(powermode);
|
||||
if (oldpower != driver->getPower())
|
||||
CommandDistributor::broadcastPower();
|
||||
}
|
Reference in New Issue
Block a user