From fa261ec39f2aed620259b1885798566cb51fa758 Mon Sep 17 00:00:00 2001 From: Fred Date: Sun, 30 Jan 2022 21:39:37 -0500 Subject: [PATCH 1/4] Update version.h --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index aa944eb..a4b343a 100644 --- a/version.h +++ b/version.h @@ -3,7 +3,7 @@ #include "StringFormatter.h" -#define VERSION "3.2.0 rc12" +#define VERSION "3.2.0 rc13" // 3.2.0 Major functional and non-functional changes. // New HAL added for I/O (digital and analogue inputs and outputs, servos etc). // Support for MCP23008, MCP23017 and PCF9584 I2C GPIO Extender modules. From eb6b14b84811f69404423fce5e1304b92265f332 Mon Sep 17 00:00:00 2001 From: Fred Date: Mon, 31 Jan 2022 02:39:51 +0000 Subject: [PATCH 2/4] Committing a SHA --- GITHUB_SHA.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h index bb91907..b16388b 100644 --- a/GITHUB_SHA.h +++ b/GITHUB_SHA.h @@ -1 +1 @@ -#define GITHUB_SHA "bd7c8bf" +#define GITHUB_SHA "fa261ec" From b7af6be1f2e3b93a40573b675ec716be6ff74944 Mon Sep 17 00:00:00 2001 From: FrightRisk <37218136+FrightRisk@users.noreply.github.com> Date: Sun, 30 Jan 2022 21:50:43 -0500 Subject: [PATCH 3/4] Fix remaining rmft remnants --- Turnouts.cpp | 4 ++-- WiThrottle.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Turnouts.cpp b/Turnouts.cpp index ff4ecb0..636922d 100644 --- a/Turnouts.cpp +++ b/Turnouts.cpp @@ -114,7 +114,7 @@ // I know it says setClosedStateOnly, but we need to tell others // that the state has changed too. - #if defined(RMFT_ACTIVE) + #if defined(EXRAIL_ACTIVE) RMFT2::turnoutEvent(id, closeFlag); #endif @@ -147,7 +147,7 @@ EEPROM.put(tt->_eepromAddress, tt->_turnoutData.flags); #endif - #if defined(RMFT_ACTIVE) + #if defined(EXRAIL_ACTIVE) RMFT2::turnoutEvent(id, closeFlag); #endif diff --git a/WiThrottle.cpp b/WiThrottle.cpp index 53e956c..312cf93 100644 --- a/WiThrottle.cpp +++ b/WiThrottle.cpp @@ -135,7 +135,7 @@ void WiThrottle::parse(RingStream * stream, byte * cmdx) { else if (!exRailSent) { // Send EX-RAIL routes list if not already sent (but not at same time as turnouts above) exRailSent=true; -#ifdef RMFT_ACTIVE +#ifdef EXRAIL_ACTIVE RMFT2::emitWithrottleRouteList(stream); #endif // allow heartbeat to slow down once all metadata sent @@ -205,7 +205,7 @@ void WiThrottle::parse(RingStream * stream, byte * cmdx) { StringFormatter::send(stream,F("HtDCC-EX v%S, %S, %S, %S\n"), F(VERSION), F(ARDUINO_TYPE), DCC::getMotorShieldName(), F(GITHUB_SHA)); StringFormatter::send(stream,F("PTT]\\[Turnouts}|{Turnout]\\[THROW}|{2]\\[CLOSE}|{4\n")); StringFormatter::send(stream,F("PPA%x\n"),DCCWaveform::mainTrack.getPowerMode()==POWERMODE::ON); -#ifdef RMFT_ACTIVE +#ifdef EXRAIL_ACTIVE RMFT2::emitWithrottleRoster(stream); #endif // set heartbeat to 1 second because we need to sync the metadata From 99a62883c75779de559c67a297a14700795165ef Mon Sep 17 00:00:00 2001 From: FrightRisk <37218136+FrightRisk@users.noreply.github.com> Date: Mon, 31 Jan 2022 02:51:10 +0000 Subject: [PATCH 4/4] Committing a SHA --- GITHUB_SHA.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h index b16388b..c048a48 100644 --- a/GITHUB_SHA.h +++ b/GITHUB_SHA.h @@ -1 +1 @@ -#define GITHUB_SHA "fa261ec" +#define GITHUB_SHA "b7af6be"