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

LCD IP messages updated plus WiThrottle.cpp Line 137

Browse Source
This commit is contained in:
Ash-4 2024-02-05 17:37:49 -06:00
parent 78178c2c45
commit 26b9e1f35f
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WiThrottle.cpp
View File

@ -134,7 +134,7 @@ void WiThrottle::parse(RingStream * stream, byte * cmdx) {
StringFormatter::send(stream,F("*%d\nHMConnected\n"),HEARTBEAT_SECONDS); StringFormatter::send(stream,F("*%d\nHMConnected\n"),HEARTBEAT_SECONDS);
} }
} } else sendIntro(stream);
while (cmd[0]) { while (cmd[0]) {
switch (cmd[0]) { switch (cmd[0]) {

15
WifiESP32.cpp
View File

@ -183,8 +183,8 @@ bool WifiESP::setup(const char *SSid,
DIAG(F("Wifi in STA mode")); DIAG(F("Wifi in STA mode"));
// //
if (MAX_MSG_SIZE < 20) { if (MAX_MSG_SIZE < 20) {
LCD(4, F("IP: %s"), WiFi.localIP().toString().c_str()); LCD(4, F("%s"), WiFi.localIP().toString().c_str());
LCD(5,F("PORT=%d WiFi"), IP_PORT); LCD(5,F("Port: %d"), IP_PORT);
} else { } else {
LCD(4, F("%s:%d"), WiFi.localIP().toString().c_str(), IP_PORT); LCD(4, F("%s:%d"), WiFi.localIP().toString().c_str(), IP_PORT);
} }
@ -235,10 +235,15 @@ bool WifiESP::setup(const char *SSid,
channel, false, 8)) { channel, false, 8)) {
// DIAG(F("Wifi AP SSID %s PASS %s"),strSSID.c_str(),havePassword ? password : strPass.c_str()); // DIAG(F("Wifi AP SSID %s PASS %s"),strSSID.c_str(),havePassword ? password : strPass.c_str());
DIAG(F("WiFi in AP mode")); DIAG(F("WiFi in AP mode"));
LCD(4, F("WiFi: %s"), strSSID.c_str()); if (MAX_MSG_SIZE < 20) {
LCD(5, F("%s:%d"),WiFi.softAPIP().toString().c_str(), IP_PORT); LCD(4, F("%s"), WiFi.softAPIP().toString().c_str());
LCD(5, F("Port: %d"), IP_PORT);
} else {
LCD(4, F("%s:%d"), WiFi.softAPIP().toString().c_str(), IP_PORT);
}
LCD(6, F("WiFi: %s"), strSSID.c_str());
if (!havePassword) if (!havePassword)
LCD(6, F("PASS: %s"),strPass.c_str()); LCD(7, F("Pass: %s"),strPass.c_str());
// DIAG(F("Wifi AP IP %s"),WiFi.softAPIP().toString().c_str()); // DIAG(F("Wifi AP IP %s"),WiFi.softAPIP().toString().c_str());
wifiUp = true; wifiUp = true;
APmode = true; APmode = true;

2
WifiInterface.cpp
View File

@ -368,7 +368,7 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
} }
if (MAX_MSG_SIZE < 20) { if (MAX_MSG_SIZE < 20) {
LCD(4,F("%s"),ipString); // There is not enough room on some LCDs to put a title to this LCD(4,F("%s"),ipString); // There is not enough room on some LCDs to put a title to this
LCD(5,F("PORT=%d WiFi"),port); LCD(5,F("Port: %d"),port);
} else { } else {
LCD(4,F("%s:%d"), ipString, port); LCD(4,F("%s:%d"), ipString, port);
} }