From a82b32ce97beca9ec7fb70e16a92eee40da152a3 Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 16 Nov 2024 14:48:01 +0100 Subject: [PATCH] wifi reconnects renaming --- interface/src/app/status/NetworkStatus.tsx | 8 +++++--- interface/src/types/network.ts | 2 +- lib/framework/ESP8266React.h | 4 ++-- lib/framework/NetworkSettingsService.cpp | 2 +- lib/framework/NetworkSettingsService.h | 2 +- lib/framework/NetworkStatus.cpp | 14 +++++++------- mock-api/rest_server.ts | 4 ++-- project-words.txt | 4 +++- src/system.cpp | 6 +++--- 9 files changed, 25 insertions(+), 21 deletions(-) diff --git a/interface/src/app/status/NetworkStatus.tsx b/interface/src/app/status/NetworkStatus.tsx index 70b2d70e5..86a9994c2 100644 --- a/interface/src/app/status/NetworkStatus.tsx +++ b/interface/src/app/status/NetworkStatus.tsx @@ -103,11 +103,13 @@ const NetworkStatus = () => { case NetworkConnectionStatus.WIFI_STATUS_NO_SSID_AVAIL: return 'No SSID Available'; case NetworkConnectionStatus.WIFI_STATUS_CONNECTED: - return LL.CONNECTED(0) + ' (WiFi) (' + data.connect_count + ')'; + return LL.CONNECTED(0) + ' (WiFi) (' + data.reconnect_count + ')'; case NetworkConnectionStatus.WIFI_STATUS_CONNECT_FAILED: - return LL.CONNECTED(1) + ' ' + LL.FAILED(0) + ' (' + data.connect_count + ')'; + return ( + LL.CONNECTED(1) + ' ' + LL.FAILED(0) + ' (' + data.reconnect_count + ')' + ); case NetworkConnectionStatus.WIFI_STATUS_CONNECTION_LOST: - return LL.CONNECTED(1) + ' ' + LL.LOST() + ' (' + data.connect_count + ')'; + return LL.CONNECTED(1) + ' ' + LL.LOST() + ' (' + data.reconnect_count + ')'; case NetworkConnectionStatus.WIFI_STATUS_DISCONNECTED: return LL.DISCONNECTED(); default: diff --git a/interface/src/types/network.ts b/interface/src/types/network.ts index e8d65b6cf..f771f34c4 100644 --- a/interface/src/types/network.ts +++ b/interface/src/types/network.ts @@ -34,7 +34,7 @@ export interface NetworkStatusType { dns_ip_1: string; dns_ip_2: string; hostname: string; - connect_count: number; + reconnect_count: number; } export interface NetworkSettingsType { diff --git a/lib/framework/ESP8266React.h b/lib/framework/ESP8266React.h index 9e33ad992..fd61a389d 100644 --- a/lib/framework/ESP8266React.h +++ b/lib/framework/ESP8266React.h @@ -66,8 +66,8 @@ class ESP8266React { return _apSettingsService.getAPNetworkStatus() == APNetworkStatus::ACTIVE; } - uint16_t getWifiConnects() { - return _networkSettingsService.getWifiConnects(); + uint16_t getWifiReconnects() { + return _networkSettingsService.getWifiReconnects(); } private: diff --git a/lib/framework/NetworkSettingsService.cpp b/lib/framework/NetworkSettingsService.cpp index de525dd36..ed06bea08 100644 --- a/lib/framework/NetworkSettingsService.cpp +++ b/lib/framework/NetworkSettingsService.cpp @@ -304,7 +304,7 @@ void NetworkSettingsService::WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) break; case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: - connectcount_++; // count the number of reconnects + connectcount_++; // count the number of WiFi reconnects emsesp::EMSESP::logger().warning("WiFi disconnected (#%d). Reason: %s (%d)", connectcount_, disconnectReason(info.wifi_sta_disconnected.reason), diff --git a/lib/framework/NetworkSettingsService.h b/lib/framework/NetworkSettingsService.h index dba52eb53..a12536b78 100644 --- a/lib/framework/NetworkSettingsService.h +++ b/lib/framework/NetworkSettingsService.h @@ -94,7 +94,7 @@ class NetworkSettingsService : public StatefulService { void begin(); void loop(); - uint16_t getWifiConnects() const { + uint16_t getWifiReconnects() const { return connectcount_; } diff --git a/lib/framework/NetworkStatus.cpp b/lib/framework/NetworkStatus.cpp index ef1d78423..19e7de861 100644 --- a/lib/framework/NetworkStatus.cpp +++ b/lib/framework/NetworkStatus.cpp @@ -60,13 +60,13 @@ void NetworkStatus::networkStatus(AsyncWebServerRequest * request) { #else root["local_ipv6"] = WiFi.linkLocalIPv6().toString(); #endif - root["mac_address"] = WiFi.macAddress(); - root["rssi"] = WiFi.RSSI(); - root["ssid"] = WiFi.SSID(); - root["bssid"] = WiFi.BSSIDstr(); - root["channel"] = WiFi.channel(); - root["connect_count"] = emsesp::EMSESP::esp8266React.getWifiConnects(); - root["subnet_mask"] = WiFi.subnetMask().toString(); + root["mac_address"] = WiFi.macAddress(); + root["rssi"] = WiFi.RSSI(); + root["ssid"] = WiFi.SSID(); + root["bssid"] = WiFi.BSSIDstr(); + root["channel"] = WiFi.channel(); + root["reconnect_count"] = emsesp::EMSESP::esp8266React.getWifiReconnects(); + root["subnet_mask"] = WiFi.subnetMask().toString(); if (WiFi.gatewayIP() != INADDR_NONE) { root["gateway_ip"] = WiFi.gatewayIP().toString(); diff --git a/mock-api/rest_server.ts b/mock-api/rest_server.ts index 973be2fc2..2615ae0f1 100644 --- a/mock-api/rest_server.ts +++ b/mock-api/rest_server.ts @@ -369,7 +369,7 @@ const network_status = { dns_ip_1: '10.10.10.1', dns_ip_2: '0.0.0.0', hostname: 'ems-esp', - connect_count: 1 + reconnect_count: 1 }; const list_networks = { networks: [ @@ -4840,7 +4840,7 @@ router if (action === 'export') { // export data return export_data(content.param); - } else if (action === 'customSupport') { + } else if (action === 'getCustomSupport') { // send custom support return custom_support(); } else if (action === 'checkUpgrade') { diff --git a/project-words.txt b/project-words.txt index f0c517484..21037655a 100644 --- a/project-words.txt +++ b/project-words.txt @@ -1365,4 +1365,6 @@ poolshuntstatus pooltemp stoptime showertimer -showeralert \ No newline at end of file +showeralert +CTKWH +wifireconnects \ No newline at end of file diff --git a/src/system.cpp b/src/system.cpp index 53afaa919..d8ca8986d 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -716,7 +716,7 @@ void System::heartbeat_json(JsonObject output) { int8_t rssi = WiFi.RSSI(); output["rssi"] = rssi; output["wifistrength"] = wifi_quality(rssi); - output["wificonnects"] = EMSESP::esp8266React.getWifiConnects(); + output["wifireconnects"] = EMSESP::esp8266React.getWifiReconnects(); } #endif } @@ -1167,7 +1167,7 @@ bool System::check_restore() { // it's a custom support file - save it to /config new_file.close(); if (LittleFS.rename(TEMP_FILENAME_PATH, EMSESP_CUSTOMSUPPORT_FILE)) { - LOG_DEBUG("Custom support information found"); + LOG_INFO("Custom support file stored"); return false; // no need to reboot } else { LOG_ERROR("Failed to save custom support file"); @@ -1500,7 +1500,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output node["network"] = "WiFi"; node["hostname"] = WiFi.getHostname(); node["RSSI"] = WiFi.RSSI(); - node["WIFIConnects"] = EMSESP::esp8266React.getWifiConnects(); + node["WIFIReconnects"] = EMSESP::esp8266React.getWifiReconnects(); // node["MAC"] = WiFi.macAddress(); // node["IPv4 address"] = uuid::printable_to_string(WiFi.localIP()) + "/" + uuid::printable_to_string(WiFi.subnetMask()); // node["IPv4 gateway"] = uuid::printable_to_string(WiFi.gatewayIP());