diff --git a/data b/data index 95aa9d6..9867988 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 95aa9d67d17dde32dab3216810e7b4e4086feb03 +Subproject commit 9867988a095a09a693aa2dc567605d15cfe4ceb1 diff --git a/platformio.ini b/platformio.ini index 30e03ec..59f20fb 100644 --- a/platformio.ini +++ b/platformio.ini @@ -15,7 +15,7 @@ default_envs = lolin_s3_mini_213epd, lolin_s3_mini_29epd, btclock_rev_b_213epd, [btclock_base] -platform = espressif32 @ ^6.8.1 +platform = espressif32 @ ^6.9.0 framework = arduino, espidf monitor_speed = 115200 monitor_filters = esp32_exception_decoder, colorize @@ -32,8 +32,8 @@ build_unflags = -fno-exceptions lib_deps = https://github.com/joltwallet/esp_littlefs.git - bblanchon/ArduinoJson@^7.1.0 - mathieucarbou/ESPAsyncWebServer @ 3.3.1 + bblanchon/ArduinoJson@^7.2.0 + mathieucarbou/ESPAsyncWebServer @ 3.3.7 adafruit/Adafruit BusIO@^1.16.1 adafruit/Adafruit MCP23017 Arduino Library@^2.3.2 adafruit/Adafruit NeoPixel@^1.12.3 diff --git a/src/lib/config.cpp b/src/lib/config.cpp index 17805c0..d20a9d3 100644 --- a/src/lib/config.cpp +++ b/src/lib/config.cpp @@ -145,7 +145,7 @@ void setupWifi() WiFi.setHostname(softAP_SSID.c_str()); String softAP_password = replaceAmbiguousChars( 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)); wm.setConfigPortalTimeout(preferences.getUInt("wpTimeout", DEFAULT_WP_TIMEOUT)); @@ -155,10 +155,10 @@ void setupWifi() wm.setAPCallback([&](WiFiManager *wifiManager) { - // Serial.printf("Entered config mode:ip=%s, ssid='%s', pass='%s'\n", - // WiFi.softAPIP().toString().c_str(), - // wifiManager->getConfigPortalSSID().c_str(), - // softAP_password.c_str()); + Serial.printf("Entered config mode:ip=%s, ssid='%s', pass='%s'\n", + WiFi.softAPIP().toString().c_str(), + wifiManager->getConfigPortalSSID().c_str(), + softAP_password.c_str()); // delay(6000); setFgColor(GxEPD_BLACK); setBgColor(GxEPD_WHITE);