dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-07-28 18:03:45 +02:00
Code Releases Activity

Tidy up recent changes to Turnout class.

Browse Source
This commit is contained in:
Neil McKechnie
2021-08-20 14:36:18 +01:00
parent b4a3b503bc
commit 482f4b1c79
3 changed files with 79 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Turnouts.cpp
View File

@@ -20,6 +20,14 @@
* along with CommandStation. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef TURNOUTS_CPP
#define TURNOUTS_CPP
// Set the following definition to true for <T id 0> = throw and <T id 1> = close
// or to false for <T id 0> = close and <T id 1> = throw (the original way).
#ifndef USE_LEGACY_TURNOUT_BEHAVIOUR
#define USE_LEGACY_TURNOUT_BEHAVIOUR false
#endif
#include "defines.h"
#include "EEStore.h"
@@ -30,12 +38,6 @@
#include "DIAG.h"
#endif
// Keywords used for turnout configuration.
const int16_t HASH_KEYWORD_SERVO=27709;
const int16_t HASH_KEYWORD_DCC=6436;
const int16_t HASH_KEYWORD_VPIN=-415;
/*
* Protected static data
*/
@@ -46,6 +48,7 @@ const int16_t HASH_KEYWORD_VPIN=-415;
* Public static data
*/
int Turnout::turnoutlistHash = 0;
bool Turnout::useLegacyTurnoutBehaviour = USE_LEGACY_TURNOUT_BEHAVIOUR;
/*
* Protected static functions
@@ -130,8 +133,7 @@ const int16_t HASH_KEYWORD_VPIN=-415;
// Send message to JMRI etc. over Serial USB. This is done here
// to ensure that the message is sent when the turnout operation
// is not initiated by a Serial command.
StringFormatter::send(Serial, F("<H %d %d>\n"), id, closeFlag);
printState(id, &Serial);
return ok;
}
@@ -189,3 +191,12 @@ const int16_t HASH_KEYWORD_VPIN=-415;
return tt;
}
// Display, on the specified stream, the current state of the turnout (1 or 0).
void Turnout::printState(uint16_t id, Print *stream) {
Turnout *tt = get(id);
if (!tt)
StringFormatter::send(stream, F("<H %d %d>\n"),
id, tt->_turnoutData.closed ^ useLegacyTurnoutBehaviour);
}
#endif