Nano every2 (#129)
* Start adding back unowifi stuffz
* Uno Wifi compiling
* Fixes for compile arduino unowifi r2
* FlasString and Timers for Uno Wifi
ALL these changes should be portable back to master
* Remove extra timer that was already added
* Changed to EveryTimerB
* Add everytimerb.h
* Cleanup
* Linear address <a> cmd
* Allow lower case keywords
* Add the F define to be on safe side if it is not present in the library core code
* Clean simple Timer interface
Removes overkill files, puts all timer in a single small file. (DCCTimer)
* Timer port
* Timer working
And slow wave command removed
* Correcting non-portables merged from master
* Wave-state machine ( part 11)
* Microtuning waveform
Significant reduction in code paths and call overheads
* Current check cleanup
* Fix no-loco id
Has to handle -1 correctly
* fix wrong format letter
* redo flow through wifisetup again
* version++
* bugfixes wifi setup
* Retry harder for AP mode
* Remove unued if
* DIO2 replacement
Currently for writing signal pins during waveform.
* Drop analogReadFast (see DCCTimer)
AnalogRead speed set in DCCTimer for ease of porting.
Code tidy and diagnostics in MotorDriver
* UNTESTED fast power,brake,fault pins
* Distunguish between in/out of FASTPIN
* minor performance tweaks
* Config comments and example use
* Config/example loading
* IP/PORT on LCD
* Ethernet simulated mac
Plus fixed listening port
* Github SHA
* Committing a SHA
* Fix for nano compile
* Comments and a reliability fix.
* UnoRev2 protection
* PWM pin implementation
* fix wifi setup issue
* Reinstate IP_PORT
* Wifi channel and code cleaninga
* Reduce duplicated F() macros
Compiler isn't as clever as one might expect
* Committing a SHA
* Update config.example.h
Add comment to wifi channel section
* Committing a SHA
* Handle shields with common fault pins (Pololu)
* Committing a SHA
* remove warning
* Committing a SHA
* only do the sha generation on master
* yaml syntax
* Fast SSD1306 OLED driver
Incorporate code from SSD1306Ascii library to speed up OLED screen updates, reduce memory requirements and eliminate some library dependences.
* Fix auto-configure from cold boot.
Add call to Wire.begin().
* Update comment for OLED_DRIVER define.
* Update MotorDrivers.h
Add a motor board definition for using the IBT_2 board for a high current to the main track and keep the Arduino Motor Shield for operating the programming track.
* Committing a SHA
* Fix missing F in motor drivers
* JOIN relay pin
* Swap Join Relay high/low
* Hide WIFI_CONNECT_TIMEOUT
This is not what the config suggests it is... The timeout is in the ES and defaults to 15 seconds. Abandoning it early leads to confused setup.
* Enhance OLED/LCD speed
Write one character or position command per loop entry so as not to hold up the loop. Add support for SH1106 OLED as 132x64 size option.
* Enhance OLED/LCD speed
* Delete comment about OLED on UNO.
* Trim unwanted code
* Handle display types correctly
* Update comments
* Speed up OLED writes
Add new flushDisplay() to end any in-progress I2C transaction. Previously, an redundant command was sent that ended the in-progress transaction but also sent another complete, but unnecessary, transaction.
* Comments and copyright update
* Reduce RAM and flash requirement a few more bytes.
* Move statics into LCDDisplay class, and reduce RAM.
Some state variables were static in LCDDisplay.write(). Moved to class members. Also, types of data items like row, column & character position changed to int8_t to save a few bytes of RAM.
* Type lcdCols and lcdRows to unsigned.
Since lcdCols is normally 128, it needs to be uint8_t, not int8_t.
* remove timeout from user config
* faultpin is common only if it exists ; make code prettier
* Rationalisation of SSD1306 driver
Merge SSD1306AsciiWire.cpp into SSD1306Ascii.cpp and rename SSD1306AsciiWire.h as SSD1306Ascii.h.
Merge allFonts.h into System5x7.h and rename as SSD1306font.h.
Move all SSD1306 files into root folder to facilitate compilation in Arduino IDE.
* Fix some font attributes as const.
* Remove unused initialisation sequences for tiny oled screens
* Add m_ to variables
* Bump up I2C speed
Speed was 100kHz (default). Max for OLEDis 400kHz.
* Revert "Bump up I2C speed"
This reverts commit 1c1168f43314d3a6855738fbc406d5654e801831.
* Bump up I2C speed
Speed was 100kHz (default). Max for OLEDis 400kHz.
* Drop duplicate DIAG
* ignore mySetup.h files
* Restore uno to default_envs
Restore uno (previously commented out) to default_envs.
* Update objdump.bat
Allows other editors as Notepad is very slow on large files
* Prog Track overload during cv read
* Faster LCD Driver
Extract LCD driver from library;
Trim unused functionality;
Reduce I2C communications to minimum;
Speed up I2C clock to 400kHz.
* Update config.example.h
Add IBT_2_WITH_ARDUINO to example config
* Update config.example.h
* Screen enhancements (#126)
* Add I2CManager to coordinate I2C shared parameters.
* Add use of I2CManager, and experimental scrolling strategies.
New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line). If not defined, defaults to 0.
* Scrolling updates
New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line). If not defined, defaults to 0.
Reformat.
* Add I2CManager calls. Remove unnecessary delays.
* Add I2CManager calls, remove unnecessary I2C delays.
* SSD1306: Move methods from .h to .cpp and reformat.
* Fix compiler warning in LiquidCrystal_I2C
* Allow forcing of I2C clock speed.
New method forceClock allows the I2C speed to be overridden. For example, if the I2C bus is long then the speed can be forced lower. It can also be forced higher to gain performance if devices are capable.
* Make Config.h conditionally included.
Allow for non-existence of Config.h.
* Correct scrolling and allow longer messages
Correct the handling of scrolling in scrollmode 1 to avoid a blank page being displayed. Also, allow MAX_MSG_SIZE to be optionally configured to override maximum message length on screens.
* compiler warning on uno
Co-authored-by: dexslab <dex35803@gmail.com>
Co-authored-by: Asbelos <asbelos@btinternet.com>
Co-authored-by: Harald Barth <haba@kth.se>
Co-authored-by: Neil McKechnie <neilmck999@gmail.com>
Co-authored-by: Neil McKechnie <75813993+Neil-McK@users.noreply.github.com>
2021-03-07 21:58:35 +01:00
|
|
|
/*
|
2022-05-03 05:18:05 +02:00
|
|
|
© 2022 Mark Muzzin
|
|
|
|
© 2021 Fred Decker
|
|
|
|
© 2021 Fred Decker
|
|
|
|
© 2020-2021 Chris Harlow
|
|
|
|
© 2020, Chris Harlow. All rights reserved.
|
|
|
|
© 2020, Harald Barth.
|
|
|
|
|
|
|
|
This file is part of Asbelos DCC API
|
|
|
|
|
|
|
|
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/>.
|
|
|
|
*/
|
|
|
|
|
Nano every2 (#129)
* Start adding back unowifi stuffz
* Uno Wifi compiling
* Fixes for compile arduino unowifi r2
* FlasString and Timers for Uno Wifi
ALL these changes should be portable back to master
* Remove extra timer that was already added
* Changed to EveryTimerB
* Add everytimerb.h
* Cleanup
* Linear address <a> cmd
* Allow lower case keywords
* Add the F define to be on safe side if it is not present in the library core code
* Clean simple Timer interface
Removes overkill files, puts all timer in a single small file. (DCCTimer)
* Timer port
* Timer working
And slow wave command removed
* Correcting non-portables merged from master
* Wave-state machine ( part 11)
* Microtuning waveform
Significant reduction in code paths and call overheads
* Current check cleanup
* Fix no-loco id
Has to handle -1 correctly
* fix wrong format letter
* redo flow through wifisetup again
* version++
* bugfixes wifi setup
* Retry harder for AP mode
* Remove unued if
* DIO2 replacement
Currently for writing signal pins during waveform.
* Drop analogReadFast (see DCCTimer)
AnalogRead speed set in DCCTimer for ease of porting.
Code tidy and diagnostics in MotorDriver
* UNTESTED fast power,brake,fault pins
* Distunguish between in/out of FASTPIN
* minor performance tweaks
* Config comments and example use
* Config/example loading
* IP/PORT on LCD
* Ethernet simulated mac
Plus fixed listening port
* Github SHA
* Committing a SHA
* Fix for nano compile
* Comments and a reliability fix.
* UnoRev2 protection
* PWM pin implementation
* fix wifi setup issue
* Reinstate IP_PORT
* Wifi channel and code cleaninga
* Reduce duplicated F() macros
Compiler isn't as clever as one might expect
* Committing a SHA
* Update config.example.h
Add comment to wifi channel section
* Committing a SHA
* Handle shields with common fault pins (Pololu)
* Committing a SHA
* remove warning
* Committing a SHA
* only do the sha generation on master
* yaml syntax
* Fast SSD1306 OLED driver
Incorporate code from SSD1306Ascii library to speed up OLED screen updates, reduce memory requirements and eliminate some library dependences.
* Fix auto-configure from cold boot.
Add call to Wire.begin().
* Update comment for OLED_DRIVER define.
* Update MotorDrivers.h
Add a motor board definition for using the IBT_2 board for a high current to the main track and keep the Arduino Motor Shield for operating the programming track.
* Committing a SHA
* Fix missing F in motor drivers
* JOIN relay pin
* Swap Join Relay high/low
* Hide WIFI_CONNECT_TIMEOUT
This is not what the config suggests it is... The timeout is in the ES and defaults to 15 seconds. Abandoning it early leads to confused setup.
* Enhance OLED/LCD speed
Write one character or position command per loop entry so as not to hold up the loop. Add support for SH1106 OLED as 132x64 size option.
* Enhance OLED/LCD speed
* Delete comment about OLED on UNO.
* Trim unwanted code
* Handle display types correctly
* Update comments
* Speed up OLED writes
Add new flushDisplay() to end any in-progress I2C transaction. Previously, an redundant command was sent that ended the in-progress transaction but also sent another complete, but unnecessary, transaction.
* Comments and copyright update
* Reduce RAM and flash requirement a few more bytes.
* Move statics into LCDDisplay class, and reduce RAM.
Some state variables were static in LCDDisplay.write(). Moved to class members. Also, types of data items like row, column & character position changed to int8_t to save a few bytes of RAM.
* Type lcdCols and lcdRows to unsigned.
Since lcdCols is normally 128, it needs to be uint8_t, not int8_t.
* remove timeout from user config
* faultpin is common only if it exists ; make code prettier
* Rationalisation of SSD1306 driver
Merge SSD1306AsciiWire.cpp into SSD1306Ascii.cpp and rename SSD1306AsciiWire.h as SSD1306Ascii.h.
Merge allFonts.h into System5x7.h and rename as SSD1306font.h.
Move all SSD1306 files into root folder to facilitate compilation in Arduino IDE.
* Fix some font attributes as const.
* Remove unused initialisation sequences for tiny oled screens
* Add m_ to variables
* Bump up I2C speed
Speed was 100kHz (default). Max for OLEDis 400kHz.
* Revert "Bump up I2C speed"
This reverts commit 1c1168f43314d3a6855738fbc406d5654e801831.
* Bump up I2C speed
Speed was 100kHz (default). Max for OLEDis 400kHz.
* Drop duplicate DIAG
* ignore mySetup.h files
* Restore uno to default_envs
Restore uno (previously commented out) to default_envs.
* Update objdump.bat
Allows other editors as Notepad is very slow on large files
* Prog Track overload during cv read
* Faster LCD Driver
Extract LCD driver from library;
Trim unused functionality;
Reduce I2C communications to minimum;
Speed up I2C clock to 400kHz.
* Update config.example.h
Add IBT_2_WITH_ARDUINO to example config
* Update config.example.h
* Screen enhancements (#126)
* Add I2CManager to coordinate I2C shared parameters.
* Add use of I2CManager, and experimental scrolling strategies.
New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line). If not defined, defaults to 0.
* Scrolling updates
New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line). If not defined, defaults to 0.
Reformat.
* Add I2CManager calls. Remove unnecessary delays.
* Add I2CManager calls, remove unnecessary I2C delays.
* SSD1306: Move methods from .h to .cpp and reformat.
* Fix compiler warning in LiquidCrystal_I2C
* Allow forcing of I2C clock speed.
New method forceClock allows the I2C speed to be overridden. For example, if the I2C bus is long then the speed can be forced lower. It can also be forced higher to gain performance if devices are capable.
* Make Config.h conditionally included.
Allow for non-existence of Config.h.
* Correct scrolling and allow longer messages
Correct the handling of scrolling in scrollmode 1 to avoid a blank page being displayed. Also, allow MAX_MSG_SIZE to be optionally configured to override maximum message length on screens.
* compiler warning on uno
Co-authored-by: dexslab <dex35803@gmail.com>
Co-authored-by: Asbelos <asbelos@btinternet.com>
Co-authored-by: Harald Barth <haba@kth.se>
Co-authored-by: Neil McKechnie <neilmck999@gmail.com>
Co-authored-by: Neil McKechnie <75813993+Neil-McK@users.noreply.github.com>
2021-03-07 21:58:35 +01:00
|
|
|
#ifndef ARDUINO_AVR_UNO_WIFI_REV2
|
2020-10-05 19:42:31 +02:00
|
|
|
#include <Arduino.h>
|
|
|
|
#include "WifiInboundHandler.h"
|
2020-10-13 18:37:40 +02:00
|
|
|
#include "RingStream.h"
|
2020-10-05 19:42:31 +02:00
|
|
|
#include "CommandDistributor.h"
|
|
|
|
#include "DIAG.h"
|
|
|
|
|
|
|
|
WifiInboundHandler * WifiInboundHandler::singleton;
|
|
|
|
|
|
|
|
void WifiInboundHandler::setup(Stream * ESStream) {
|
2022-05-03 05:18:05 +02:00
|
|
|
singleton = new WifiInboundHandler(ESStream);
|
2020-10-05 19:42:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void WifiInboundHandler::loop() {
|
|
|
|
singleton->loop1();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
WifiInboundHandler::WifiInboundHandler(Stream * ESStream) {
|
2022-05-03 05:18:05 +02:00
|
|
|
wifiStream = ESStream;
|
|
|
|
clientPendingCIPSEND = -1;
|
|
|
|
inboundRing = new RingStream(INBOUND_RING);
|
|
|
|
outboundRing = new RingStream(OUTBOUND_RING);
|
|
|
|
cipSendStatus = CIP_SEND_NONE;
|
|
|
|
}
|
2020-10-05 19:42:31 +02:00
|
|
|
|
|
|
|
|
|
|
|
// Handle any inbound transmission
|
|
|
|
// +IPD,x,lll:data is stored in streamer[x]
|
2022-05-03 05:18:05 +02:00
|
|
|
// Other input returns
|
|
|
|
void WifiInboundHandler::loop1()
|
|
|
|
{
|
|
|
|
// First handle all inbound traffic events because they will block the sending
|
|
|
|
if (loop2() != INBOUND_IDLE) return;
|
|
|
|
|
|
|
|
WiThrottle::loop(outboundRing);
|
|
|
|
|
|
|
|
// If no sends are pending we can check if there is any more data to send
|
|
|
|
if (cipSendStatus == CIP_SEND_NONE) {
|
|
|
|
|
|
|
|
// If nothing is already CIPSEND pending, we can CIPSEND one reply
|
|
|
|
if (clientPendingCIPSEND < 0) {
|
|
|
|
|
|
|
|
//Read the next character in the outbound ring. If its -1, no data in the ring
|
|
|
|
clientPendingCIPSEND = outboundRing->read();
|
|
|
|
|
|
|
|
//If there is data in the ring
|
|
|
|
if (clientPendingCIPSEND >= 0 ) {
|
|
|
|
if (Diag::WIFI) DIAG( F("cipSendStatus = CIP_SEND_PENDING"));
|
|
|
|
//Get the length of the reply to send
|
|
|
|
currentReplySize = outboundRing->count();
|
|
|
|
//Set the pending CIPSEND flag
|
|
|
|
cipSendStatus = CIP_SEND_PENDING;
|
2020-10-05 19:42:31 +02:00
|
|
|
}
|
2022-05-03 05:18:05 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cipSendStatus == CIP_SEND_PENDING) {
|
|
|
|
if (Diag::WIFI) DIAG( F("WiFi: [[CIPSEND=%d,%d]]"), clientPendingCIPSEND, currentReplySize);
|
|
|
|
StringFormatter::send(wifiStream, F("AT+CIPSEND=%d,%d\r\n"), clientPendingCIPSEND, currentReplySize);
|
|
|
|
if (Diag::WIFI) DIAG( F("pendingCipsend = CIP_SEND_SENT"));
|
|
|
|
cipSendStatus = CIP_SEND_SENT;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// if something waiting to execute, we can call it
|
|
|
|
int clientId = inboundRing->read();
|
|
|
|
if (clientId >= 0) {
|
|
|
|
int count = inboundRing->count();
|
|
|
|
if (Diag::WIFI) DIAG(F("Wifi EXEC: %d %d:"), clientId, count);
|
|
|
|
byte cmd[count + 1];
|
|
|
|
for (int i = 0; i < count; i++) cmd[i] = inboundRing->read();
|
|
|
|
cmd[count] = 0;
|
|
|
|
if (Diag::WIFI) DIAG(F("%e"), cmd);
|
2020-10-13 18:37:40 +02:00
|
|
|
|
2022-05-03 05:18:05 +02:00
|
|
|
outboundRing->mark(clientId); // remember start of outbound data
|
|
|
|
CommandDistributor::parse(clientId, cmd, outboundRing);
|
2020-10-05 19:42:31 +02:00
|
|
|
|
2022-05-03 05:18:05 +02:00
|
|
|
// The commit call will either write the length bytes
|
|
|
|
// OR rollback to the mark because the reply is empty or commend generated more than fits the buffer
|
|
|
|
if (outboundRing->commit() == false) {
|
|
|
|
DIAG(F("OUTBOUND FULL processing cmd:%s"), cmd);
|
|
|
|
outboundRing->flush();
|
|
|
|
inboundRing->flush();
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Fixed length atoi
|
|
|
|
int WifiInboundHandler::antoi(char* str, int len) {
|
|
|
|
int res = 0;
|
2020-10-05 19:42:31 +02:00
|
|
|
|
2022-05-03 05:18:05 +02:00
|
|
|
for (int i = 0; i != len; ++i)
|
|
|
|
res = res * 10 + str[i] - '0';
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
2020-10-05 19:42:31 +02:00
|
|
|
|
2022-05-03 05:18:05 +02:00
|
|
|
// This loop processes the inbound bytes from an ES AT command processor
|
2020-10-05 19:42:31 +02:00
|
|
|
WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() {
|
|
|
|
|
2022-05-03 05:18:05 +02:00
|
|
|
INBOUND_STATE retVal = INBOUND_IDLE;
|
|
|
|
char *stringStartPos = NULL;
|
|
|
|
char *stringEndPos = NULL;
|
|
|
|
char ch = 0;
|
|
|
|
int i;
|
|
|
|
bool exitLoop = false;
|
2020-10-05 19:42:31 +02:00
|
|
|
|
2022-05-03 05:18:05 +02:00
|
|
|
//Main message input loop
|
|
|
|
//This loop fills the small receive buffer one message at a time
|
|
|
|
//The execption is the +IPD message. Only the data up to the ':' character (end of length)
|
|
|
|
//is put in this buffer. The actual +IPD data is written directly into the inbound buffer
|
|
|
|
while (!exitLoop)
|
|
|
|
{
|
|
|
|
//We exit this loop either if there is no data available, or we have a complete message to process
|
|
|
|
while (wifiStream->available() && messageToProcess == RECV_MSG_NONE)
|
|
|
|
{
|
|
|
|
//Read next character
|
|
|
|
ch = wifiStream->read();
|
|
|
|
|
|
|
|
//Add to receive buffer if there is space
|
|
|
|
if (recBufferPos < INBOUND_CMD_BUFFER) {
|
|
|
|
recBuffer[recBufferPos++] = ch;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (Diag::WIFI) DIAG(F("WARN: Message too long for INBOUND BUFFER, purging"));
|
|
|
|
memset(recBuffer, 0, INBOUND_CMD_BUFFER);
|
|
|
|
recBufferPos = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (Diag::WIFI) StringFormatter::printEscape(ch);
|
|
|
|
|
|
|
|
//Process data ending in \r\n
|
|
|
|
if ((recBuffer[recBufferPos - 2] == '\r') && (recBuffer[recBufferPos - 1] == '\n')) {
|
|
|
|
messageToProcess = RECV_MSG_CRLF;
|
|
|
|
}
|
|
|
|
|
|
|
|
//Ready to send data, will always be the first char in the message
|
|
|
|
else if (recBuffer[0] == '>') {
|
|
|
|
messageToProcess = RECV_MSG_SND_DATA;
|
|
|
|
}
|
|
|
|
|
|
|
|
//IPD message
|
|
|
|
else if ((stringStartPos = strstr(recBuffer, "+IPD,")) != NULL && (stringEndPos = strstr(recBuffer, ":")) != NULL) {
|
|
|
|
//Advance the start string to the beginning of the length
|
|
|
|
stringStartPos += strlen("+IPD,");
|
|
|
|
|
|
|
|
//Get the end of the client ID
|
|
|
|
stringEndPos = strstr(stringStartPos, ",");
|
|
|
|
|
|
|
|
//Get the client Id
|
|
|
|
runningClientId = antoi(stringStartPos, stringEndPos - stringStartPos);
|
|
|
|
|
|
|
|
//Get the data length
|
|
|
|
stringStartPos = stringEndPos + 1;
|
|
|
|
stringEndPos = strstr(stringStartPos, ":");
|
|
|
|
dataLength = antoi(stringStartPos, stringEndPos - stringStartPos);
|
|
|
|
|
|
|
|
if(dataLength > 0) {
|
|
|
|
//Set the remaining data length
|
|
|
|
dataRemaining = dataLength;
|
|
|
|
messageToProcess = RECV_MSG_IPD_MSG;
|
2020-10-05 19:42:31 +02:00
|
|
|
}
|
2022-05-03 05:18:05 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//Process messages
|
|
|
|
switch (messageToProcess) {
|
|
|
|
case RECV_MSG_NONE:
|
|
|
|
//Check if the buffer position is not zero
|
|
|
|
if (recBufferPos != 0) {
|
|
|
|
//No message to process, but buffer has some data already
|
|
|
|
retVal = INBOUND_BUSY;
|
2020-10-05 19:42:31 +02:00
|
|
|
}
|
2022-05-03 05:18:05 +02:00
|
|
|
else {
|
|
|
|
//No message to process, no data in buffer
|
|
|
|
retVal = INBOUND_IDLE;
|
2020-10-27 12:04:51 +01:00
|
|
|
}
|
2022-05-03 05:18:05 +02:00
|
|
|
exitLoop = true;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case RECV_MSG_CRLF:
|
|
|
|
|
|
|
|
//Check for a SEND FAIL message
|
|
|
|
if (strstr(recBuffer, "SEND FAIL") != NULL) {
|
|
|
|
if (Diag::WIFI) DIAG(F("[SEND FAIL - detected"));
|
|
|
|
if (cipSendStatus == CIP_SEND_DATA_SENT) {
|
|
|
|
if (Diag::WIFI) DIAG( F("pendingCipsend = CIP_SEND_NONE"));
|
|
|
|
cipSendStatus = CIP_SEND_NONE;
|
|
|
|
}
|
2020-10-05 19:42:31 +02:00
|
|
|
}
|
2022-05-03 05:18:05 +02:00
|
|
|
|
|
|
|
//Check for a SEND OK message
|
|
|
|
else if (strstr(recBuffer, "SEND OK") != NULL) {
|
|
|
|
if (Diag::WIFI) DIAG(F("[SEND OK - detected"));
|
|
|
|
if (cipSendStatus == CIP_SEND_DATA_SENT) {
|
|
|
|
if (Diag::WIFI) DIAG( F("pendingCipsend = CIP_SEND_NONE"));
|
|
|
|
cipSendStatus = CIP_SEND_NONE;
|
|
|
|
}
|
2020-10-05 19:42:31 +02:00
|
|
|
}
|
2020-10-27 12:04:51 +01:00
|
|
|
|
2022-05-03 05:18:05 +02:00
|
|
|
//Check for an error
|
|
|
|
else if (strstr(recBuffer, "ERROR") != NULL) {
|
|
|
|
if (clientPendingCIPSEND >= 0) {
|
|
|
|
if (Diag::WIFI) DIAG(F("[ERROR detected - purging CIPSEND"));
|
2020-10-27 12:04:51 +01:00
|
|
|
// A CIPSEND was errored... just toss it away
|
2022-05-03 05:18:05 +02:00
|
|
|
purgeCurrentCIPSEND();
|
2020-10-27 12:04:51 +01:00
|
|
|
}
|
|
|
|
}
|
2022-05-03 05:18:05 +02:00
|
|
|
|
|
|
|
//Check for an tcp connection closed
|
|
|
|
else if (strstr(recBuffer, "link is not valid") != NULL) {
|
|
|
|
if (clientPendingCIPSEND >= 0) {
|
|
|
|
if (Diag::WIFI) DIAG(F("['link is not valid' detected - purging CIPSEND]"));
|
|
|
|
purgeCurrentCIPSEND();
|
|
|
|
}
|
2020-10-05 19:42:31 +02:00
|
|
|
}
|
|
|
|
break;
|
2022-05-03 05:18:05 +02:00
|
|
|
|
|
|
|
case RECV_MSG_SND_DATA:
|
|
|
|
if (Diag::WIFI) DIAG(F("[XMIT %d]"), currentReplySize);
|
|
|
|
for (i = 0; i < currentReplySize; i++)
|
|
|
|
{
|
|
|
|
//Read data from the outboundRing and write to to Wifi
|
|
|
|
int cout = outboundRing->read();
|
|
|
|
wifiStream->write(cout);
|
|
|
|
if (Diag::WIFI) StringFormatter::printEscape(cout); // DIAG in disguise
|
|
|
|
}
|
|
|
|
|
|
|
|
//Set CIPSEND flag to -1
|
|
|
|
clientPendingCIPSEND = -1;
|
|
|
|
if (Diag::WIFI) DIAG( F("pendingCipsend = CIP_SEND_DATA_SENT"));
|
|
|
|
cipSendStatus = CIP_SEND_DATA_SENT;
|
2020-10-05 19:42:31 +02:00
|
|
|
break;
|
2022-05-03 05:18:05 +02:00
|
|
|
|
|
|
|
case RECV_MSG_IPD_MSG:
|
|
|
|
|
|
|
|
//Mark the location with the client ID
|
|
|
|
if (dataRemaining == dataLength) {
|
|
|
|
if (Diag::WIFI) DIAG(F("Wifi inbound data(%d:%d):"), runningClientId, dataLength);
|
|
|
|
inboundRing->mark(runningClientId);
|
|
|
|
}
|
|
|
|
|
|
|
|
while (wifiStream->available()) {
|
|
|
|
//Read next character (data byte)
|
|
|
|
ch = wifiStream->read();
|
|
|
|
if (Diag::WIFI) StringFormatter::printEscape(ch);
|
2022-05-04 04:48:13 +02:00
|
|
|
if (Diag::WIFI) DIAG(F("[+IPD %d]"), dataRemaining);
|
2022-05-03 05:18:05 +02:00
|
|
|
dataRemaining--;
|
|
|
|
|
|
|
|
//Check if we would overflow the inbound ring
|
|
|
|
if (inboundRing->freeSpace() <= (dataLength + 1))
|
|
|
|
{
|
|
|
|
DIAG(F("Wifi OVERFLOW IGNORING:"));
|
|
|
|
|
|
|
|
//If we have an overflow, flush the remaining bytes
|
|
|
|
do{
|
|
|
|
ch = wifiStream->read();
|
|
|
|
}while(dataRemaining--);
|
|
|
|
|
|
|
|
outboundRing->flush();
|
|
|
|
inboundRing->flush();
|
|
|
|
|
|
|
|
messageToProcess = RECV_MSG_IPD_DONE;
|
2020-10-05 19:42:31 +02:00
|
|
|
break;
|
|
|
|
}
|
2022-05-03 05:18:05 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
// Write data to inbound ring
|
|
|
|
inboundRing->write(ch);
|
|
|
|
|
|
|
|
// Commit inbound ring data
|
|
|
|
if (dataRemaining == 0) {
|
|
|
|
if (Diag::WIFI) DIAG(F("COMMIT"));
|
|
|
|
if(inboundRing->commit() == false) {
|
|
|
|
outboundRing->flush();
|
|
|
|
inboundRing->flush();
|
|
|
|
}
|
|
|
|
messageToProcess = RECV_MSG_IPD_DONE;
|
|
|
|
break;
|
|
|
|
}
|
2020-10-26 13:59:40 +01:00
|
|
|
}
|
2020-10-05 19:42:31 +02:00
|
|
|
}
|
|
|
|
break;
|
2022-05-03 05:18:05 +02:00
|
|
|
|
|
|
|
//Catch-all for messages we don't care about
|
|
|
|
default:
|
|
|
|
//Check if the buffer position is not zero
|
|
|
|
if (recBufferPos != 0)
|
|
|
|
{
|
|
|
|
//In process of receiving, return with busy so we can wait for the remaining part of the message
|
|
|
|
retVal = INBOUND_BUSY;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
// Not receiving a message so this message was not important
|
|
|
|
messageToProcess = RECV_MSG_GENERIC;
|
2020-10-05 19:42:31 +02:00
|
|
|
}
|
|
|
|
break;
|
2022-05-03 05:18:05 +02:00
|
|
|
}
|
2020-10-05 19:42:31 +02:00
|
|
|
|
2022-05-03 05:18:05 +02:00
|
|
|
//If we processed a message, clear and get ready for the next message
|
|
|
|
if (messageToProcess != RECV_MSG_NONE && messageToProcess != RECV_MSG_IPD_MSG) {
|
|
|
|
//Reset buffer to start processing next message
|
|
|
|
memset(recBuffer, 0, INBOUND_CMD_BUFFER);
|
|
|
|
//Reset receive buffer position
|
|
|
|
recBufferPos = 0;
|
|
|
|
//Reset message to process
|
|
|
|
messageToProcess = RECV_MSG_NONE;
|
|
|
|
}
|
|
|
|
}
|
2020-10-26 13:59:40 +01:00
|
|
|
|
2022-05-03 05:18:05 +02:00
|
|
|
return retVal;
|
2020-10-05 19:42:31 +02:00
|
|
|
}
|
2020-10-27 13:33:01 +01:00
|
|
|
|
|
|
|
void WifiInboundHandler::purgeCurrentCIPSEND() {
|
2022-05-03 05:18:05 +02:00
|
|
|
// A CIPSEND was sent but errored... or the client closed just toss it away
|
|
|
|
//CommandDistributor::forget(clientPendingCIPSEND);
|
|
|
|
DIAG(F("Wifi: DROPPING CIPSEND=%d,%d"), clientPendingCIPSEND, currentReplySize);
|
|
|
|
for (int i = 0; i < currentReplySize; i++) {
|
|
|
|
outboundRing->read();
|
|
|
|
}
|
|
|
|
|
|
|
|
//If CIP SEND was sent, flush out by writing 0s */
|
|
|
|
if (cipSendStatus == CIP_SEND_SENT) {
|
|
|
|
for (int i = 0; i < currentReplySize; i++) {
|
|
|
|
int c = 0;
|
|
|
|
wifiStream->write(c);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
cipSendStatus = CIP_SEND_NONE;
|
|
|
|
clientPendingCIPSEND = -1;
|
2020-10-27 13:33:01 +01:00
|
|
|
}
|
Nano every2 (#129)
* Start adding back unowifi stuffz
* Uno Wifi compiling
* Fixes for compile arduino unowifi r2
* FlasString and Timers for Uno Wifi
ALL these changes should be portable back to master
* Remove extra timer that was already added
* Changed to EveryTimerB
* Add everytimerb.h
* Cleanup
* Linear address <a> cmd
* Allow lower case keywords
* Add the F define to be on safe side if it is not present in the library core code
* Clean simple Timer interface
Removes overkill files, puts all timer in a single small file. (DCCTimer)
* Timer port
* Timer working
And slow wave command removed
* Correcting non-portables merged from master
* Wave-state machine ( part 11)
* Microtuning waveform
Significant reduction in code paths and call overheads
* Current check cleanup
* Fix no-loco id
Has to handle -1 correctly
* fix wrong format letter
* redo flow through wifisetup again
* version++
* bugfixes wifi setup
* Retry harder for AP mode
* Remove unued if
* DIO2 replacement
Currently for writing signal pins during waveform.
* Drop analogReadFast (see DCCTimer)
AnalogRead speed set in DCCTimer for ease of porting.
Code tidy and diagnostics in MotorDriver
* UNTESTED fast power,brake,fault pins
* Distunguish between in/out of FASTPIN
* minor performance tweaks
* Config comments and example use
* Config/example loading
* IP/PORT on LCD
* Ethernet simulated mac
Plus fixed listening port
* Github SHA
* Committing a SHA
* Fix for nano compile
* Comments and a reliability fix.
* UnoRev2 protection
* PWM pin implementation
* fix wifi setup issue
* Reinstate IP_PORT
* Wifi channel and code cleaninga
* Reduce duplicated F() macros
Compiler isn't as clever as one might expect
* Committing a SHA
* Update config.example.h
Add comment to wifi channel section
* Committing a SHA
* Handle shields with common fault pins (Pololu)
* Committing a SHA
* remove warning
* Committing a SHA
* only do the sha generation on master
* yaml syntax
* Fast SSD1306 OLED driver
Incorporate code from SSD1306Ascii library to speed up OLED screen updates, reduce memory requirements and eliminate some library dependences.
* Fix auto-configure from cold boot.
Add call to Wire.begin().
* Update comment for OLED_DRIVER define.
* Update MotorDrivers.h
Add a motor board definition for using the IBT_2 board for a high current to the main track and keep the Arduino Motor Shield for operating the programming track.
* Committing a SHA
* Fix missing F in motor drivers
* JOIN relay pin
* Swap Join Relay high/low
* Hide WIFI_CONNECT_TIMEOUT
This is not what the config suggests it is... The timeout is in the ES and defaults to 15 seconds. Abandoning it early leads to confused setup.
* Enhance OLED/LCD speed
Write one character or position command per loop entry so as not to hold up the loop. Add support for SH1106 OLED as 132x64 size option.
* Enhance OLED/LCD speed
* Delete comment about OLED on UNO.
* Trim unwanted code
* Handle display types correctly
* Update comments
* Speed up OLED writes
Add new flushDisplay() to end any in-progress I2C transaction. Previously, an redundant command was sent that ended the in-progress transaction but also sent another complete, but unnecessary, transaction.
* Comments and copyright update
* Reduce RAM and flash requirement a few more bytes.
* Move statics into LCDDisplay class, and reduce RAM.
Some state variables were static in LCDDisplay.write(). Moved to class members. Also, types of data items like row, column & character position changed to int8_t to save a few bytes of RAM.
* Type lcdCols and lcdRows to unsigned.
Since lcdCols is normally 128, it needs to be uint8_t, not int8_t.
* remove timeout from user config
* faultpin is common only if it exists ; make code prettier
* Rationalisation of SSD1306 driver
Merge SSD1306AsciiWire.cpp into SSD1306Ascii.cpp and rename SSD1306AsciiWire.h as SSD1306Ascii.h.
Merge allFonts.h into System5x7.h and rename as SSD1306font.h.
Move all SSD1306 files into root folder to facilitate compilation in Arduino IDE.
* Fix some font attributes as const.
* Remove unused initialisation sequences for tiny oled screens
* Add m_ to variables
* Bump up I2C speed
Speed was 100kHz (default). Max for OLEDis 400kHz.
* Revert "Bump up I2C speed"
This reverts commit 1c1168f43314d3a6855738fbc406d5654e801831.
* Bump up I2C speed
Speed was 100kHz (default). Max for OLEDis 400kHz.
* Drop duplicate DIAG
* ignore mySetup.h files
* Restore uno to default_envs
Restore uno (previously commented out) to default_envs.
* Update objdump.bat
Allows other editors as Notepad is very slow on large files
* Prog Track overload during cv read
* Faster LCD Driver
Extract LCD driver from library;
Trim unused functionality;
Reduce I2C communications to minimum;
Speed up I2C clock to 400kHz.
* Update config.example.h
Add IBT_2_WITH_ARDUINO to example config
* Update config.example.h
* Screen enhancements (#126)
* Add I2CManager to coordinate I2C shared parameters.
* Add use of I2CManager, and experimental scrolling strategies.
New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line). If not defined, defaults to 0.
* Scrolling updates
New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line). If not defined, defaults to 0.
Reformat.
* Add I2CManager calls. Remove unnecessary delays.
* Add I2CManager calls, remove unnecessary I2C delays.
* SSD1306: Move methods from .h to .cpp and reformat.
* Fix compiler warning in LiquidCrystal_I2C
* Allow forcing of I2C clock speed.
New method forceClock allows the I2C speed to be overridden. For example, if the I2C bus is long then the speed can be forced lower. It can also be forced higher to gain performance if devices are capable.
* Make Config.h conditionally included.
Allow for non-existence of Config.h.
* Correct scrolling and allow longer messages
Correct the handling of scrolling in scrollmode 1 to avoid a blank page being displayed. Also, allow MAX_MSG_SIZE to be optionally configured to override maximum message length on screens.
* compiler warning on uno
Co-authored-by: dexslab <dex35803@gmail.com>
Co-authored-by: Asbelos <asbelos@btinternet.com>
Co-authored-by: Harald Barth <haba@kth.se>
Co-authored-by: Neil McKechnie <neilmck999@gmail.com>
Co-authored-by: Neil McKechnie <75813993+Neil-McK@users.noreply.github.com>
2021-03-07 21:58:35 +01:00
|
|
|
|
|
|
|
#endif
|