btclock/btclock_v3
3
1
Fork 2
Code Issues Pull requests 1 Projects Releases 15 Wiki Activity Actions

Bugfix for too short WiFi-setup passwords

Browse source
This commit is contained in:
Djuri Baars 2024-10-03 00:26:14 +02:00
parent 85579e98cf
commit b0ec0685a1
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data

@ -1 +1 @@
Subproject commit 95aa9d67d17dde32dab3216810e7b4e4086feb03 Subproject commit 9867988a095a09a693aa2dc567605d15cfe4ceb1

6
platformio.ini
View file

@ -15,7 +15,7 @@ default_envs = lolin_s3_mini_213epd, lolin_s3_mini_29epd, btclock_rev_b_213epd,
[btclock_base] [btclock_base]
platform = espressif32 @ ^6.8.1 platform = espressif32 @ ^6.9.0
framework = arduino, espidf framework = arduino, espidf
monitor_speed = 115200 monitor_speed = 115200
monitor_filters = esp32_exception_decoder, colorize monitor_filters = esp32_exception_decoder, colorize
@ -32,8 +32,8 @@ build_unflags =
-fno-exceptions -fno-exceptions
lib_deps = lib_deps =
https://github.com/joltwallet/esp_littlefs.git https://github.com/joltwallet/esp_littlefs.git
bblanchon/ArduinoJson@^7.1.0 bblanchon/ArduinoJson@^7.2.0
mathieucarbou/ESPAsyncWebServer @ 3.3.1 mathieucarbou/ESPAsyncWebServer @ 3.3.7
adafruit/Adafruit BusIO@^1.16.1 adafruit/Adafruit BusIO@^1.16.1
adafruit/Adafruit MCP23017 Arduino Library@^2.3.2 adafruit/Adafruit MCP23017 Arduino Library@^2.3.2
adafruit/Adafruit NeoPixel@^1.12.3 adafruit/Adafruit NeoPixel@^1.12.3

10
src/lib/config.cpp
View file

@ -145,7 +145,7 @@ void setupWifi()
WiFi.setHostname(softAP_SSID.c_str()); WiFi.setHostname(softAP_SSID.c_str());
String softAP_password = replaceAmbiguousChars( String softAP_password = replaceAmbiguousChars(
base64::encode(String(mac[2], 16) + String(mac[4], 16) + base64::encode(String(mac[2], 16) + String(mac[4], 16) +
String(mac[5], 16) + String(mac[1], 16)) String(mac[5], 16) + String(mac[1], 16) + String(mac[3], 16))
.substring(2, 10)); .substring(2, 10));
wm.setConfigPortalTimeout(preferences.getUInt("wpTimeout", DEFAULT_WP_TIMEOUT)); wm.setConfigPortalTimeout(preferences.getUInt("wpTimeout", DEFAULT_WP_TIMEOUT));
@ -155,10 +155,10 @@ void setupWifi()
wm.setAPCallback([&](WiFiManager *wifiManager) wm.setAPCallback([&](WiFiManager *wifiManager)
{ {
// Serial.printf("Entered config mode:ip=%s, ssid='%s', pass='%s'\n", Serial.printf("Entered config mode:ip=%s, ssid='%s', pass='%s'\n",
// WiFi.softAPIP().toString().c_str(), WiFi.softAPIP().toString().c_str(),
// wifiManager->getConfigPortalSSID().c_str(), wifiManager->getConfigPortalSSID().c_str(),
// softAP_password.c_str()); softAP_password.c_str());
// delay(6000); // delay(6000);
setFgColor(GxEPD_BLACK); setFgColor(GxEPD_BLACK);
setBgColor(GxEPD_WHITE); setBgColor(GxEPD_WHITE);