mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-27 10:06:13 +01:00
Compare commits
2 Commits
811bce4b2a
...
6d0740eab4
Author | SHA1 | Date | |
---|---|---|---|
|
6d0740eab4 | ||
|
0a52a26d50 |
|
@ -1 +1 @@
|
||||||
#define GITHUB_SHA "devel-202401202116Z"
|
#define GITHUB_SHA "devel-202401212011Z"
|
||||||
|
|
|
@ -164,6 +164,8 @@ bool WifiESP::setup(const char *SSid,
|
||||||
if (haveSSID && havePassword && !forceAP) {
|
if (haveSSID && havePassword && !forceAP) {
|
||||||
WiFi.setHostname(hostname); // Strangely does not work unless we do it HERE!
|
WiFi.setHostname(hostname); // Strangely does not work unless we do it HERE!
|
||||||
WiFi.mode(WIFI_STA);
|
WiFi.mode(WIFI_STA);
|
||||||
|
WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); // Scan all channels so we find strongest
|
||||||
|
// (default in Wifi library is first match)
|
||||||
#ifdef SERIAL_BT_COMMANDS
|
#ifdef SERIAL_BT_COMMANDS
|
||||||
WiFi.setSleep(true);
|
WiFi.setSleep(true);
|
||||||
#else
|
#else
|
||||||
|
@ -204,7 +206,7 @@ bool WifiESP::setup(const char *SSid,
|
||||||
if (!haveSSID || forceAP) {
|
if (!haveSSID || forceAP) {
|
||||||
// prepare all strings
|
// prepare all strings
|
||||||
String strSSID(forceAP ? SSid : "DCCEX_");
|
String strSSID(forceAP ? SSid : "DCCEX_");
|
||||||
String strPass(forceAP ? password : "PASS_");
|
String strPass( (forceAP && havePassword) ? password : "PASS_");
|
||||||
if (!forceAP) {
|
if (!forceAP) {
|
||||||
String strMac = WiFi.macAddress();
|
String strMac = WiFi.macAddress();
|
||||||
strMac.remove(0,9);
|
strMac.remove(0,9);
|
||||||
|
@ -228,7 +230,8 @@ bool WifiESP::setup(const char *SSid,
|
||||||
// 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(5, F("Wifi: %s"), strSSID.c_str());
|
LCD(5, F("Wifi: %s"), strSSID.c_str());
|
||||||
LCD(6, F("PASS: %s"),havePassword ? password : strPass.c_str());
|
if (!havePassword)
|
||||||
|
LCD(6, 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());
|
||||||
LCD(7, F("IP: %s"),WiFi.softAPIP().toString().c_str());
|
LCD(7, F("IP: %s"),WiFi.softAPIP().toString().c_str());
|
||||||
wifiUp = true;
|
wifiUp = true;
|
||||||
|
|
|
@ -3,7 +3,9 @@
|
||||||
|
|
||||||
#include "StringFormatter.h"
|
#include "StringFormatter.h"
|
||||||
|
|
||||||
#define VERSION "5.2.27"
|
#define VERSION "5.2.28"
|
||||||
|
// 5.2.28 - ESP32: Can all Wifi channels.
|
||||||
|
// - ESP32: Only write Wifi password to display if it is a well known one
|
||||||
// 5.2.27 - Bugfix: IOExpander memory allocation
|
// 5.2.27 - Bugfix: IOExpander memory allocation
|
||||||
// 5.2.26 - Silently ignore overridden HAL defaults
|
// 5.2.26 - Silently ignore overridden HAL defaults
|
||||||
// - include HAL_IGNORE_DEFAULTS macro in EXRAIL
|
// - include HAL_IGNORE_DEFAULTS macro in EXRAIL
|
||||||
|
|
Loading…
Reference in New Issue
Block a user