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

Remove Improv WiFi since its causing problems

Browse source
This commit is contained in:
Djuri Baars 2023-11-15 00:12:06 +01:00
parent b2d07139c8
commit 43bf05ffb9
1 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/lib/config.cpp
View file

@ -75,10 +75,10 @@ void tryImprovSetup()
WiFi.setHostname(softAP_SSID.c_str()); WiFi.setHostname(softAP_SSID.c_str());
String softAP_password = base64::encode(String(mac[2], 16) + String(mac[4], 16) + String(mac[5], 16) + String(mac[1], 16)).substring(2, 10); String softAP_password = base64::encode(String(mac[2], 16) + String(mac[4], 16) + String(mac[5], 16) + String(mac[1], 16)).substring(2, 10);
wm.setConfigPortalTimeout(preferences.getUInt("wpTimeout", 600)); // wm.setConfigPortalTimeout(preferences.getUInt("wpTimeout", 600));
wm.setWiFiAutoReconnect(false); wm.setWiFiAutoReconnect(false);
wm.setDebugOutput(false); wm.setDebugOutput(false);
wm.setConfigPortalBlocking(false); wm.setConfigPortalBlocking(true);
wm.setAPCallback([&](WiFiManager *wifiManager) wm.setAPCallback([&](WiFiManager *wifiManager)
{ {
@ -107,33 +107,32 @@ void tryImprovSetup()
//waitUntilNoneBusy(); //waitUntilNoneBusy();
//std::array<String, NUM_SCREENS> epdContent = {"Welcome!", "Bienvenidos!", "Use\r\nweb-interface\r\nto configure", "Use\r\nla interfaz web\r\npara configurar", "Or restart\r\nwhile\r\nholding\r\n2nd button\r\r\nto start\r\n QR-config", "O reinicie\r\nmientras\r\n mantiene presionado\r\nel segundo botón\r\r\npara iniciar\r\nQR-config", ""}; //std::array<String, NUM_SCREENS> epdContent = {"Welcome!", "Bienvenidos!", "Use\r\nweb-interface\r\nto configure", "Use\r\nla interfaz web\r\npara configurar", "Or restart\r\nwhile\r\nholding\r\n2nd button\r\r\nto start\r\n QR-config", "O reinicie\r\nmientras\r\n mantiene presionado\r\nel segundo botón\r\r\npara iniciar\r\nQR-config", ""};
//setEpdContent(epdContent); //setEpdContent(epdContent);
esp_task_wdt_init(30, false); // esp_task_wdt_init(30, false);
uint count = 0; // uint count = 0;
while (WiFi.status() != WL_CONNECTED) // while (WiFi.status() != WL_CONNECTED)
{ // {
if (Serial.available() > 0) // if (Serial.available() > 0)
{ // {
uint8_t b = Serial.read(); // uint8_t b = Serial.read();
if (parse_improv_serial_byte(x_position, b, x_buffer, onImprovCommandCallback, onImprovErrorCallback)) // if (parse_improv_serial_byte(x_position, b, x_buffer, onImprovCommandCallback, onImprovErrorCallback))
{ // {
x_buffer[x_position++] = b; // x_buffer[x_position++] = b;
} // }
else // else
{ // {
x_position = 0; // x_position = 0;
} // }
} // }
count++; // count++;
if (count > 2000000) { // if (count > 2000000) {
queueLedEffect(LED_EFFECT_HEARTBEAT); // queueLedEffect(LED_EFFECT_HEARTBEAT);
count = 0; // count = 0;
} // }
esp_task_wdt_reset(); // }
} // esp_task_wdt_deinit();
esp_task_wdt_deinit(); // esp_task_wdt_reset();
esp_task_wdt_reset();
} }
setFgColor(preferences.getUInt("fgColor", DEFAULT_FG_COLOR)); setFgColor(preferences.getUInt("fgColor", DEFAULT_FG_COLOR));