From a8dd497575a567fda9db3ee9ad368eccb636dae2 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Thu, 2 Feb 2023 14:40:18 -0600 Subject: [PATCH] Contain it --- src/modules/AdminModule.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp index 1df8d5ff4..16dee49a9 100644 --- a/src/modules/AdminModule.cpp +++ b/src/modules/AdminModule.cpp @@ -537,23 +537,31 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r meshtastic_DeviceConnectionStatus conn; - conn.has_wifi = HAS_WIFI; #if HAS_WIFI + conn.has_wifi = true; conn.wifi.status.status.is_connected = WiFi.status() != WL_CONNECTED; strncpy(conn.wifi.ssid, config.network.wifi_ssid, 33); if (conn.wifi.status.status.is_connected) { + conn.wifi.rssi = WiFi.RSSI(); conn.wifi.status.status.ip_address = WiFi.localIP(); conn.wifi.status.status.is_mqtt_connected = mqtt && mqtt->connected(); conn.wifi.status.status.is_syslog_connected = false; // FIXME wire this up } #endif - conn.has_bluetooth = HAS_BLUETOOTH; -#if HAS_BLUETOOTH - +#if HAS_ETHERNET + conn.has_ethernet = true; + // conn.ethernet. +#endif + +#if HAS_BLUETOOTH + conn.has_bluetooth = HAS_BLUETOOTH; + // nimbleBluetooth-> + // #if ARCH_ESP32 + + // #elif #endif - conn.has_ethernet = HAS_ETHERNET; conn.has_serial = true; // No serial-less devices