Merge 183b824a5d into a7096e782c

Added v4.1.6 Support EX-MotorShield8874

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()) {
+    MotorDriver *driver=track[t];
+    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
@@ -186,9 +187,18 @@
 //       TrackManager DCC & DC up to 8 Districts Architecture 
 //       Automatic ALIAS(name) 
 //       Command Parser now accepts Underscore in Alias Names
+// 4.1.6 Support for new EX-MotorShield8874 Dual 5Amp Shield
+// 4.1.5 Bugfix LCN number parsing
+// 4.1.4 Bugfix for issue #299 TurnoutDescription NULL
+// 4.1.3 Bugfix: Ethernet init order
+// 4.1.2 Bugfix: Ethernet shield W5100 does not report HW or link level
 // 4.1.1 Bugfix: preserve turnout format
-//       Bugfix: parse multiple commands in one buffer string correct
-//       Bugfix: </> command signal status in Exrail
+//       Bugfix: parse multiple commands in one buffer string correctly (ex: <s><Q>)
+//       Bugfix: </> command signal status of EX-RAIL tasks or threads
+//       Bugfix: EX-RAIL read long loco addr
+//       Bugfix: Add space character after version string 4.1.1 for JMRI parsing.
+//       Improved display and loop time for signals make service start to be outside the DONT_TOUCH_WIFI_CONF area
+//       Improve WiFi startup by making service start to be outside the DONT_TOUCH_WIFI_CONF area
 // 4.1.0 ...
 //
 // 4.0.2 EXRAIL additions: