mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-24 08:36:14 +01:00
Compare commits
No commits in common. "a7096e782c148f0d07dc694612a9048c2818cdb4" and "2ba5adc8b42bfd5323e09f4bf2b6585321129a8e" have entirely different histories.
a7096e782c
...
2ba5adc8b4
|
@ -1 +1 @@
|
||||||
#define GITHUB_SHA "devel-202311200731Z"
|
#define GITHUB_SHA "devel-202311160737Z"
|
||||||
|
|
|
@ -472,13 +472,12 @@ std::vector<MotorDriver *>TrackManager::getMainDrivers() {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Set track power for all tracks with this mode
|
// Set track power for all tracks with this mode
|
||||||
void TrackManager::setTrackPower(TRACK_MODE trackmodeToMatch, POWERMODE powermode) {
|
void TrackManager::setTrackPower(TRACK_MODE trackmode, POWERMODE powermode) {
|
||||||
FOR_EACH_TRACK(t) {
|
FOR_EACH_TRACK(t) {
|
||||||
MotorDriver *driver=track[t];
|
MotorDriver *driver=track[t];
|
||||||
TRACK_MODE trackmodeOfTrack = driver->getMode();
|
if (trackmode & driver->getMode()) {
|
||||||
if (trackmodeToMatch & trackmodeOfTrack) {
|
|
||||||
if (powermode == POWERMODE::ON) {
|
if (powermode == POWERMODE::ON) {
|
||||||
if (trackmodeOfTrack & TRACK_MODE_DC) {
|
if (trackmode & TRACK_MODE_DC) {
|
||||||
driver->setBrake(true); // DC starts with brake on
|
driver->setBrake(true); // DC starts with brake on
|
||||||
applyDCSpeed(t); // speed match DCC throttles
|
applyDCSpeed(t); // speed match DCC throttles
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
|
|
||||||
#include "StringFormatter.h"
|
#include "StringFormatter.h"
|
||||||
|
|
||||||
#define VERSION "5.2.5"
|
#define VERSION "5.2.3"
|
||||||
// 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
|
||||||
// 5.2.3 - Bugfix: Catch stange input to parser
|
// 5.2.3 - Bugfix: Catch stange input to parser
|
||||||
|
|
Loading…
Reference in New Issue
Block a user