Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
iranl
2024-09-06 21:14:37 +02:00
parent 26eace46e4
commit c9281d9299
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/WiFiManager/WiFiManager.cpp
View File

@@ -1129,7 +1129,7 @@ bool WiFiManager::wifiConnectNew(String ssid, String pass,bool connect){
DEBUG_WM(F("find best RSSI: TRUE")); DEBUG_WM(F("find best RSSI: TRUE"));
#endif #endif
if (!_numNetworks) if (!_numNetworks)
WiFi_scanNetworks(false, _enableCaptivePortal); // scan in case this gets called before any scans WiFi_scanNetworks(false, false); // scan in case this gets called before any scans
int n = _numNetworks; int n = _numNetworks;
if (n == 0) { if (n == 0) {
@@ -1218,7 +1218,7 @@ bool WiFiManager::wifiConnectDefault(){
DEBUG_WM(F("find best RSSI: TRUE")); DEBUG_WM(F("find best RSSI: TRUE"));
#endif #endif
if (!_numNetworks) if (!_numNetworks)
WiFi_scanNetworks(false, _enableCaptivePortal); // scan in case this gets called before any scans WiFi_scanNetworks(false, false); // scan in case this gets called before any scans
int n = _numNetworks; int n = _numNetworks;
if (n == 0) { if (n == 0) {

2
src/Config.h
View File

@@ -4,7 +4,7 @@
#define NUKI_HUB_VERSION "9.01" #define NUKI_HUB_VERSION "9.01"
#define NUKI_HUB_BUILD "unknownbuildnr" #define NUKI_HUB_BUILD "unknownbuildnr"
#define NUKI_HUB_DATE "2024-09-01" #define NUKI_HUB_DATE "2024-09-06"
#define GITHUB_LATEST_RELEASE_URL (char*)"https://github.com/technyon/nuki_hub/releases/latest" #define GITHUB_LATEST_RELEASE_URL (char*)"https://github.com/technyon/nuki_hub/releases/latest"
#define GITHUB_OTA_MANIFEST_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/manifest.json" #define GITHUB_OTA_MANIFEST_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/manifest.json"

4
src/NukiNetwork.cpp
View File

@@ -598,13 +598,16 @@ void NukiNetwork::mqtt_event_handler(void *handler_args, esp_event_base_t base,
switch ((esp_mqtt_event_id_t)event_id) { switch ((esp_mqtt_event_id_t)event_id) {
case MQTT_EVENT_CONNECTED: case MQTT_EVENT_CONNECTED:
ESP_LOGI(MQTT_TAG, "MQTT_EVENT_CONNECTED"); ESP_LOGI(MQTT_TAG, "MQTT_EVENT_CONNECTED");
Log->println("MQTT Connected");
_mqttClientInitiated = true; _mqttClientInitiated = true;
_mqttConnected = true; _mqttConnected = true;
reconnect(); reconnect();
break; break;
case MQTT_EVENT_DISCONNECTED: case MQTT_EVENT_DISCONNECTED:
ESP_LOGI(MQTT_TAG, "MQTT_EVENT_DISCONNECTED"); ESP_LOGI(MQTT_TAG, "MQTT_EVENT_DISCONNECTED");
Log->println("MQTT Disconnected");
_mqttConnected = false; _mqttConnected = false;
reconnect();
break; break;
case MQTT_EVENT_SUBSCRIBED: case MQTT_EVENT_SUBSCRIBED:
ESP_LOGI(MQTT_TAG, "MQTT_EVENT_SUBSCRIBED, msg_id=%d", event->msg_id); ESP_LOGI(MQTT_TAG, "MQTT_EVENT_SUBSCRIBED, msg_id=%d", event->msg_id);
@@ -637,7 +640,6 @@ bool NukiNetwork::reconnect()
{ {
if (_mqttConnected) if (_mqttConnected)
{ {
Log->println(F("MQTT connected"));
_mqttConnectedTs = millis(); _mqttConnectedTs = millis();
_mqttConnectionState = 1; _mqttConnectionState = 1;
delay(100); delay(100);

1
src/WebCfgServer.cpp
View File

@@ -3234,7 +3234,6 @@ esp_err_t WebCfgServer::buildConfigureWifiHtml(PsychicRequest *request)
esp_err_t WebCfgServer::buildInfoHtml(PsychicRequest *request) esp_err_t WebCfgServer::buildInfoHtml(PsychicRequest *request)
{ {
Log->println("INFO HTML");
uint32_t aclPrefs[17]; uint32_t aclPrefs[17];
_preferences->getBytes(preference_acl, &aclPrefs, sizeof(aclPrefs)); _preferences->getBytes(preference_acl, &aclPrefs, sizeof(aclPrefs));
PsychicStreamResponse response(request, "text/plain"); PsychicStreamResponse response(request, "text/plain");