diff --git a/html/config.htm b/html/config.htm index d8c66bb..8f8b3e9 100644 --- a/html/config.htm +++ b/html/config.htm @@ -226,7 +226,7 @@
- +
diff --git a/html/config.min.htm b/html/config.min.htm index 9344bbc..39418a1 100644 --- a/html/config.min.htm +++ b/html/config.min.htm @@ -1 +1 @@ -Beer Gravity Monitor

Temperature Format:





(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file +Beer Gravity Monitor

Temperature Format:





(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file diff --git a/src/pushtarget.cpp b/src/pushtarget.cpp index c296b86..6f154e5 100644 --- a/src/pushtarget.cpp +++ b/src/pushtarget.cpp @@ -283,7 +283,7 @@ void PushTarget::sendMqtt(float angle, float gravity, float corrGravity, createIspindleFormat(doc, angle, gravity, corrGravity, temp, runTime); WiFiClient client; - MQTTClient mqtt; + MQTTClient mqtt(512); // Maximum message size mqtt.begin(myConfig.getMqttUrl(), client); mqtt.connect(myConfig.getMDNS(), myConfig.getMqttUser(), @@ -292,7 +292,7 @@ void PushTarget::sendMqtt(float angle, float gravity, float corrGravity, String json; serializeJson(doc, json); #if LOG_LEVEL == 6 && !defined(PUSH_DISABLE_LOGGING) - Log.verbose(F("PUSH: url %s." CR), serverPath.c_str()); + Log.verbose(F("PUSH: url %s." CR), myConfig.getMqttUrl()); Log.verbose(F("PUSH: json %s." CR), json.c_str()); #endif @@ -301,7 +301,7 @@ void PushTarget::sendMqtt(float angle, float gravity, float corrGravity, if (mqtt.publish(myConfig.getMqttTopic(), json)) { Log.notice(F("PUSH: MQTT publish successful" CR)); } else { - Log.error(F("PUSH: MQTT publish failed" CR)); + Log.error(F("PUSH: MQTT publish failed err=%d, ret=%d" CR), mqtt.lastError(), mqtt.returnCode()); } mqtt.disconnect(); diff --git a/src/wifi.cpp b/src/wifi.cpp index ede0971..2ff9567 100644 --- a/src/wifi.cpp +++ b/src/wifi.cpp @@ -83,6 +83,16 @@ WifiConnection::WifiConnection() { bool WifiConnection::hasConfig() { if (strlen(myConfig.getWifiSSID())) return true; if (strlen(userSSID)) return true; + + // Check if there are stored WIFI Settings we can use. + String ssid = WiFi.SSID(); + if (ssid.length()) { + Log.notice(F("WIFI: Found credentials in EEPORM." CR)); + myConfig.setWifiSSID(WiFi.SSID()); + myConfig.setWifiPass(WiFi.psk()); + myConfig.saveFile(); + return true; + } return false; }