1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-24 08:36:14 +01:00

Compare commits

...

3 Commits

Author SHA1 Message Date
Kcsmith0708
52bc6990eb
Merge 2afb5f3d6c into 1f05ef42d2 2023-11-27 01:14:04 -07:00
Harald Barth
1f05ef42d2 Change from TrackManager::returnMode to TrackManager::getMode 2023-11-27 08:15:07 +01:00
Kcsmith0708
2afb5f3d6c
Update version.h
Added Updated Versiom 4.1.1 thru 4.1.6
2023-08-24 14:57:57 -04:00
4 changed files with 16 additions and 6 deletions

View File

@ -1 +1 @@
#define GITHUB_SHA "devel-202311232114Z" #define GITHUB_SHA "devel-202311270714Z"

View File

@ -641,7 +641,7 @@ bool TrackManager::isProg(byte t) {
return false; return false;
} }
byte TrackManager::returnMode(byte t) { TRACK_MODE TrackManager::getMode(byte t) {
return (track[t]->getMode()); return (track[t]->getMode());
} }

View File

@ -92,7 +92,7 @@ class TrackManager {
static void streamTrackState(Print* stream, byte t); static void streamTrackState(Print* stream, byte t);
static bool isPowerOn(byte t); static bool isPowerOn(byte t);
static bool isProg(byte t); static bool isProg(byte t);
static byte returnMode(byte t); static TRACK_MODE getMode(byte t);
static int16_t returnDCAddr(byte t); static int16_t returnDCAddr(byte t);
static const FSH* getModeName(TRACK_MODE Mode); static const FSH* getModeName(TRACK_MODE Mode);

View File

@ -3,7 +3,8 @@
#include "StringFormatter.h" #include "StringFormatter.h"
#define VERSION "5.2.10" #define VERSION "5.2.11"
// 5.2.11 - Change from TrackManager::returnMode to TrackManager::getMode
// 5.2.10 - Include trainbrains.eu block unoccupancy driver // 5.2.10 - Include trainbrains.eu block unoccupancy driver
// - include IO_PCA9555 // - include IO_PCA9555
// 5.2.9 - Bugfix LCD startup with no LCD, uses <@ // 5.2.9 - Bugfix LCD startup with no LCD, uses <@
@ -197,9 +198,18 @@
// TrackManager DCC & DC up to 8 Districts Architecture // TrackManager DCC & DC up to 8 Districts Architecture
// Automatic ALIAS(name) // Automatic ALIAS(name)
// Command Parser now accepts Underscore in Alias Names // 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 Turnout Description 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 // 4.1.1 Bugfix: preserve turnout format
// Bugfix: parse multiple commands in one buffer string correct // Bugfix: parse multiple commands in one buffer string correctly (ex: <s><Q>)
// Bugfix: </> command signal status in Exrail // Bugfix: </> command signal status of EX-RAIL tasks or threads
// Bugfix: EX-RAIL read long loco address
// 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.1.0 ...
// //
// 4.0.2 EXRAIL additions: // 4.0.2 EXRAIL additions: