mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-26 17:46:14 +01:00
977802f160
Prepping for version 4.1 SERVO_SIGNAL definition in EXRAIL SERVO_SIGNAL(vpin, redpos, amberpos, greenpos) use RED/AMBER/GREEN as for led signals. * SIGNALH, ATGTE, ATLT UNTESTED * Automatic ALIAS(name) and _ in keywords * EXRAIL FORGET current loco * EXRAIL </KILL ALL> * EXRAIL VIRTUAL_TURNOUT * Cleanup version.h * Update version.h (#223) Rewrite & Updated the 4.0.0 Section * </KILL ALL> fix * Incoming LCN turnout throw. * KILLALL macro and DIAGNOSTIC messages when KILL command used. * EXRAIL PARSE * Rebuild throttle info getters UNTESTED... create different methods to obtain throttle info without being withrottle specific. Also implements turnout description of "*" as hidden. * J command parsing JA JR JT commands parsed EXRAIL sets hidden turnout state HIDDEN description macro Turnouts hidden flag bit UNO seems OK, MEGA UNTESTED * Assist notes draft & syntax tweaks * Throttle notes * uno memory saver * JA JR and <t cab> * Subtle corrections * Update version.h * I2C code corrections Corrections to I2C code: 1) I2CManager_Mega4809.h: Correct bitwise 'and' to logical 'and' - no impact. 2) I2CManager_Wire.h: Ensure that error codes from Wire subsystem are passed back to caller in queueRequest(). * RAG Ifs and cmds * IF block perf/memory * Allow negative route ids. * correct GREEN keyword * Update version.h * myFilter auto detect * Update version.h * fix weak ref to myFilter * ACK defaults now 50-2000-20000 * Update version.h * Improved SIGNALs startup and diagnostics * Update IO_PCA9685.cpp * Allow turnout id 0 * Position servo pin used as GPIO * NoPowerOff LEDS * CALLBACK parameter optional for Write * WRITE CV ON PROG <W CV VALUE> Callback parameters are now optional on PROG * Updated CV read command <R cv> Equivalent to <V cv 0> uses the verify callback. Co-authored-by: Asbelos <asbelos@btinternet.com> Co-authored-by: Kcsmith0708 <kcsmith0708@wowway.com> Co-authored-by: Neil McKechnie <neilmck999@gmail.com> Co-authored-by: Ash-4 <81280775+Ash-4@users.noreply.github.com>
77 lines
2.3 KiB
C++
77 lines
2.3 KiB
C++
/*
|
|
* © 2021, Chris Harlow. All rights reserved.
|
|
*
|
|
* This file is part of DCC-EX CommandStation-EX
|
|
*
|
|
* This is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* It is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with CommandStation. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "LCN.h"
|
|
#include "DIAG.h"
|
|
#include "Turnouts.h"
|
|
#include "Sensors.h"
|
|
|
|
int LCN::id = 0;
|
|
Stream * LCN::stream=NULL;
|
|
bool LCN::firstLoop=true;
|
|
|
|
void LCN::init(Stream & lcnstream) {
|
|
stream=&lcnstream;
|
|
DIAG(F("LCN connection setup"));
|
|
}
|
|
|
|
|
|
// Inbound LCN traffic is postfix notation... nnnX where nnn is an id, X is the opcode
|
|
void LCN::loop() {
|
|
if (!stream) return;
|
|
if (firstLoop) {
|
|
firstLoop=false;
|
|
stream->println('X');
|
|
return;
|
|
}
|
|
|
|
while (stream->available()) {
|
|
int ch = stream->read();
|
|
if (ch >= 0 && ch <= '9') { // accumulate id value
|
|
id = 10 * id + ch - '0';
|
|
}
|
|
else if (ch == 't' || ch == 'T') { // Turnout opcodes
|
|
if (Diag::LCN) DIAG(F("LCN IN %d%c"),id,(char)ch);
|
|
if (!Turnout::exists(id)) LCNTurnout::create(id);
|
|
Turnout::setClosedStateOnly(id,ch=='t');
|
|
id = 0;
|
|
}
|
|
else if (ch == 'y' || ch == 'Y') { // Turnout opcodes
|
|
if (Diag::LCN) DIAG(F("LCN IN %d%c"),id,(char)ch);
|
|
Turnout::setClosed(id,ch=='y');
|
|
id = 0;
|
|
}
|
|
else if (ch == 'S' || ch == 's') {
|
|
if (Diag::LCN) DIAG(F("LCN IN %d%c"),id,(char)ch);
|
|
Sensor * ss = Sensor::get(id);
|
|
if (!ss) ss = Sensor::create(id, VPIN_NONE, 0); // impossible pin
|
|
ss->setState(ch == 'S');
|
|
id = 0;
|
|
}
|
|
else id = 0; // ignore any other garbage from LCN
|
|
}
|
|
}
|
|
|
|
void LCN::send(char opcode, int id, bool state) {
|
|
if (stream) {
|
|
StringFormatter::send(stream,F("%c/%d/%d"), opcode, id , state);
|
|
if (Diag::LCN) DIAG(F("LCN OUT %c/%d/%d"), opcode, id , state);
|
|
}
|
|
}
|