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

WifiInterface compiles

Browse Source 
Basic logic compiles... untested
This commit is contained in:
Asbelos
2020-06-13 09:36:10 +01:00
parent 0a60a36d30
commit 2a36ad365c
7 changed files with 241 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
WifiInterface.cpp
View File

@@ -3,14 +3,22 @@
#include "DIAG.h"
#include "StringFormatter.h"
const char READY_SEARCH[]="\r\nready\r\n";
const char OK_SEARCH[]="\r\nOK\r\n";
bool WifiInterface::connected=false;
DCCEXParser WifiInterface::parser;
byte WifiInterface::loopstate=0;
int WifiInterface::datalength=0;
int WifiInterface::connectionId;
byte WifiInterface::buffer[MAX_WIFI_BUFFER];
MemStream WifiInterface::streamer(buffer,sizeof(buffer));
void WifiInterface::setup() {
DIAG(F("\n++++++ Wifi Setup In Progress ++++++++\n"));
connected=setup2();
// TODO calloc the buffer and streamer and parser etc
DIAG(F("\n++++++ Wifi Setup %s ++++++++\n"), connected?"OK":"FAILED");
}
@@ -63,16 +71,55 @@ bool WifiInterface::checkForOK( const int timeout,char * search) {
return false;
}
void WifiInterface::loop(DCCEXParser & parser) {
void WifiInterface::loop() {
if (!connected) return;
while(Serial1.available()) Serial.write(Serial1.read());
// TODO Read incoming...
// if starts +IPD
// get session id
// fill buffer
// set session id into PrintAT
// call parser
// implement parser flush
}
// read anything into a buffer, collecting info on the way
while (loopstate!=99 && Serial1.available()) {
int ch=Serial1.read();
switch (loopstate) {
case 0: // looking for +
connectionId=0;
streamer.flush();
if (ch=='+') loopstate=1;
break;
case 1: // Looking for I
loopstate= (ch=='I')?2:0;
break;
case 2: // Looking for P
loopstate= (ch=='P')?3:0;
break;
case 3: // Looking for D
loopstate= (ch=='D')?4:0;
break;
case 4: // Looking for ,
loopstate= (ch==',')?5:0;
break;
case 5: // reading connection id
if (ch==',') loopstate=6;
else connectionId=10*connectionId+(ch-'0');
break;
case 6: // reading for length
if (ch==':') loopstate=(datalength==0)?99:7; // 99 is getout without reading next char
else datalength=datalength*10 + (ch-'0');
break;
case 7: // reading data
datalength--;
if (datalength==0) loopstate=99;
break;
} // switch
} // while
if (loopstate!=99) return;
// TODO remove > in data
streamer.write('\0');
streamer.flush(); // reset write position to start of buffer
// 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.
// TODO ... tell parser that callbacks are diallowed because we dont want to handle the async
parser.parse(streamer,buffer+1);
StringFormatter::send(Serial1,F("AT+CIPSEND=%d,%d\r\n>%s"),connectionId,streamer.available(),buffer);
loopstate=0;
}