mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-12-23 21:01:25 +01:00
Merge remote-tracking branch 'origin/mDNS' into EXRAILPlus
This commit is contained in:
commit
14ede75643
@ -1 +1 @@
|
|||||||
#define GITHUB_SHA "0f728c1"
|
#define GITHUB_SHA "7a7ca6a"
|
||||||
|
@ -281,6 +281,12 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
|
|||||||
StringFormatter::send(wifiStream, F("AT+CIPMUX=1\r\n")); // configure for multiple connections
|
StringFormatter::send(wifiStream, F("AT+CIPMUX=1\r\n")); // configure for multiple connections
|
||||||
if (!checkForOK(1000, true)) return WIFI_DISCONNECTED;
|
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
|
StringFormatter::send(wifiStream, F("AT+CIPSERVER=1,%d\r\n"), port); // turn on server on port
|
||||||
if (!checkForOK(1000, true)) return WIFI_DISCONNECTED;
|
if (!checkForOK(1000, true)) return WIFI_DISCONNECTED;
|
||||||
#endif //DONT_TOUCH_WIFI_CONF
|
#endif //DONT_TOUCH_WIFI_CONF
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#include "StringFormatter.h"
|
#include "StringFormatter.h"
|
||||||
|
|
||||||
#define VERSION "3.2.0 rc7"
|
#define VERSION "3.2.0 rc8"
|
||||||
// 3.2.0 Major functional and non-functional changes.
|
// 3.2.0 Major functional and non-functional changes.
|
||||||
// New HAL added for I/O (digital and analogue inputs and outputs, servos etc).
|
// New HAL added for I/O (digital and analogue inputs and outputs, servos etc).
|
||||||
// Support for MCP23008, MCP23017 and PCF9584 I2C GPIO Extender modules.
|
// Support for MCP23008, MCP23017 and PCF9584 I2C GPIO Extender modules.
|
||||||
@ -24,6 +24,7 @@
|
|||||||
// Can disable EEPROM code
|
// Can disable EEPROM code
|
||||||
// Can define border between long and short addresses
|
// 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
|
// 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.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
|
// 3.1.6 Make output ID two bytes and guess format/size of registered outputs found in EEPROM
|
||||||
|
Loading…
Reference in New Issue
Block a user