Merge 183b824a5d into a7096e782c

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202311160737Z"
+#define GITHUB_SHA "devel-202311200731Z"

TrackManager.cpp

@@ -472,12 +472,13 @@ std::vector<MotorDriver *>TrackManager::getMainDrivers() {
 #endif
 
 // Set track power for all tracks with this mode
-void TrackManager::setTrackPower(TRACK_MODE trackmode, POWERMODE powermode) {
+void TrackManager::setTrackPower(TRACK_MODE trackmodeToMatch, POWERMODE powermode) {
   FOR_EACH_TRACK(t) {
     MotorDriver *driver=track[t];
-    if (trackmode & driver->getMode()) {
+    TRACK_MODE trackmodeOfTrack = driver->getMode();
+    if (trackmodeToMatch & trackmodeOfTrack) {
       if (powermode == POWERMODE::ON) {
-	if (trackmode & TRACK_MODE_DC) {
+	if (trackmodeOfTrack & TRACK_MODE_DC) {
 	  driver->setBrake(true);   // DC starts with brake on
 	  applyDCSpeed(t);          // speed match DCC throttles
 	} else {

version.h

@@ -3,7 +3,8 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.2.3"
+#define VERSION "5.2.5"
+// 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.
 //        - Added ROUTE_DISABLED macro in EXRAIL
 // 5.2.3  - Bugfix: Catch stange input to parser