dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-22 23:56:13 +01:00
Code Releases Activity

Fix remaining rmft remnants

Browse Source
This commit is contained in:
FrightRisk 2022-01-30 21:50:43 -05:00
parent eb6b14b848
commit b7af6be1f2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Turnouts.cpp
View File

@ -114,7 +114,7 @@
// I know it says setClosedStateOnly, but we need to tell others // I know it says setClosedStateOnly, but we need to tell others
// that the state has changed too. // that the state has changed too.
#if defined(RMFT_ACTIVE) #if defined(EXRAIL_ACTIVE)
RMFT2::turnoutEvent(id, closeFlag); RMFT2::turnoutEvent(id, closeFlag);
#endif #endif
@ -147,7 +147,7 @@
EEPROM.put(tt->_eepromAddress, tt->_turnoutData.flags); EEPROM.put(tt->_eepromAddress, tt->_turnoutData.flags);
#endif #endif
#if defined(RMFT_ACTIVE) #if defined(EXRAIL_ACTIVE)
RMFT2::turnoutEvent(id, closeFlag); RMFT2::turnoutEvent(id, closeFlag);
#endif #endif

4
WiThrottle.cpp
View File

@ -135,7 +135,7 @@ void WiThrottle::parse(RingStream * stream, byte * cmdx) {
else if (!exRailSent) { else if (!exRailSent) {
// Send EX-RAIL routes list if not already sent (but not at same time as turnouts above) // Send EX-RAIL routes list if not already sent (but not at same time as turnouts above)
exRailSent=true; exRailSent=true;
#ifdef RMFT_ACTIVE #ifdef EXRAIL_ACTIVE
RMFT2::emitWithrottleRouteList(stream); RMFT2::emitWithrottleRouteList(stream);
#endif #endif
// allow heartbeat to slow down once all metadata sent // 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("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("PTT]\\[Turnouts}|{Turnout]\\[THROW}|{2]\\[CLOSE}|{4\n"));
StringFormatter::send(stream,F("PPA%x\n"),DCCWaveform::mainTrack.getPowerMode()==POWERMODE::ON); StringFormatter::send(stream,F("PPA%x\n"),DCCWaveform::mainTrack.getPowerMode()==POWERMODE::ON);
#ifdef RMFT_ACTIVE #ifdef EXRAIL_ACTIVE
RMFT2::emitWithrottleRoster(stream); RMFT2::emitWithrottleRoster(stream);
#endif #endif
// set heartbeat to 1 second because we need to sync the metadata // set heartbeat to 1 second because we need to sync the metadata