pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-09 15:14:45 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Whoooosh before my battery dies

Browse Source
This commit is contained in:
Ben Meadors 2023-02-02 14:11:48 -06:00
parent e8e04d23d7
commit 971ecd117c
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/AdminModule.cpp
View File

@ -13,6 +13,10 @@
#include "unistd.h" #include "unistd.h"
#endif #endif
#if HAS_WIFI || HAS_ETHERNET
#include "mqtt/MQTT.h"
#endif
#define DEFAULT_REBOOT_SECONDS 5 #define DEFAULT_REBOOT_SECONDS 5
AdminModule *adminModule; AdminModule *adminModule;
@ -531,24 +535,29 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
{ {
meshtastic_AdminMessage r = meshtastic_AdminMessage_init_default; meshtastic_AdminMessage r = meshtastic_AdminMessage_init_default;
meshtastic_DeviceConnectionStatus connectionStatus; meshtastic_DeviceConnectionStatus conn;
connectionStatus.has_wifi = HAS_WIFI; conn.has_wifi = HAS_WIFI;
#if HAS_WIFI #if HAS_WIFI
connectionStatus.wifi.status.status.is_connected = WiFi.status() != WL_CONNECTED; conn.wifi.status.status.is_connected = WiFi.status() != WL_CONNECTED;
strncpy(connectionStatus.wifi.ssid, config.network.wifi_ssid, 33); strncpy(conn.wifi.ssid, config.network.wifi_ssid, 33);
connectionStatus.wifi.status.status.is_syslog_connected = false; // FIXME wire this up if (conn.wifi.status.status.is_connected)
{
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 #endif
connectionStatus.has_bluetooth = HAS_BLUETOOTH; conn.has_bluetooth = HAS_BLUETOOTH;
#if HAS_BLUETOOTH #if HAS_BLUETOOTH
#endif #endif
connectionStatus.has_ethernet = HAS_ETHERNET; conn.has_ethernet = HAS_ETHERNET;
connectionStatus.has_serial = true; // No serial-less devices conn.has_serial = true; // No serial-less devices
r.get_device_connection_status_response = connectionStatus; r.get_device_connection_status_response = conn;
r.which_payload_variant = meshtastic_AdminMessage_get_device_connection_status_response_tag; r.which_payload_variant = meshtastic_AdminMessage_get_device_connection_status_response_tag;
myReply = allocDataProtobuf(r); myReply = allocDataProtobuf(r);
} }