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

Cleaner purge on ERROR

Browse Source
This commit is contained in:
Asbelos 2020-10-27 11:04:51 +00:00
parent 6c0b5d82be
commit 138851f45f
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
WifiInboundHandler.cpp
View File

@ -85,7 +85,7 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() {
} }
switch (loopState) { 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 == '+') { if (ch == '+') {
loopState = IPD; loopState = IPD;
@ -110,6 +110,11 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() {
break; break;
} }
if (ch=='S') { // SEND OK probably
loopState=SKIPTOEND;
break;
}
if (ch=='b') { // This is a busy indicator... probabaly must restart a CIPSEND if (ch=='b') { // This is a busy indicator... probabaly must restart a CIPSEND
pendingCipsend=(clientPendingCIPSEND>=0); pendingCipsend=(clientPendingCIPSEND>=0);
loopState=SKIPTOEND; loopState=SKIPTOEND;
@ -122,6 +127,18 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() {
break; 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; break;
case IPD: // Looking for I in +IPD case IPD: // Looking for I in +IPD
@ -201,6 +218,8 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() {
if (runningClientId==clientPendingCIPSEND) { if (runningClientId==clientPendingCIPSEND) {
// clear the outbound for this client // 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; loopState=SKIPTOEND;