2020-10-12 20:32:47 +02:00
|
|
|
/*
|
2022-01-07 02:28:35 +01:00
|
|
|
* © 2022 Harald Barth
|
|
|
|
* © 2020-2021 Chris Harlow
|
|
|
|
* © 2020 Gregor Baues
|
2023-04-19 20:45:40 +02:00
|
|
|
* © 2022 Colin Murdoch
|
2022-01-07 02:28:35 +01:00
|
|
|
* All rights reserved.
|
2022-01-06 23:03:57 +01:00
|
|
|
*
|
2020-10-12 20:32:47 +02:00
|
|
|
* This file is part of 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/>.
|
|
|
|
*/
|
2021-12-05 13:08:59 +01:00
|
|
|
|
2020-10-05 19:42:31 +02:00
|
|
|
#include <Arduino.h>
|
|
|
|
#include "CommandDistributor.h"
|
2021-12-05 13:08:59 +01:00
|
|
|
#include "SerialManager.h"
|
2020-10-05 19:42:31 +02:00
|
|
|
#include "WiThrottle.h"
|
2021-12-05 13:08:59 +01:00
|
|
|
#include "DIAG.h"
|
|
|
|
#include "defines.h"
|
|
|
|
#include "DCCWaveform.h"
|
2021-12-05 19:06:28 +01:00
|
|
|
#include "DCC.h"
|
2022-02-23 16:44:34 +01:00
|
|
|
#include "TrackManager.h"
|
2023-01-21 11:18:54 +01:00
|
|
|
#include "StringFormatter.h"
|
|
|
|
|
|
|
|
// variables to hold clock time
|
|
|
|
int16_t lastclocktime;
|
|
|
|
int8_t lastclockrate;
|
2021-12-05 13:08:59 +01:00
|
|
|
|
|
|
|
|
2022-07-06 18:05:34 +02:00
|
|
|
#if WIFI_ON || ETHERNET_ON || defined(SERIAL1_COMMANDS) || defined(SERIAL2_COMMANDS) || defined(SERIAL3_COMMANDS)
|
2022-08-19 14:33:04 +02:00
|
|
|
// use a buffer to allow broadcast
|
|
|
|
StringBuffer * CommandDistributor::broadcastBufferWriter=new StringBuffer();
|
|
|
|
template<typename... Targs> void CommandDistributor::broadcastReply(clientType type, Targs... msg){
|
|
|
|
broadcastBufferWriter->flush();
|
|
|
|
StringFormatter::send(broadcastBufferWriter, msg...);
|
|
|
|
broadcastToClients(type);
|
|
|
|
}
|
2022-06-10 13:22:28 +02:00
|
|
|
#else
|
2022-08-19 14:33:04 +02:00
|
|
|
// on a single USB connection config, write direct to Serial and ignore flush/shove
|
|
|
|
template<typename... Targs> void CommandDistributor::broadcastReply(clientType type, Targs... msg){
|
|
|
|
(void)type; //shut up compiler warning
|
2023-02-15 01:51:21 +01:00
|
|
|
StringFormatter::send(&USB_SERIAL, msg...);
|
2022-08-19 14:33:04 +02:00
|
|
|
}
|
2022-06-10 13:22:28 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CD_HANDLE_RING
|
|
|
|
// wifi or ethernet ring streams with multiple client types
|
|
|
|
RingStream * CommandDistributor::ring=0;
|
|
|
|
CommandDistributor::clientType CommandDistributor::clients[8]={
|
|
|
|
NONE_TYPE,NONE_TYPE,NONE_TYPE,NONE_TYPE,NONE_TYPE,NONE_TYPE,NONE_TYPE,NONE_TYPE};
|
|
|
|
|
|
|
|
// Parse is called by Withrottle or Ethernet interface to determine which
|
|
|
|
// protocol the client is using and call the appropriate part of dcc++Ex
|
2021-12-05 13:08:59 +01:00
|
|
|
void CommandDistributor::parse(byte clientId,byte * buffer, RingStream * stream) {
|
2022-07-15 15:45:25 +02:00
|
|
|
if (Diag::WIFI && Diag::CMD)
|
|
|
|
DIAG(F("Parse C=%d T=%d B=%s"),clientId, clients[clientId], buffer);
|
2021-12-05 13:08:59 +01:00
|
|
|
ring=stream;
|
2022-07-15 15:45:25 +02:00
|
|
|
|
|
|
|
// First check if the client is not known
|
|
|
|
// yet and in that case determinine type
|
|
|
|
// NOTE: First character of transmission determines if this
|
|
|
|
// client is using the DCC++ protocol where all commands start
|
|
|
|
// with '<'
|
|
|
|
if (clients[clientId] == NONE_TYPE) {
|
|
|
|
if (buffer[0] == '<')
|
|
|
|
clients[clientId]=COMMAND_TYPE;
|
|
|
|
else
|
|
|
|
clients[clientId]=WITHROTTLE_TYPE;
|
|
|
|
}
|
|
|
|
|
2022-08-16 19:22:19 +02:00
|
|
|
// mark buffer that is sent to parser
|
|
|
|
ring->mark(clientId);
|
|
|
|
|
2022-07-15 15:45:25 +02:00
|
|
|
// When type is known, send the string
|
|
|
|
// to the right parser
|
2022-08-16 19:22:19 +02:00
|
|
|
if (clients[clientId] == COMMAND_TYPE) {
|
2022-01-06 23:03:57 +01:00
|
|
|
DCCEXParser::parse(stream, buffer, ring);
|
2022-08-16 19:22:19 +02:00
|
|
|
} else if (clients[clientId] == WITHROTTLE_TYPE) {
|
2021-12-05 13:08:59 +01:00
|
|
|
WiThrottle::getThrottle(clientId)->parse(ring, buffer);
|
2022-08-16 19:22:19 +02:00
|
|
|
}
|
2022-07-15 15:45:25 +02:00
|
|
|
|
2022-08-16 19:22:19 +02:00
|
|
|
if (ring->peekTargetMark()!=RingStream::NO_CLIENT) {
|
|
|
|
// The commit call will either write the length bytes
|
|
|
|
// OR rollback to the mark because the reply is empty
|
|
|
|
// or the command generated more output than fits in
|
|
|
|
// the buffer
|
|
|
|
if (!ring->commit()) {
|
|
|
|
DIAG(F("OUTBOUND FULL processing cmd:%s"),buffer);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
DIAG(F("CD parse: was alredy committed")); //XXX Could have been committed by broadcastClient?!
|
|
|
|
}
|
2021-12-05 13:08:59 +01:00
|
|
|
}
|
2020-10-05 19:42:31 +02:00
|
|
|
|
2021-12-05 13:08:59 +01:00
|
|
|
void CommandDistributor::forget(byte clientId) {
|
2022-12-16 14:14:48 +01:00
|
|
|
if (clients[clientId]==WITHROTTLE_TYPE) WiThrottle::forget(clientId);
|
2022-01-06 23:03:57 +01:00
|
|
|
clients[clientId]=NONE_TYPE;
|
2023-11-14 20:41:05 +01:00
|
|
|
if (virtualLCDClient==clientId) virtualLCDClient=RingStream::NO_CLIENT;
|
2020-10-05 19:42:31 +02:00
|
|
|
}
|
2022-06-10 13:22:28 +02:00
|
|
|
#endif
|
2021-12-05 13:08:59 +01:00
|
|
|
|
2022-06-10 13:22:28 +02:00
|
|
|
// This will not be called on a uno
|
|
|
|
void CommandDistributor::broadcastToClients(clientType type) {
|
2021-12-05 13:08:59 +01:00
|
|
|
|
2022-08-16 09:38:40 +02:00
|
|
|
byte rememberClient;
|
2022-08-19 14:33:04 +02:00
|
|
|
(void)rememberClient; // shut up compiler warning
|
2022-08-16 09:38:40 +02:00
|
|
|
|
2022-08-19 14:33:04 +02:00
|
|
|
// Broadcast to Serials
|
2022-06-10 13:22:28 +02:00
|
|
|
if (type==COMMAND_TYPE) SerialManager::broadcast(broadcastBufferWriter->getString());
|
2021-12-05 13:08:59 +01:00
|
|
|
|
2022-06-10 13:22:28 +02:00
|
|
|
#ifdef CD_HANDLE_RING
|
2021-12-05 13:08:59 +01:00
|
|
|
// If we are broadcasting from a wifi/eth process we need to complete its output
|
|
|
|
// before merging broadcasts in the ring, then reinstate it in case
|
2022-01-06 23:03:57 +01:00
|
|
|
// the process continues to output to its client.
|
2022-08-16 09:38:40 +02:00
|
|
|
if (ring) {
|
2022-08-16 12:25:49 +02:00
|
|
|
if ((rememberClient = ring->peekTargetMark()) != RingStream::NO_CLIENT) {
|
|
|
|
//DIAG(F("CD precommit client %d"), rememberClient);
|
2022-06-10 13:22:28 +02:00
|
|
|
ring->commit();
|
|
|
|
}
|
2022-08-19 14:33:04 +02:00
|
|
|
// loop through ring clients
|
2022-08-16 12:25:49 +02:00
|
|
|
for (byte clientId=0; clientId<sizeof(clients); clientId++) {
|
|
|
|
if (clients[clientId]==type) {
|
|
|
|
//DIAG(F("CD mark client %d"), clientId);
|
|
|
|
ring->mark(clientId);
|
|
|
|
ring->print(broadcastBufferWriter->getString());
|
|
|
|
//DIAG(F("CD commit client %d"), clientId);
|
|
|
|
ring->commit();
|
|
|
|
}
|
|
|
|
}
|
2022-08-17 00:28:15 +02:00
|
|
|
// at this point ring is committed (NO_CLIENT) either from
|
|
|
|
// 4 or 13 lines above.
|
|
|
|
if (rememberClient != RingStream::NO_CLIENT) {
|
2022-08-16 12:25:49 +02:00
|
|
|
//DIAG(F("CD postmark client %d"), rememberClient);
|
|
|
|
ring->mark(rememberClient);
|
|
|
|
}
|
2022-08-15 10:49:56 +02:00
|
|
|
}
|
2021-12-05 13:08:59 +01:00
|
|
|
#endif
|
2022-01-06 23:03:57 +01:00
|
|
|
}
|
2021-12-05 13:08:59 +01:00
|
|
|
|
2022-06-10 13:22:28 +02:00
|
|
|
// Public broadcast functions below
|
2021-12-05 13:08:59 +01:00
|
|
|
void CommandDistributor::broadcastSensor(int16_t id, bool on ) {
|
2022-08-19 14:33:04 +02:00
|
|
|
broadcastReply(COMMAND_TYPE, F("<%c %d>\n"), on?'Q':'q', id);
|
2022-01-06 23:03:57 +01:00
|
|
|
}
|
2021-12-05 13:08:59 +01:00
|
|
|
|
|
|
|
void CommandDistributor::broadcastTurnout(int16_t id, bool isClosed ) {
|
2022-01-06 23:03:57 +01:00
|
|
|
// For DCC++ classic compatibility, state reported to JMRI is 1 for thrown and 0 for closed;
|
2021-12-07 01:24:48 +01:00
|
|
|
// The string below contains serial and Withrottle protocols which should
|
2022-01-06 23:03:57 +01:00
|
|
|
// be safe for both types.
|
2022-08-19 14:33:04 +02:00
|
|
|
broadcastReply(COMMAND_TYPE, F("<H %d %d>\n"),id, !isClosed);
|
|
|
|
#ifdef CD_HANDLE_RING
|
|
|
|
broadcastReply(WITHROTTLE_TYPE, F("PTA%c%d\n"), isClosed?'2':'4', id);
|
2022-01-06 23:03:57 +01:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2023-08-30 11:48:30 +02:00
|
|
|
void CommandDistributor::broadcastTurntable(int16_t id, uint8_t position, bool moving) {
|
2023-10-12 05:28:39 +02:00
|
|
|
broadcastReply(COMMAND_TYPE, F("<I %d %d %d>\n"), id, position, moving);
|
2023-08-20 11:26:04 +02:00
|
|
|
}
|
|
|
|
|
2023-01-11 18:36:11 +01:00
|
|
|
void CommandDistributor::broadcastClockTime(int16_t time, int8_t rate) {
|
|
|
|
// The JMRI clock command is of the form : PFT65871<;>4
|
|
|
|
// The CS broadcast is of the form "<jC mmmm nn" where mmmm is time minutes and dd speed
|
|
|
|
// The string below contains serial and Withrottle protocols which should
|
|
|
|
// be safe for both types.
|
|
|
|
broadcastReply(COMMAND_TYPE, F("<jC %d %d>\n"),time, rate);
|
|
|
|
#ifdef CD_HANDLE_RING
|
2023-05-24 22:58:21 +02:00
|
|
|
broadcastReply(WITHROTTLE_TYPE, F("PFT%l<;>%d\n"), (int32_t)time*60, rate);
|
2023-01-11 18:36:11 +01:00
|
|
|
#endif
|
|
|
|
}
|
2023-01-21 11:18:54 +01:00
|
|
|
|
|
|
|
void CommandDistributor::setClockTime(int16_t clocktime, int8_t clockrate, byte opt) {
|
|
|
|
// opt - case 1 save the latest time if changed
|
|
|
|
// case 2 broadcast the time when requested
|
|
|
|
// case 3 display latest time
|
|
|
|
switch (opt)
|
|
|
|
{
|
|
|
|
case 1:
|
|
|
|
if (clocktime != lastclocktime){
|
2023-02-24 17:56:21 +01:00
|
|
|
// CAH. DIAG removed because LCD does it anyway.
|
2023-01-21 11:18:54 +01:00
|
|
|
LCD(6,F("Clk Time:%d Sp %d"), clocktime, clockrate);
|
|
|
|
// look for an event for this time
|
|
|
|
RMFT2::clockEvent(clocktime,1);
|
|
|
|
// Now tell everyone else what the time is.
|
|
|
|
CommandDistributor::broadcastClockTime(clocktime, clockrate);
|
|
|
|
lastclocktime = clocktime;
|
|
|
|
lastclockrate = clockrate;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
CommandDistributor::broadcastClockTime(lastclocktime, lastclockrate);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
int16_t CommandDistributor::retClockTime() {
|
|
|
|
return lastclocktime;
|
|
|
|
}
|
2023-01-11 18:36:11 +01:00
|
|
|
|
2022-01-06 23:03:57 +01:00
|
|
|
void CommandDistributor::broadcastLoco(byte slot) {
|
|
|
|
DCC::LOCO * sp=&DCC::speedTable[slot];
|
2024-07-18 21:31:58 +02:00
|
|
|
broadcastReply(COMMAND_TYPE, F("<l %d %d %d %l>\n"), sp->loco,slot,sp->targetSpeed,sp->functions);
|
2023-05-01 20:18:32 +02:00
|
|
|
#ifdef SABERTOOTH
|
|
|
|
if (Serial2 && sp->loco == SABERTOOTH) {
|
|
|
|
static uint8_t rampingmode = 0;
|
|
|
|
bool direction = (sp->speedCode & 0x80) !=0; // true for forward
|
|
|
|
int32_t speed = sp->speedCode & 0x7f;
|
|
|
|
if (speed == 1) { // emergency stop
|
|
|
|
if (rampingmode != 1) {
|
|
|
|
rampingmode = 1;
|
|
|
|
Serial2.print("R1: 0\r\n");
|
|
|
|
Serial2.print("R2: 0\r\n");
|
|
|
|
}
|
|
|
|
Serial2.print("MD: 0\r\n");
|
|
|
|
} else {
|
|
|
|
if (speed != 0) {
|
|
|
|
// speed is here 2 to 127
|
|
|
|
speed = (speed - 1) * 1625 / 100;
|
|
|
|
speed = speed * (direction ? 1 : -1);
|
|
|
|
// speed is here -2047 to 2047
|
|
|
|
}
|
|
|
|
if (rampingmode != 2) {
|
|
|
|
rampingmode = 2;
|
|
|
|
Serial2.print("R1: 2047\r\n");
|
|
|
|
Serial2.print("R2: 2047\r\n");
|
|
|
|
}
|
2023-05-02 23:51:17 +02:00
|
|
|
Serial2.print("M1: ");
|
|
|
|
Serial2.print(speed);
|
|
|
|
Serial2.print("\r\n");
|
|
|
|
Serial2.print("M2: ");
|
2023-05-01 20:18:32 +02:00
|
|
|
Serial2.print(speed);
|
|
|
|
Serial2.print("\r\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2022-06-10 13:22:28 +02:00
|
|
|
#ifdef CD_HANDLE_RING
|
2021-12-15 20:51:01 +01:00
|
|
|
WiThrottle::markForBroadcast(sp->loco);
|
2022-01-06 23:03:57 +01:00
|
|
|
#endif
|
2021-12-05 13:08:59 +01:00
|
|
|
}
|
2022-01-06 23:03:57 +01:00
|
|
|
|
2024-07-19 10:29:43 +02:00
|
|
|
void CommandDistributor::broadcastForgetLoco(int16_t loco) {
|
|
|
|
broadcastReply(COMMAND_TYPE, F("<l %d 0 1 0>\n<- %d>\n"), loco,loco);
|
|
|
|
}
|
|
|
|
|
2021-12-05 13:08:59 +01:00
|
|
|
void CommandDistributor::broadcastPower() {
|
2023-11-14 00:05:18 +01:00
|
|
|
char pstr[] = "? x";
|
2023-11-14 11:12:14 +01:00
|
|
|
for(byte t=0; t<TrackManager::MAX_TRACKS; t++)
|
2023-11-14 00:05:18 +01:00
|
|
|
if (TrackManager::getPower(t, pstr))
|
|
|
|
broadcastReply(COMMAND_TYPE, F("<p%s>\n"),pstr);
|
|
|
|
|
2023-11-23 10:47:43 +01:00
|
|
|
byte trackcount=0;
|
|
|
|
byte oncount=0;
|
|
|
|
byte offcount=0;
|
|
|
|
for(byte t=0; t<TrackManager::MAX_TRACKS; t++) {
|
|
|
|
if (TrackManager::isActive(t)) {
|
|
|
|
trackcount++;
|
|
|
|
// do not call getPower(t) unless isActive(t)!
|
|
|
|
if (TrackManager::getPower(t) == POWERMODE::ON)
|
|
|
|
oncount++;
|
|
|
|
else
|
|
|
|
offcount++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//DIAG(F("t=%d on=%d off=%d"), trackcount, oncount, offcount);
|
|
|
|
|
|
|
|
char state='2';
|
|
|
|
if (oncount==0 || offcount == trackcount)
|
|
|
|
state = '0';
|
|
|
|
else if (oncount == trackcount) {
|
|
|
|
state = '1';
|
|
|
|
}
|
|
|
|
|
|
|
|
// additional info about MAIN, PROG and JOIN
|
2022-02-23 16:44:34 +01:00
|
|
|
bool main=TrackManager::getMainPower()==POWERMODE::ON;
|
|
|
|
bool prog=TrackManager::getProgPower()==POWERMODE::ON;
|
2022-03-19 12:22:31 +01:00
|
|
|
bool join=TrackManager::isJoined();
|
2023-11-23 10:47:43 +01:00
|
|
|
//DIAG(F("m=%d p=%d j=%d"), main, prog, join);
|
2021-12-16 13:11:38 +01:00
|
|
|
const FSH * reason=F("");
|
2023-11-23 10:47:43 +01:00
|
|
|
if (join) {
|
2023-12-13 11:40:15 +01:00
|
|
|
reason = F(" JOIN"); // with space at start so we can append without space
|
2023-11-23 10:47:43 +01:00
|
|
|
broadcastReply(COMMAND_TYPE, F("<p1 %S>\n"),reason);
|
|
|
|
} else {
|
|
|
|
if (main) {
|
|
|
|
//reason = F("MAIN");
|
|
|
|
broadcastReply(COMMAND_TYPE, F("<p1 MAIN>\n"));
|
|
|
|
}
|
|
|
|
if (prog) {
|
|
|
|
//reason = F("PROG");
|
|
|
|
broadcastReply(COMMAND_TYPE, F("<p1 PROG>\n"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (state != '2')
|
|
|
|
broadcastReply(COMMAND_TYPE, F("<p%c>\n"),state);
|
2022-06-10 13:22:28 +02:00
|
|
|
#ifdef CD_HANDLE_RING
|
2023-11-23 10:47:43 +01:00
|
|
|
// send '1' if all main are on, otherwise global state (which in that case is '0' or '2')
|
|
|
|
broadcastReply(WITHROTTLE_TYPE, F("PPA%c\n"), main?'1': state);
|
2022-06-10 13:22:28 +02:00
|
|
|
#endif
|
2023-11-23 10:47:43 +01:00
|
|
|
|
2023-12-13 11:40:15 +01:00
|
|
|
LCD(2,F("Power %S%S"),state=='1'?F("On"): ( state=='0'? F("Off") : F("SC") ),reason);
|
2021-12-05 13:08:59 +01:00
|
|
|
}
|
2022-03-07 17:30:47 +01:00
|
|
|
|
2023-05-01 15:25:45 +02:00
|
|
|
void CommandDistributor::broadcastRaw(clientType type, char * msg) {
|
|
|
|
broadcastReply(type, F("%s"),msg);
|
2022-03-07 17:30:47 +01:00
|
|
|
}
|
2023-03-06 12:57:14 +01:00
|
|
|
|
2024-03-08 21:33:11 +01:00
|
|
|
void CommandDistributor::broadcastMessage(char * message) {
|
|
|
|
broadcastReply(COMMAND_TYPE, F("<m \"%s\">\n"),message);
|
|
|
|
broadcastReply(WITHROTTLE_TYPE, F("Hm%s\n"),message);
|
|
|
|
}
|
|
|
|
|
2023-11-21 15:37:08 +01:00
|
|
|
void CommandDistributor::broadcastTrackState(const FSH* format, byte trackLetter, const FSH *modename, int16_t dcAddr) {
|
|
|
|
broadcastReply(COMMAND_TYPE, format, trackLetter, modename, dcAddr);
|
2023-03-06 12:57:14 +01:00
|
|
|
}
|
2023-11-07 17:27:26 +01:00
|
|
|
|
2023-11-09 20:27:52 +01:00
|
|
|
void CommandDistributor::broadcastRouteState(uint16_t routeId, byte state ) {
|
2023-11-07 17:27:26 +01:00
|
|
|
broadcastReply(COMMAND_TYPE, F("<jB %d %d>\n"),routeId,state);
|
|
|
|
}
|
|
|
|
|
|
|
|
void CommandDistributor::broadcastRouteCaption(uint16_t routeId, const FSH* caption ) {
|
|
|
|
broadcastReply(COMMAND_TYPE, F("<jB %d \"%S\">\n"),routeId,caption);
|
|
|
|
}
|
2023-11-14 20:41:05 +01:00
|
|
|
|
|
|
|
Print * CommandDistributor::getVirtualLCDSerial(byte screen, byte row) {
|
|
|
|
Print * stream=virtualLCDSerial;
|
|
|
|
#ifdef CD_HANDLE_RING
|
|
|
|
rememberVLCDClient=RingStream::NO_CLIENT;
|
|
|
|
if (!stream && virtualLCDClient!=RingStream::NO_CLIENT) {
|
|
|
|
// If we are broadcasting from a wifi/eth process we need to complete its output
|
|
|
|
// before merging broadcasts in the ring, then reinstate it in case
|
|
|
|
// the process continues to output to its client.
|
|
|
|
if ((rememberVLCDClient = ring->peekTargetMark()) != RingStream::NO_CLIENT) {
|
|
|
|
ring->commit();
|
|
|
|
}
|
|
|
|
ring->mark(virtualLCDClient);
|
|
|
|
stream=ring;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (stream) StringFormatter::send(stream,F("<@ %d %d \""), screen,row);
|
|
|
|
return stream;
|
|
|
|
}
|
|
|
|
|
|
|
|
void CommandDistributor::commitVirtualLCDSerial() {
|
|
|
|
#ifdef CD_HANDLE_RING
|
|
|
|
if (virtualLCDClient!=RingStream::NO_CLIENT) {
|
|
|
|
StringFormatter::send(ring,F("\">\n"));
|
|
|
|
ring->commit();
|
|
|
|
if (rememberVLCDClient!=RingStream::NO_CLIENT) ring->mark(rememberVLCDClient);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
StringFormatter::send(virtualLCDSerial,F("\">\n"));
|
|
|
|
}
|
|
|
|
|
|
|
|
void CommandDistributor::setVirtualLCDSerial(Print * stream) {
|
|
|
|
#ifdef CD_HANDLE_RING
|
|
|
|
virtualLCDClient=RingStream::NO_CLIENT;
|
|
|
|
if (stream && stream->availableForWrite()==RingStream::THIS_IS_A_RINGSTREAM) {
|
|
|
|
virtualLCDClient=((RingStream *) stream)->peekTargetMark();
|
|
|
|
virtualLCDSerial=nullptr;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
virtualLCDSerial=stream;
|
|
|
|
}
|
|
|
|
|
2023-11-23 10:00:49 +01:00
|
|
|
Print* CommandDistributor::virtualLCDSerial=&USB_SERIAL;
|
2023-11-14 20:41:05 +01:00
|
|
|
byte CommandDistributor::virtualLCDClient=0xFF;
|
|
|
|
byte CommandDistributor::rememberVLCDClient=0;
|
|
|
|
|