From 576288ba9e439c9b429b6833f52170bb0e1bb34b Mon Sep 17 00:00:00 2001 From: Asbelos Date: Mon, 12 Oct 2020 22:18:09 +0100 Subject: [PATCH 01/17] DIAG LCD --- StringFormatter.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/StringFormatter.cpp b/StringFormatter.cpp index 261794a..2ecefec 100644 --- a/StringFormatter.cpp +++ b/StringFormatter.cpp @@ -47,9 +47,16 @@ void StringFormatter::diag( const __FlashStringHelper* input...) { } void StringFormatter::lcd(byte row, const __FlashStringHelper* input...) { + va_list args; + + // Issue the LCD as a diag first + diag(F("\nLCD%d:"),row); + va_start(args, input); + send2(diagSerial,input,args); + diag(F("\n")); + if (!LCDDisplay::lcdDisplay) return; LCDDisplay::lcdDisplay->setRow(row); - va_list args; va_start(args, input); send2(LCDDisplay::lcdDisplay,input,args); } From 3fe04c1a0eb4e81c2d715a41cadeb6bf8030b414 Mon Sep 17 00:00:00 2001 From: Asbelos Date: Mon, 12 Oct 2020 22:18:55 +0100 Subject: [PATCH 02/17] DCC getFn --- DCC.cpp | 9 +++++++++ DCC.h | 1 + 2 files changed, 10 insertions(+) diff --git a/DCC.cpp b/DCC.cpp index ca563ac..972dfa3 100644 --- a/DCC.cpp +++ b/DCC.cpp @@ -155,6 +155,15 @@ int DCC::changeFn( int cab, byte functionNumber, bool pressed) { return funcstate; } +int DCC::getFn( int cab, byte functionNumber) { + if (cab<=0 || functionNumber>28) return -1; // unknown + int reg = lookupSpeedTable(cab); + if (reg<0) return -1; + + unsigned long funcmask = (1UL< Date: Mon, 12 Oct 2020 22:21:37 +0100 Subject: [PATCH 03/17] Ckean lost buffer --- WifiInterface.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/WifiInterface.h b/WifiInterface.h index b2bdd20..d474716 100644 --- a/WifiInterface.h +++ b/WifiInterface.h @@ -50,8 +50,6 @@ private: static int datalength; static int connectionId; static unsigned long loopTimeoutStart; - static const byte MAX_WIFI_BUFFER = 250; - static byte buffer[MAX_WIFI_BUFFER + 1]; - static MemStream * streamer; + static MemStream * streamer; }; #endif From b98c853a1b4ea026e018e86f798349c146133df0 Mon Sep 17 00:00:00 2001 From: Asbelos Date: Mon, 12 Oct 2020 22:24:37 +0100 Subject: [PATCH 04/17] Withrotthe Functions --- WiThrottle.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/WiThrottle.cpp b/WiThrottle.cpp index 5c536b5..ca706fe 100644 --- a/WiThrottle.cpp +++ b/WiThrottle.cpp @@ -239,8 +239,11 @@ void WiThrottle::multithrottle(Print & stream, byte * cmd){ myLocos[loco].throttle=throttleChar; myLocos[loco].cab=locoid; StringFormatter::send(stream, F("M%c+%c%d<;>\n"), throttleChar, cmd[3] ,locoid); //tell client to add loco - // TODO... get known Fn states from DCC (need memoryStream improvements to handle data length) - // for(fKey=0; fKey<29; fKey++)StringFormatter::send(stream,F("M%cA%c<;>F0&s\n"),throttleChar,cmd[3],fkey); + //Get known Fn states from DCC + for(int fKey=0; fKey<=12; fKey++) { + int fstate=DCC::getFn(locoid,fKey); + if (fstate>=0) StringFormatter::send(stream,F("M%cA%c<;>F%d%d\n"),throttleChar,cmd[3],fstate,fKey); + } StringFormatter::send(stream, F("M%cA%c%d<;>V%d\n"), throttleChar, cmd[3], locoid, DCCToWiTSpeed(DCC::getThrottleSpeed(locoid))); StringFormatter::send(stream, F("M%cA%c%d<;>R%d\n"), throttleChar, cmd[3], locoid, DCC::getThrottleDirection(locoid)); StringFormatter::send(stream, F("M%cA%c%d<;>s1\n"), throttleChar, cmd[3], locoid); //default speed step 128 From 11e22c5d1d55a32cc484e4b74246b54c91853d60 Mon Sep 17 00:00:00 2001 From: Asbelos Date: Tue, 13 Oct 2020 17:37:40 +0100 Subject: [PATCH 05/17] Working Wifi ringbuffer implementation Notice 1kb output buffer Aslo no need to copy command in Withrottle --- CommandDistributor.cpp | 45 +-------------- CommandDistributor.h | 9 +-- RingStream.cpp | 70 +++++++++++++++++++++++ RingStream.h | 46 +++++++++++++++ WiThrottle.cpp | 10 +--- WifiInboundHandler.cpp | 123 ++++++++++++++++++----------------------- WifiInboundHandler.h | 32 ++++------- 7 files changed, 184 insertions(+), 151 deletions(-) create mode 100644 RingStream.cpp create mode 100644 RingStream.h diff --git a/CommandDistributor.cpp b/CommandDistributor.cpp index 47551b2..4d13f40 100644 --- a/CommandDistributor.cpp +++ b/CommandDistributor.cpp @@ -22,51 +22,10 @@ DCCEXParser * CommandDistributor::parser=0; -bool CommandDistributor::parse(byte clientId,byte * buffer, Print * streamer) { - - - // SIDE EFFECT WARNING::: - // We know that parser will read the entire buffer before starting to write to it. - // Otherwise we would have to copy the buffer elsewhere and RAM is in short supply. - - - bool closeAfter=false; - // Intercept HTTP requests - if (isHTTP(buffer)) { - if (httpCallback) httpCallback(streamer, buffer); - closeAfter = true; - } - else if (buffer[0] == '<') { +void CommandDistributor::parse(byte clientId,byte * buffer, Print * streamer) { + if (buffer[0] == '<') { if (!parser) parser = new DCCEXParser(); parser->parse(streamer, buffer, true); // tell JMRI parser that ACKS are blocking because we can't handle the async } else WiThrottle::getThrottle(clientId)->parse(*streamer, buffer); - - return closeAfter; } - -bool CommandDistributor::isHTTP(byte * buffer) { - - // POST GET PUT PATCH DELETE - // You may think a simple strstr() is better... but not when ram & time is in short supply - switch (buffer[0]) { - case 'P': - if (buffer[1] == 'U' && buffer[2] == 'T' && buffer[3] == ' ' ) return true; - if (buffer[1] == 'O' && buffer[2] == 'S' && buffer[3] == 'T' && buffer[4] == ' ') return true; - if (buffer[1] == 'A' && buffer[2] == 'T' && buffer[3] == 'C' && buffer[4] == 'H' && buffer[5] == ' ') return true; - return false; - case 'G': - if (buffer[1] == 'E' && buffer[2] == 'T' && buffer[3] == ' ' ) return true; - return false; - case 'D': - if (buffer[1] == 'E' && buffer[2] == 'L' && buffer[3] == 'E' && buffer[4] == 'T' && buffer[5] == 'E' && buffer[6] == ' ') return true; - return false; - default: - return false; - } -} - -void CommandDistributor::setHTTPCallback(HTTP_CALLBACK callback) { - httpCallback = callback; -} -HTTP_CALLBACK CommandDistributor::httpCallback=0; diff --git a/CommandDistributor.h b/CommandDistributor.h index 93e4d7c..2bec81b 100644 --- a/CommandDistributor.h +++ b/CommandDistributor.h @@ -20,18 +20,11 @@ #define CommandDistributor_h #include "DCCEXParser.h" -typedef void (*HTTP_CALLBACK)(Print *stream, byte *cmd); - class CommandDistributor { public : - static void setHTTPCallback(HTTP_CALLBACK callback); - static bool parse(byte clientId,byte* buffer, Print * streamer); - - + static void parse(byte clientId,byte* buffer, Print * streamer); private: - static HTTP_CALLBACK httpCallback; - static bool isHTTP(byte * buffer); static DCCEXParser * parser; }; diff --git a/RingStream.cpp b/RingStream.cpp new file mode 100644 index 0000000..d026e9b --- /dev/null +++ b/RingStream.cpp @@ -0,0 +1,70 @@ +/* + + (c) 2015 Ingo Fischer + buffer serial device + based on Arduino SoftwareSerial + + Constructor warning messages fixed by Chris Harlow. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library 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 +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +#include "RingStream.h" +#include "DIAG.h" + +RingStream::RingStream( const uint16_t len) +{ + _len=len; + _buffer=new byte[len]; + _pos_write=0; + _pos_read=0; + _buffer[0]=0; + _overflow=false; +} + +size_t RingStream::write(uint8_t byte) { + if (_overflow) return 0; + _buffer[_pos_write] = byte; + ++_pos_write; + if (_pos_write>=_len) _pos_write=0; + if (_pos_write==_pos_read) { + _overflow=true; + DIAG(F("\nRingStream(%d) OVERFLOW %d %d \n"),_len, _pos_write, _pos_read); + return 0; + } + return 1; +} + +int RingStream::read() { + if (_pos_read==_pos_write) return -1; + byte b=_buffer[_pos_read]; + _pos_read++; + if (_pos_read>=_len) _pos_read=0; + _overflow=false; + return b; +} + + +int RingStream::count() { + int peek=_pos_read; + int counter=0; + while(_buffer[peek]) { + counter++; + peek++; + if (peek >= _len) peek=0; + } + return counter; + } diff --git a/RingStream.h b/RingStream.h new file mode 100644 index 0000000..dee00b4 --- /dev/null +++ b/RingStream.h @@ -0,0 +1,46 @@ +#ifndef RingStream_h +#define RingStream_h +/* + + (c) 2015 Ingo Fischer + buffer serial device + based on Arduino SoftwareSerial + + Constructor warning messages fixed by Chris Harlow. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library 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 +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ +#include + +class RingStream : public Print { + + public: + RingStream( const uint16_t len); + + virtual size_t write(uint8_t b); + using Print::write; + int read(); + int count(); + + private: + int _len; + int _pos_write; + int _pos_read; + bool _overflow; + byte * _buffer; +}; + +#endif diff --git a/WiThrottle.cpp b/WiThrottle.cpp index ca706fe..a0ec254 100644 --- a/WiThrottle.cpp +++ b/WiThrottle.cpp @@ -101,15 +101,7 @@ WiThrottle::~WiThrottle() { void WiThrottle::parse(Print & stream, byte * cmdx) { - // we have to take a copy of the cmd buffer as the reply will get built into the cmdx - byte local[150]; - for (byte i=0;i #include "WifiInboundHandler.h" +#include "RingStream.h" #include "CommandDistributor.h" #include "DIAG.h" @@ -16,14 +17,10 @@ void WifiInboundHandler::loop() { WifiInboundHandler::WifiInboundHandler(Stream * ESStream) { wifiStream=ESStream; - for (int clientId=0;clientIdavailable() - clientBuffer[clientId]=new byte[MAX_WIFI_BUFFER+1]; - clientStream[clientId]=new MemStream(clientBuffer[clientId], MAX_WIFI_BUFFER); - } clientPendingCIPSEND=-1; + inboundRing=new RingStream(INBOUND_RING); + outboundRing=new RingStream(OUTBOUND_RING); + pendingCipsend=false; } @@ -31,38 +28,50 @@ WifiInboundHandler::WifiInboundHandler(Stream * ESStream) { // +IPD,x,lll:data is stored in streamer[x] // Other input returns void WifiInboundHandler::loop1() { - - // First handle all inbound traffic events - if (loop2()!=INBOUND_IDLE) return; + // First handle all inbound traffic events because they will block the sending + if (loop2()!=INBOUND_IDLE) return; // if nothing is already CIPSEND pending, we can CIPSEND one reply if (clientPendingCIPSEND<0) { - for (int clientId=0;clientIdavailable()); - StringFormatter::send(wifiStream, F("AT+CIPSEND=%d,%d\r\n"), clientId, clientStream[clientId]->available()); - clientStatus[clientId]=CIPSEND_PENDING; - return; + int next=outboundRing->read(); + if (next>=0) { + currentReplySize=outboundRing->count(); + if (currentReplySize==0) { + outboundRing->read(); // drop end marker } - } - } - - // if something waiting to close we can call one of them - - for (int clientId=0;clientIdread(); + if (next>0) { + int clientId=next-'0'; //convert char to int + int count=inboundRing->count(); + if (Diag::WIFI) DIAG(F("\nExec waiting %d %d:"),clientId,count); + byte cmd[count+1]; + for (int i=0;iread(); + cmd[count]=0; + if (Diag::WIFI) DIAG(F("%e\n"),cmd); + + outboundRing->print(clientId); + CommandDistributor::parse(clientId,cmd,outboundRing); + outboundRing->write((byte)0); return; } } -} + // This is a Finite State Automation (FSA) handling the inbound bytes from an ES AT command processor @@ -86,10 +95,11 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { } if (ch=='>') { - if (Diag::WIFI) DIAG(F("[[XMIT %d]]"),clientStream[clientPendingCIPSEND]->available()); - wifiStream->write(clientBuffer[clientPendingCIPSEND], clientStream[clientPendingCIPSEND]->available()); - clientStatus[clientPendingCIPSEND]=clientCloseAfterReply[clientPendingCIPSEND]? CLOSE_AFTER_SEND: UNUSED; + if (Diag::WIFI) DIAG(F("[[XMIT %d]]"),currentReplySize); + for (int i=0;iwrite(outboundRing->read()); + outboundRing->read(); // drop the end marker clientPendingCIPSEND=-1; + pendingCipsend=false; loopState=SKIPTOEND; break; } @@ -100,15 +110,12 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { } if (ch=='b') { // This is a busy indicator... probabaly must restart a CIPSEND - if (clientPendingCIPSEND>=0) { - clientStatus[clientPendingCIPSEND]=REPLY_PENDING; - clientPendingCIPSEND=-1; - } + pendingCipsend=(clientPendingCIPSEND>=0); loopState=SKIPTOEND; break; } - if (ch>='0' && ch<=('0'+MAX_CLIENTS)) { + if (ch>='0' && ch<='9') { runningClientId=ch-'0'; loopState=GOT_CLIENT_ID; break; @@ -133,7 +140,7 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { break; case IPD4_CLIENT: // reading connection id - if (ch >= '0' || ch <('0'+MAX_CLIENTS)){ + if (ch >= '0' || ch <='9'){ runningClientId=ch-'0'; loopState=IPD5; } @@ -151,8 +158,8 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { loopState=ANYTHING; break; } - clientStream[runningClientId]->flush(); // prepare streamer for input - clientStatus[runningClientId]=INBOUND_ARRIVING; + if (Diag::WIFI) DIAG(F("\nWifi inbound data(%d:%d):"),runningClientId,dataLength); + inboundRing->print(runningClientId); // prefix inbound with client id loopState=IPD_DATA; break; } @@ -160,12 +167,10 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { break; case IPD_DATA: // reading data - clientStream[runningClientId]->write(ch); // NOTE: The MemStream will throw away bytes that do not fit in the buffer. - // This protects against buffer overflows even with things as innocent - // as a browser which send massive, irrlevent HTTP headers. + inboundRing->write(ch); dataLength--; if (dataLength == 0) { - clientStatus[runningClientId]=READY_TO_PROCESS; + inboundRing->write((byte)0); loopState = ANYTHING; } break; @@ -181,8 +186,10 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { case GOT_CLIENT_ID3: // got "x C" before CLOSE or CONNECTED (which is ignored) if(ch=='L') { // CLOSE - clientStatus[runningClientId]=UNUSED; - if (runningClientId==clientPendingCIPSEND) clientPendingCIPSEND=-1; + if (runningClientId==clientPendingCIPSEND) { + // clear the outbound for this client + for (int i=0;i<=currentReplySize;i++) outboundRing->read(); + } } loopState=SKIPTOEND; break; @@ -194,25 +201,3 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { } // available return (loopState==ANYTHING) ? INBOUND_IDLE: INBOUND_BUSY; } - - -void WifiInboundHandler::processCommand(byte clientId) { - clientStatus[clientId]=PROCESSING; - byte * buffer=clientBuffer[clientId]; - MemStream * streamer=clientStream[clientId]; - buffer[streamer->available()]='\0'; - - if (Diag::WIFI) DIAG(F("\n%l Wifi(%d)<-[%e]\n"), millis(),clientId, buffer); - streamer->setBufferContentPosition(0, 0); // reset write position to start of buffer - - clientCloseAfterReply[clientId]=CommandDistributor::parse(clientId,buffer,streamer); - - if (streamer->available() == 0) { - clientStatus[clientId]=UNUSED; - } - else { - buffer[streamer->available()]='\0'; // mark end of buffer, so it can be used as a string later - if (Diag::WIFI) DIAG(F("%l WiFi(%d)->[%e] l(%d)\n"), millis(), clientId, buffer, streamer->available()); - clientStatus[clientId]=REPLY_PENDING; - } -} diff --git a/WifiInboundHandler.h b/WifiInboundHandler.h index 87ac89a..fa41aa4 100644 --- a/WifiInboundHandler.h +++ b/WifiInboundHandler.h @@ -1,8 +1,7 @@ #ifndef WifiInboundHandler_h #define WifiInboundHandler_h -#include "MemStream.h" -#include "DCCEXParser.h" +#include "RingStream.h" #include "DIAG.h" class WifiInboundHandler { @@ -14,9 +13,7 @@ class WifiInboundHandler { static WifiInboundHandler * singleton; - static const byte MAX_CLIENTS=5; - static const byte MAX_WIFI_BUFFER=255; - + enum INBOUND_STATE { INBOUND_BUSY, // keep calling in loop() INBOUND_IDLE // Nothing happening, outbound may xcall CIPSEND @@ -41,32 +38,23 @@ class WifiInboundHandler { GOT_CLIENT_ID3 // clientid prefix to CONNECTED / CLOSED }; - enum CLIENT_STATUS { - UNUSED, // client slot not in use - INBOUND_ARRIVING, // data is arriving - READY_TO_PROCESS, // data has arrived, may call parser now - PROCESSING, // command in progress - REPLY_PENDING, // reply is ready to CIPSEND - CIPSEND_PENDING, // CIPSEND waiting for > - CLOSE_PENDING, // CLOSE received - CLOSE_AFTER_SEND // Send CLOSE after CIPSEND completed - }; WifiInboundHandler(Stream * ESStream); void loop1(); INBOUND_STATE loop2(); - void processCommand(byte clientId); Stream * wifiStream; - DCCEXParser *parser; - + static const int INBOUND_RING = 200; + static const int OUTBOUND_RING = 1024; + + RingStream * inboundRing; + RingStream * outboundRing; + LOOP_STATE loopState=ANYTHING; int runningClientId; // latest client inbound processing data or CLOSE int dataLength; // dataLength of +IPD - byte * clientBuffer[MAX_CLIENTS]; - MemStream * clientStream[MAX_CLIENTS]; - CLIENT_STATUS clientStatus[MAX_CLIENTS]; - bool clientCloseAfterReply[MAX_CLIENTS]; int clientPendingCIPSEND=-1; + int currentReplySize; + bool pendingCipsend; }; #endif From ae77c5b7d6bcd9847b2abc27d177ad2b8d3272b8 Mon Sep 17 00:00:00 2001 From: Asbelos Date: Tue, 13 Oct 2020 18:01:11 +0100 Subject: [PATCH 06/17] Send all functions --- WiThrottle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WiThrottle.cpp b/WiThrottle.cpp index a0ec254..ac503a0 100644 --- a/WiThrottle.cpp +++ b/WiThrottle.cpp @@ -232,7 +232,7 @@ void WiThrottle::multithrottle(Print & stream, byte * cmd){ myLocos[loco].cab=locoid; StringFormatter::send(stream, F("M%c+%c%d<;>\n"), throttleChar, cmd[3] ,locoid); //tell client to add loco //Get known Fn states from DCC - for(int fKey=0; fKey<=12; fKey++) { + for(int fKey=0; fKey<=28; fKey++) { int fstate=DCC::getFn(locoid,fKey); if (fstate>=0) StringFormatter::send(stream,F("M%cA%c<;>F%d%d\n"),throttleChar,cmd[3],fstate,fKey); } From 8c8a4846716762ec91db77cfa5737cb46d0b0cfd Mon Sep 17 00:00:00 2001 From: Asbelos Date: Tue, 20 Oct 2020 12:48:32 +0100 Subject: [PATCH 07/17] License details correction --- RingStream.cpp | 39 +++++++++++++++++---------------------- RingStream.h | 38 +++++++++++++++++--------------------- 2 files changed, 34 insertions(+), 43 deletions(-) diff --git a/RingStream.cpp b/RingStream.cpp index d026e9b..eee0753 100644 --- a/RingStream.cpp +++ b/RingStream.cpp @@ -1,26 +1,21 @@ /* - - (c) 2015 Ingo Fischer - buffer serial device - based on Arduino SoftwareSerial - - Constructor warning messages fixed by Chris Harlow. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library 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 -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -*/ + * © 2020, 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 . + */ #include "RingStream.h" #include "DIAG.h" diff --git a/RingStream.h b/RingStream.h index dee00b4..7a129e0 100644 --- a/RingStream.h +++ b/RingStream.h @@ -1,28 +1,24 @@ #ifndef RingStream_h #define RingStream_h /* + * © 2020, 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 . + */ - (c) 2015 Ingo Fischer - buffer serial device - based on Arduino SoftwareSerial - - Constructor warning messages fixed by Chris Harlow. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library 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 -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -*/ #include class RingStream : public Print { From c882c2edfc100325072c16ea38df50b8908716e6 Mon Sep 17 00:00:00 2001 From: Harald Barth Date: Thu, 22 Oct 2020 20:38:10 +0200 Subject: [PATCH 08/17] prepare version for release --- version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.h b/version.h index 6e45e70..d0c09b9 100644 --- a/version.h +++ b/version.h @@ -4,7 +4,7 @@ #include "StringFormatter.h" // const char VERSION[] PROGMEM ="0.2.0"; -#define VERSION "0.2.0" +#define VERSION "3.0.0" -#endif \ No newline at end of file +#endif From a16b3a1fa67e14118cd93a2ffd0c1a61563db9ef Mon Sep 17 00:00:00 2001 From: Asbelos Date: Thu, 22 Oct 2020 20:24:47 +0100 Subject: [PATCH 09/17] Drop obsolete reference --- WifiInterface.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/WifiInterface.h b/WifiInterface.h index d474716..57dd469 100644 --- a/WifiInterface.h +++ b/WifiInterface.h @@ -20,7 +20,6 @@ #ifndef WifiInterface_h #define WifiInterface_h #include "DCCEXParser.h" -#include "MemStream.h" #include #include @@ -50,6 +49,5 @@ private: static int datalength; static int connectionId; static unsigned long loopTimeoutStart; - static MemStream * streamer; }; #endif From 6833d8278935b54fd9a076421a6bec462d314c17 Mon Sep 17 00:00:00 2001 From: Asbelos Date: Mon, 26 Oct 2020 12:59:40 +0000 Subject: [PATCH 10/17] Buffer overflow resilience And diag output of replies --- RingStream.cpp | 25 +++++++++++++++++++++++-- RingStream.h | 4 ++++ WifiInboundHandler.cpp | 25 +++++++++++++++++++++---- WifiInboundHandler.h | 5 +++-- 4 files changed, 51 insertions(+), 8 deletions(-) diff --git a/RingStream.cpp b/RingStream.cpp index eee0753..cea17fb 100644 --- a/RingStream.cpp +++ b/RingStream.cpp @@ -28,11 +28,12 @@ RingStream::RingStream( const uint16_t len) _pos_read=0; _buffer[0]=0; _overflow=false; + _mark=0; } -size_t RingStream::write(uint8_t byte) { +size_t RingStream::write(uint8_t b) { if (_overflow) return 0; - _buffer[_pos_write] = byte; + _buffer[_pos_write] = b; ++_pos_write; if (_pos_write>=_len) _pos_write=0; if (_pos_write==_pos_read) { @@ -63,3 +64,23 @@ int RingStream::count() { } return counter; } + +int RingStream::freeSpace() { + if (_pos_read>_pos_write) return _pos_read-_pos_write-2; + else return _len - _pos_write + _pos_read-2; +} + + +void RingStream::mark() { + _mark=_pos_write; +} + +bool RingStream::commit() { + if (_overflow) { + _pos_write=_mark; + _overflow=false; + return false; // commit failed + } + write((uint8_t)0); + return true; // commit worked +} diff --git a/RingStream.h b/RingStream.h index 7a129e0..52caf9e 100644 --- a/RingStream.h +++ b/RingStream.h @@ -30,12 +30,16 @@ class RingStream : public Print { using Print::write; int read(); int count(); + int freeSpace(); + void mark(); + bool commit(); private: int _len; int _pos_write; int _pos_read; bool _overflow; + int _mark; byte * _buffer; }; diff --git a/WifiInboundHandler.cpp b/WifiInboundHandler.cpp index 8a779ee..6aa8738 100644 --- a/WifiInboundHandler.cpp +++ b/WifiInboundHandler.cpp @@ -65,9 +65,12 @@ void WifiInboundHandler::loop1() { cmd[count]=0; if (Diag::WIFI) DIAG(F("%e\n"),cmd); + outboundRing->mark(); // remember start of outbound data outboundRing->print(clientId); CommandDistributor::parse(clientId,cmd,outboundRing); - outboundRing->write((byte)0); + // The commit call will either write the null byte at the end of the output, + // OR rollback to the mark because the commend generated more than fits rthe buffer + outboundRing->commit(); return; } } @@ -95,8 +98,11 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { } if (ch=='>') { - if (Diag::WIFI) DIAG(F("[[XMIT %d]]"),currentReplySize); - for (int i=0;iwrite(outboundRing->read()); + for (int i=0;iread(); + wifiStream->write(cout); + if (Diag::WIFI) StringFormatter::printEscape(cout); // DIAG in disguise + } outboundRing->read(); // drop the end marker clientPendingCIPSEND=-1; pendingCipsend=false; @@ -159,6 +165,12 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { break; } if (Diag::WIFI) DIAG(F("\nWifi inbound data(%d:%d):"),runningClientId,dataLength); + if (inboundRing->freeSpace()<=(dataLength+1)) { + // This input would overflow the inbound ring, ignore it + loopState=IPD_IGNORE_DATA; + break; + } + inboundRing->mark(); inboundRing->print(runningClientId); // prefix inbound with client id loopState=IPD_DATA; break; @@ -170,11 +182,16 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { inboundRing->write(ch); dataLength--; if (dataLength == 0) { - inboundRing->write((byte)0); + inboundRing->commit(); loopState = ANYTHING; } break; + case IPD_IGNORE_DATA: // ignoring data that would not fit in inbound ring + dataLength--; + if (dataLength == 0) loopState = ANYTHING; + break; + case GOT_CLIENT_ID: // got x before CLOSE or CONNECTED loopState=(ch==',') ? GOT_CLIENT_ID2: SKIPTOEND; break; diff --git a/WifiInboundHandler.h b/WifiInboundHandler.h index fa41aa4..e947bdb 100644 --- a/WifiInboundHandler.h +++ b/WifiInboundHandler.h @@ -32,6 +32,7 @@ class WifiInboundHandler { IPD5, // got +IPD,c IPD6_LENGTH, // got +IPD,c, reading length IPD_DATA, // got +IPD,c,ll,: collecting data + IPD_IGNORE_DATA, // got +IPD,c,ll,: ignoring the data that won't fit inblound Ring GOT_CLIENT_ID, // clientid prefix to CONNECTED / CLOSED GOT_CLIENT_ID2, // clientid prefix to CONNECTED / CLOSED @@ -44,8 +45,8 @@ class WifiInboundHandler { INBOUND_STATE loop2(); Stream * wifiStream; - static const int INBOUND_RING = 200; - static const int OUTBOUND_RING = 1024; + static const int INBOUND_RING = 512; + static const int OUTBOUND_RING = 2048; RingStream * inboundRing; RingStream * outboundRing; From 8ff947f895dbe25fc5cffe47fdc8c60335b2aec2 Mon Sep 17 00:00:00 2001 From: Asbelos Date: Mon, 26 Oct 2020 13:31:51 +0000 Subject: [PATCH 11/17] Passing outbound Ring to Withrottle This will allow Withrottle to send to other clients and broadcast messages. --- CommandDistributor.cpp | 2 +- CommandDistributor.h | 3 ++- WiThrottle.cpp | 12 ++++++++++-- WiThrottle.h | 5 +++-- WifiInboundHandler.cpp | 2 ++ WifiInboundHandler.h | 1 + WifiInterface.cpp | 3 +-- 7 files changed, 20 insertions(+), 8 deletions(-) diff --git a/CommandDistributor.cpp b/CommandDistributor.cpp index 4d13f40..4496692 100644 --- a/CommandDistributor.cpp +++ b/CommandDistributor.cpp @@ -22,7 +22,7 @@ DCCEXParser * CommandDistributor::parser=0; -void CommandDistributor::parse(byte clientId,byte * buffer, Print * streamer) { +void CommandDistributor::parse(byte clientId,byte * buffer, RingStream * streamer) { if (buffer[0] == '<') { if (!parser) parser = new DCCEXParser(); parser->parse(streamer, buffer, true); // tell JMRI parser that ACKS are blocking because we can't handle the async diff --git a/CommandDistributor.h b/CommandDistributor.h index 2bec81b..155ada0 100644 --- a/CommandDistributor.h +++ b/CommandDistributor.h @@ -19,11 +19,12 @@ #ifndef CommandDistributor_h #define CommandDistributor_h #include "DCCEXParser.h" +#include "RingStream.h" class CommandDistributor { public : - static void parse(byte clientId,byte* buffer, Print * streamer); + static void parse(byte clientId,byte* buffer, RingStream * streamer); private: static DCCEXParser * parser; }; diff --git a/WiThrottle.cpp b/WiThrottle.cpp index ac503a0..95ea07e 100644 --- a/WiThrottle.cpp +++ b/WiThrottle.cpp @@ -99,7 +99,7 @@ WiThrottle::~WiThrottle() { } } -void WiThrottle::parse(Print & stream, byte * cmdx) { +void WiThrottle::parse(RingStream & stream, byte * cmdx) { byte * cmd=cmdx; @@ -334,10 +334,18 @@ int WiThrottle::WiTToDCCSpeed(int WiTSpeed) { return WiTSpeed + 1; //offset others by 1 } -void WiThrottle::loop() { +void WiThrottle::loop(RingStream & stream) { // for each WiThrottle, check the heartbeat for (WiThrottle* wt=firstThrottle; wt!=NULL ; wt=wt->nextThrottle) wt->checkHeartbeat(); + + // TODO... any broadcasts to be done + /* MUST follow this model in this loop. + * stream->mark(); + * send 1 digit client id, and any data + * stream->commit() + */ + } void WiThrottle::checkHeartbeat() { diff --git a/WiThrottle.h b/WiThrottle.h index c1b5bba..fe06cfe 100644 --- a/WiThrottle.h +++ b/WiThrottle.h @@ -19,6 +19,7 @@ #ifndef WiThrottle_h #define WiThrottle_h +#include "RingStream.h" struct MYLOCO { char throttle; //indicates which throttle letter on client, often '0','1' or '2' @@ -27,8 +28,8 @@ struct MYLOCO { class WiThrottle { public: - static void loop(); - void parse(Print & stream, byte * cmd); + static void loop(RingStream & stream); + void parse(RingStream & stream, byte * cmd); static WiThrottle* getThrottle( int wifiClient); static bool annotateLeftRight; private: diff --git a/WifiInboundHandler.cpp b/WifiInboundHandler.cpp index 6aa8738..a13e789 100644 --- a/WifiInboundHandler.cpp +++ b/WifiInboundHandler.cpp @@ -31,6 +31,8 @@ void WifiInboundHandler::loop1() { // First handle all inbound traffic events because they will block the sending if (loop2()!=INBOUND_IDLE) return; + WiThrottle::loop(outboundRing); + // if nothing is already CIPSEND pending, we can CIPSEND one reply if (clientPendingCIPSEND<0) { int next=outboundRing->read(); diff --git a/WifiInboundHandler.h b/WifiInboundHandler.h index e947bdb..953b08d 100644 --- a/WifiInboundHandler.h +++ b/WifiInboundHandler.h @@ -2,6 +2,7 @@ #define WifiInboundHandler_h #include "RingStream.h" +#include "WiThrottle.h" #include "DIAG.h" class WifiInboundHandler { diff --git a/WifiInterface.cpp b/WifiInterface.cpp index c751cab..74018b9 100644 --- a/WifiInterface.cpp +++ b/WifiInterface.cpp @@ -22,7 +22,7 @@ #include #include "DIAG.h" #include "StringFormatter.h" -#include "WiThrottle.h" + #include "WifiInboundHandler.h" const char PROGMEM READY_SEARCH[] = "\r\nready\r\n"; @@ -295,7 +295,6 @@ bool WifiInterface::checkForOK( const unsigned int timeout, const char * waitfor void WifiInterface::loop() { if (connected) { - WiThrottle::loop(); WifiInboundHandler::loop(); } } From b7fc055953adca899a3d4470b87785a1dc7d0511 Mon Sep 17 00:00:00 2001 From: Asbelos Date: Mon, 26 Oct 2020 13:58:25 +0000 Subject: [PATCH 12/17] Passing Strteamer correctly Previous method copied entire buffer!!!! --- CommandDistributor.cpp | 2 +- WiThrottle.cpp | 9 +++++---- WiThrottle.h | 10 +++++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CommandDistributor.cpp b/CommandDistributor.cpp index 4496692..de4e8bf 100644 --- a/CommandDistributor.cpp +++ b/CommandDistributor.cpp @@ -27,5 +27,5 @@ void CommandDistributor::parse(byte clientId,byte * buffer, RingStream * stream if (!parser) parser = new DCCEXParser(); parser->parse(streamer, buffer, true); // tell JMRI parser that ACKS are blocking because we can't handle the async } - else WiThrottle::getThrottle(clientId)->parse(*streamer, buffer); + else WiThrottle::getThrottle(clientId)->parse(streamer, buffer); } diff --git a/WiThrottle.cpp b/WiThrottle.cpp index 95ea07e..61f7f92 100644 --- a/WiThrottle.cpp +++ b/WiThrottle.cpp @@ -99,7 +99,7 @@ WiThrottle::~WiThrottle() { } } -void WiThrottle::parse(RingStream & stream, byte * cmdx) { +void WiThrottle::parse(RingStream * stream, byte * cmdx) { byte * cmd=cmdx; @@ -205,7 +205,7 @@ int WiThrottle::getLocoId(byte * cmd) { if (cmd[0]!='L' && cmd[0]!='S') return 0; // should not match any locos return getInt(cmd+1); } -void WiThrottle::multithrottle(Print & stream, byte * cmd){ +void WiThrottle::multithrottle(RingStream * stream, byte * cmd){ char throttleChar=cmd[1]; int locoid=getLocoId(cmd+3); // -1 for * byte * aval=cmd; @@ -256,7 +256,7 @@ void WiThrottle::multithrottle(Print & stream, byte * cmd){ } } -void WiThrottle::locoAction(Print & stream, byte* aval, char throttleChar, int cab){ +void WiThrottle::locoAction(RingStream * stream, byte* aval, char throttleChar, int cab){ // Note cab=-1 for all cabs in the consist called throttleChar. // DIAG(F("\nLoco Action aval=%c%c throttleChar=%c, cab=%d"), aval[0],aval[1],throttleChar, cab); switch (aval[0]) { @@ -334,12 +334,13 @@ int WiThrottle::WiTToDCCSpeed(int WiTSpeed) { return WiTSpeed + 1; //offset others by 1 } -void WiThrottle::loop(RingStream & stream) { +void WiThrottle::loop(RingStream * stream) { // for each WiThrottle, check the heartbeat for (WiThrottle* wt=firstThrottle; wt!=NULL ; wt=wt->nextThrottle) wt->checkHeartbeat(); // TODO... any broadcasts to be done + (void)stream; /* MUST follow this model in this loop. * stream->mark(); * send 1 digit client id, and any data diff --git a/WiThrottle.h b/WiThrottle.h index fe06cfe..161020d 100644 --- a/WiThrottle.h +++ b/WiThrottle.h @@ -28,8 +28,8 @@ struct MYLOCO { class WiThrottle { public: - static void loop(RingStream & stream); - void parse(RingStream & stream, byte * cmd); + static void loop(RingStream * stream); + void parse(RingStream * stream, byte * cmd); static WiThrottle* getThrottle( int wifiClient); static bool annotateLeftRight; private: @@ -57,9 +57,9 @@ class WiThrottle { bool lastPowerState; // last power state sent to this client int DCCToWiTSpeed(int DCCSpeed); int WiTToDCCSpeed(int WiTSpeed); - void multithrottle(Print & stream, byte * cmd); - void locoAction(Print & stream, byte* aval, char throttleChar, int cab); - void accessory(Print & stream, byte* cmd); + void multithrottle(RingStream * stream, byte * cmd); + void locoAction(RingStream * stream, byte* aval, char throttleChar, int cab); + void accessory(RingStream *, byte* cmd); void checkHeartbeat(); }; #endif From 59a1a8eb1b819546c265f27752446ca08de5bedc Mon Sep 17 00:00:00 2001 From: Harald Barth Date: Tue, 27 Oct 2020 07:33:04 +0100 Subject: [PATCH 13/17] turn off tcp server to reset connections --- WifiInterface.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WifiInterface.cpp b/WifiInterface.cpp index c751cab..b718b4b 100644 --- a/WifiInterface.cpp +++ b/WifiInterface.cpp @@ -233,6 +233,8 @@ bool WifiInterface::setup2(const __FlashStringHelper* SSid, const __FlashStringH } } + StringFormatter::send(wifiStream, F("AT+CIPSERVER=0\r\n")); // turn off tcp server (to clean connections before CIPMUX=1) + checkForOK(10000, OK_SEARCH, true); // ignore result in case it already was off StringFormatter::send(wifiStream, F("AT+CIPMUX=1\r\n")); // configure for multiple connections if (!checkForOK(10000, OK_SEARCH, true)) return false; From 6c0b5d82be8ebcd68e14e08be2fbc98b56b74ef5 Mon Sep 17 00:00:00 2001 From: Asbelos Date: Tue, 27 Oct 2020 10:38:30 +0000 Subject: [PATCH 14/17] Ring count improvements Count is stashed at start of message so can be got without counting. Commit discards empty replies automatically. --- RingStream.cpp | 51 ++++++++++++++++++++++++++---------------- RingStream.h | 3 ++- WifiInboundHandler.cpp | 41 ++++++++++++++------------------- 3 files changed, 51 insertions(+), 44 deletions(-) diff --git a/RingStream.cpp b/RingStream.cpp index cea17fb..911bb80 100644 --- a/RingStream.cpp +++ b/RingStream.cpp @@ -29,58 +29,71 @@ RingStream::RingStream( const uint16_t len) _buffer[0]=0; _overflow=false; _mark=0; + _count=0; } size_t RingStream::write(uint8_t b) { if (_overflow) return 0; _buffer[_pos_write] = b; ++_pos_write; - if (_pos_write>=_len) _pos_write=0; + if (_pos_write==_len) _pos_write=0; if (_pos_write==_pos_read) { _overflow=true; - DIAG(F("\nRingStream(%d) OVERFLOW %d %d \n"),_len, _pos_write, _pos_read); return 0; } + _count++; return 1; } int RingStream::read() { - if (_pos_read==_pos_write) return -1; + if ((_pos_read==_pos_write) && !_overflow) return -1; // empty byte b=_buffer[_pos_read]; _pos_read++; - if (_pos_read>=_len) _pos_read=0; + if (_pos_read==_len) _pos_read=0; _overflow=false; return b; } int RingStream::count() { - int peek=_pos_read; - int counter=0; - while(_buffer[peek]) { - counter++; - peek++; - if (peek >= _len) peek=0; - } - return counter; + return (read()<<8) | read(); } int RingStream::freeSpace() { - if (_pos_read>_pos_write) return _pos_read-_pos_write-2; - else return _len - _pos_write + _pos_read-2; + // allow space for client flag and length bytes + if (_pos_read>_pos_write) return _pos_read-_pos_write-3; + else return _len - _pos_write + _pos_read-3; } -void RingStream::mark() { +// mark start of message with client id (0...9) +void RingStream::mark(uint8_t b) { _mark=_pos_write; + write(b); // client id + write((uint8_t)0); // count MSB placemarker + write((uint8_t)0); // count LSB placemarker + _count=0; } bool RingStream::commit() { if (_overflow) { - _pos_write=_mark; - _overflow=false; - return false; // commit failed + DIAG(F("\nRingStream(%d) commit(%d) OVERFLOW\n"),_len, _count); + // just throw it away + _pos_write=_mark; + _overflow=false; + return false; // commit failed } - write((uint8_t)0); + if (_count==0) { + // ignore empty response + _pos_write=_mark; + return true; // true=commit ok + } + // Go back to the _mark and inject the count 1 byte later + _mark++; + if (_mark==_len) _mark=0; + _buffer[_mark]=highByte(_count); + _mark++; + if (_mark==_len) _mark=0; + _buffer[_mark]=lowByte(_count); return true; // commit worked } diff --git a/RingStream.h b/RingStream.h index 52caf9e..b32e062 100644 --- a/RingStream.h +++ b/RingStream.h @@ -31,7 +31,7 @@ class RingStream : public Print { int read(); int count(); int freeSpace(); - void mark(); + void mark(uint8_t b); bool commit(); private: @@ -40,6 +40,7 @@ class RingStream : public Print { int _pos_read; bool _overflow; int _mark; + int _count; byte * _buffer; }; diff --git a/WifiInboundHandler.cpp b/WifiInboundHandler.cpp index a13e789..81cb3b7 100644 --- a/WifiInboundHandler.cpp +++ b/WifiInboundHandler.cpp @@ -35,18 +35,13 @@ void WifiInboundHandler::loop1() { // if nothing is already CIPSEND pending, we can CIPSEND one reply if (clientPendingCIPSEND<0) { - int next=outboundRing->read(); - if (next>=0) { + clientPendingCIPSEND=outboundRing->read(); + if (clientPendingCIPSEND>=0) { currentReplySize=outboundRing->count(); - if (currentReplySize==0) { - outboundRing->read(); // drop end marker - } - else { - clientPendingCIPSEND=next-'0'; // convert back to int - pendingCipsend=true; - } + pendingCipsend=true; } - } + } + if (pendingCipsend) { if (Diag::WIFI) DIAG( F("\nWiFi: [[CIPSEND=%d,%d]]"), clientPendingCIPSEND, currentReplySize); @@ -57,21 +52,19 @@ void WifiInboundHandler::loop1() { // if something waiting to execute, we can call it - int next=inboundRing->read(); - if (next>0) { - int clientId=next-'0'; //convert char to int + int clientId=inboundRing->read(); + if (clientId>=0) { int count=inboundRing->count(); - if (Diag::WIFI) DIAG(F("\nExec waiting %d %d:"),clientId,count); + if (Diag::WIFI) DIAG(F("\nWifi EXEC: %d %d:"),clientId,count); byte cmd[count+1]; for (int i=0;iread(); cmd[count]=0; if (Diag::WIFI) DIAG(F("%e\n"),cmd); - outboundRing->mark(); // remember start of outbound data - outboundRing->print(clientId); + outboundRing->mark(clientId); // remember start of outbound data CommandDistributor::parse(clientId,cmd,outboundRing); - // The commit call will either write the null byte at the end of the output, - // OR rollback to the mark because the commend generated more than fits rthe buffer + // The commit call will either write the lenbgth bytes + // OR rollback to the mark because the reply is empty or commend generated more than fits the buffer outboundRing->commit(); return; } @@ -92,7 +85,7 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { } switch (loopState) { - case ANYTHING: // looking for +IPD, > , busy , n,CONNECTED, n,CLOSED + case ANYTHING: // looking for +IPD, > , busy , n,CONNECTED, n,CLOSED, ERROR if (ch == '+') { loopState = IPD; @@ -100,12 +93,12 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { } if (ch=='>') { + if (Diag::WIFI) DIAG(F("[XMIT %d]"),currentReplySize); for (int i=0;iread(); wifiStream->write(cout); if (Diag::WIFI) StringFormatter::printEscape(cout); // DIAG in disguise } - outboundRing->read(); // drop the end marker clientPendingCIPSEND=-1; pendingCipsend=false; loopState=SKIPTOEND; @@ -170,10 +163,10 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { if (inboundRing->freeSpace()<=(dataLength+1)) { // This input would overflow the inbound ring, ignore it loopState=IPD_IGNORE_DATA; + if (Diag::WIFI) DIAG(F("\nWifi OVERFLOW IGNORING:")); break; } - inboundRing->mark(); - inboundRing->print(runningClientId); // prefix inbound with client id + inboundRing->mark(runningClientId); loopState=IPD_DATA; break; } @@ -181,10 +174,10 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { break; case IPD_DATA: // reading data - inboundRing->write(ch); + inboundRing->write(ch); dataLength--; if (dataLength == 0) { - inboundRing->commit(); + inboundRing->commit(); loopState = ANYTHING; } break; From 138851f45f5edda7df1914a330313b18a9d56a7a Mon Sep 17 00:00:00 2001 From: Asbelos Date: Tue, 27 Oct 2020 11:04:51 +0000 Subject: [PATCH 15/17] Cleaner purge on ERROR --- WifiInboundHandler.cpp | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/WifiInboundHandler.cpp b/WifiInboundHandler.cpp index 81cb3b7..00a682f 100644 --- a/WifiInboundHandler.cpp +++ b/WifiInboundHandler.cpp @@ -85,7 +85,7 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { } switch (loopState) { - case ANYTHING: // looking for +IPD, > , busy , n,CONNECTED, n,CLOSED, ERROR + case ANYTHING: // looking for +IPD, > , busy , n,CONNECTED, n,CLOSED, ERROR, SEND OK if (ch == '+') { loopState = IPD; @@ -109,6 +109,11 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { loopState=SKIPTOEND; break; } + + if (ch=='S') { // SEND OK probably + loopState=SKIPTOEND; + break; + } if (ch=='b') { // This is a busy indicator... probabaly must restart a CIPSEND pendingCipsend=(clientPendingCIPSEND>=0); @@ -121,6 +126,18 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { loopState=GOT_CLIENT_ID; break; } + + if (ch=='E') { // ERROR + if (pendingCipsend) { + // A CIPSEND was errored... just toss it away + if (Diag::WIFI) DIAG(F("Wifi: drop previous CIPSEND\n")); + for (int i=0;i<=currentReplySize;i++) outboundRing->read(); + clientPendingCIPSEND=-1; + pendingCipsend=false; + } + loopState=SKIPTOEND; + break; + } break; @@ -200,7 +217,9 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { // CLOSE if (runningClientId==clientPendingCIPSEND) { // clear the outbound for this client - for (int i=0;i<=currentReplySize;i++) outboundRing->read(); + for (int i=0;i<=currentReplySize;i++) outboundRing->read(); + clientPendingCIPSEND=-1; + pendingCipsend=false; } } loopState=SKIPTOEND; From a65ca0b704cffb3564fbf17aabb82d623a37c761 Mon Sep 17 00:00:00 2001 From: Asbelos Date: Tue, 27 Oct 2020 12:33:01 +0000 Subject: [PATCH 16/17] Cleaner purge after error or connect fail --- WifiInboundHandler.cpp | 38 +++++++++++++++++--------------------- WifiInboundHandler.h | 1 + 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/WifiInboundHandler.cpp b/WifiInboundHandler.cpp index 00a682f..2463921 100644 --- a/WifiInboundHandler.cpp +++ b/WifiInboundHandler.cpp @@ -127,13 +127,10 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { break; } - if (ch=='E') { // ERROR - if (pendingCipsend) { + if (ch=='E' || ch=='l') { // ERROR or "link is not valid" + if (clientPendingCIPSEND>=0) { // A CIPSEND was errored... just toss it away - if (Diag::WIFI) DIAG(F("Wifi: drop previous CIPSEND\n")); - for (int i=0;i<=currentReplySize;i++) outboundRing->read(); - clientPendingCIPSEND=-1; - pendingCipsend=false; + purgeCurrentCIPSEND(); } loopState=SKIPTOEND; break; @@ -208,22 +205,13 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { loopState=(ch==',') ? GOT_CLIENT_ID2: SKIPTOEND; break; - case GOT_CLIENT_ID2: // got "x," before CLOSE or CONNECTED - loopState=(ch=='C') ? GOT_CLIENT_ID3: SKIPTOEND; + case GOT_CLIENT_ID2: // got "x," + if (ch=='C') { + // got "x C" before CLOSE or CONNECTED, or CONNECT FAILED + if (runningClientId==clientPendingCIPSEND) purgeCurrentCIPSEND(); + } + loopState=SKIPTOEND; break; - - case GOT_CLIENT_ID3: // got "x C" before CLOSE or CONNECTED (which is ignored) - if(ch=='L') { - // CLOSE - if (runningClientId==clientPendingCIPSEND) { - // clear the outbound for this client - for (int i=0;i<=currentReplySize;i++) outboundRing->read(); - clientPendingCIPSEND=-1; - pendingCipsend=false; - } - } - loopState=SKIPTOEND; - break; case SKIPTOEND: // skipping for /n if (ch=='\n') loopState=ANYTHING; @@ -232,3 +220,11 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { } // available return (loopState==ANYTHING) ? INBOUND_IDLE: INBOUND_BUSY; } + +void WifiInboundHandler::purgeCurrentCIPSEND() { + // A CIPSEND was sent but errored... or the client closed just toss it away + if (Diag::WIFI) DIAG(F("Wifi: DROPPING CIPSEND=%d,%d\n"),clientPendingCIPSEND,currentReplySize); + for (int i=0;i<=currentReplySize;i++) outboundRing->read(); + pendingCipsend=false; + clientPendingCIPSEND=-1; +} diff --git a/WifiInboundHandler.h b/WifiInboundHandler.h index 953b08d..1979565 100644 --- a/WifiInboundHandler.h +++ b/WifiInboundHandler.h @@ -44,6 +44,7 @@ class WifiInboundHandler { WifiInboundHandler(Stream * ESStream); void loop1(); INBOUND_STATE loop2(); + void purgeCurrentCIPSEND(); Stream * wifiStream; static const int INBOUND_RING = 512; From 96fba12d59ccdebf531a8ff602e668e2b17d637f Mon Sep 17 00:00:00 2001 From: Asbelos Date: Tue, 27 Oct 2020 12:50:01 +0000 Subject: [PATCH 17/17] ONLY 1 Call to WifiInboundHandler::setup! Or it wastes 1.5kb each time! --- WifiInterface.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/WifiInterface.cpp b/WifiInterface.cpp index 74018b9..9e7e6ed 100644 --- a/WifiInterface.cpp +++ b/WifiInterface.cpp @@ -90,6 +90,11 @@ bool WifiInterface::setup(long serial_link_speed, } #endif +DCCEXParser::setAtCommandCallback(ATCommand); + +// CAUTION... ONLY CALL THIS ONCE +WifiInboundHandler::setup(wifiStream); + return wifiUp; } @@ -109,8 +114,6 @@ bool WifiInterface::setup(Stream & setupStream, const __FlashStringHelper* SSid checkForOK(200, OK_SEARCH, true); } - DCCEXParser::setAtCommandCallback(ATCommand); - WifiInboundHandler::setup(wifiStream); DIAG(F("\n++ Wifi Setup %S ++\n"), connected ? F("OK") : F("FAILED")); return connected;