From cc1cdc35ecced34810fab1cac2b3614b9805e47a Mon Sep 17 00:00:00 2001 From: Asbelos Date: Tue, 21 Dec 2021 10:16:45 +0000 Subject: [PATCH 1/4] one-off error in CIPSEND drop --- WifiInboundHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WifiInboundHandler.cpp b/WifiInboundHandler.cpp index a3768ad..56742d5 100644 --- a/WifiInboundHandler.cpp +++ b/WifiInboundHandler.cpp @@ -246,7 +246,7 @@ WifiInboundHandler::INBOUND_STATE WifiInboundHandler::loop2() { void WifiInboundHandler::purgeCurrentCIPSEND() { // A CIPSEND was sent but errored... or the client closed just toss it away DIAG(F("Wifi: DROPPING CIPSEND=%d,%d"),clientPendingCIPSEND,currentReplySize); - for (int i=0;i<=currentReplySize;i++) outboundRing->read(); + for (int i=0;iread(); pendingCipsend=false; clientPendingCIPSEND=-1; } From 7a7ca6a43616e056dc059a4c4ce2c76a03da5c3d Mon Sep 17 00:00:00 2001 From: Harald Barth Date: Tue, 21 Dec 2021 13:26:16 +0100 Subject: [PATCH 2/4] rc8 --- version.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/version.h b/version.h index 31be785..fb7626c 100644 --- a/version.h +++ b/version.h @@ -3,7 +3,7 @@ #include "StringFormatter.h" -#define VERSION "3.2.0 rc7" +#define VERSION "3.2.0 rc8" // 3.2.0 Major functional and non-functional changes. // New HAL added for I/O (digital and analogue inputs and outputs, servos etc). // Support for MCP23008, MCP23017 and PCF9584 I2C GPIO Extender modules. @@ -24,6 +24,7 @@ // Can disable EEPROM code // Can define border between long and short addresses // Turnout and accessory states (thrown/closed = 0/1 or 1/0) can be set to match RCN-213 +// Bugfix: one-off error in CIPSEND drop // ... // 3.1.7 Bugfix: Unknown locos should have speed forward // 3.1.6 Make output ID two bytes and guess format/size of registered outputs found in EEPROM From 00e3c80b442ac0964c4539eaa205da14bdc3c44f Mon Sep 17 00:00:00 2001 From: Harald Barth Date: Tue, 21 Dec 2021 12:28:31 +0000 Subject: [PATCH 3/4] Committing a SHA --- GITHUB_SHA.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h index 693983d..7e4bbea 100644 --- a/GITHUB_SHA.h +++ b/GITHUB_SHA.h @@ -1 +1 @@ -#define GITHUB_SHA "0f728c1" +#define GITHUB_SHA "7a7ca6a" From bbd569cc88b487392b80758282cd6dd203edab52 Mon Sep 17 00:00:00 2001 From: Harald Barth Date: Tue, 4 Jan 2022 19:47:57 +0100 Subject: [PATCH 4/4] add mDNS --- WifiInterface.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/WifiInterface.cpp b/WifiInterface.cpp index bd7b7f2..5db6934 100644 --- a/WifiInterface.cpp +++ b/WifiInterface.cpp @@ -277,10 +277,16 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password, StringFormatter::send(wifiStream, F("AT+CIPSERVER=0\r\n")); // turn off tcp server (to clean connections before CIPMUX=1) checkForOK(1000, true); // ignore result in case it already was off - + StringFormatter::send(wifiStream, F("AT+CIPMUX=1\r\n")); // configure for multiple connections if (!checkForOK(1000, true)) return WIFI_DISCONNECTED; + if(!oldCmd) { // no idea to test this on old firmware + StringFormatter::send(wifiStream, F("AT+MDNS=1,\"%S\",\"withrottle\",%d\r\n"), + hostname, port); // mDNS responder + checkForOK(1000, true); // dont care if not supported + } + StringFormatter::send(wifiStream, F("AT+CIPSERVER=1,%d\r\n"), port); // turn on server on port if (!checkForOK(1000, true)) return WIFI_DISCONNECTED; #endif //DONT_TOUCH_WIFI_CONF