adam/Meck
1
0
Fork 0
mirror of https://github.com/pelgraine/Meck.git synced 2026-08-08 17:52:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

updated uitask for wifi companions

Browse Source
This commit is contained in:
pelgraine
2026-03-03 22:07:39 +11:00
parent 31db349305
commit e2a04892f4
1 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/ui-new/UITask.cpp
+49 -7
View File
@@ -5,7 +5,7 @@
#include "RepeaterAdminScreen.h" #include "RepeaterAdminScreen.h"
#include "MapScreen.h" #include "MapScreen.h"
#include "target.h" #include "target.h"
#ifdef WIFI_SSID #if defined(WIFI_SSID) || defined(MECK_WIFI_COMPANION)
#include <WiFi.h> #include <WiFi.h>
#endif #endif
@@ -97,6 +97,8 @@ class HomeScreen : public UIScreen {
RADIO, RADIO,
#ifdef BLE_PIN_CODE #ifdef BLE_PIN_CODE
BLUETOOTH, BLUETOOTH,
#elif defined(MECK_WIFI_COMPANION)
WIFI_STATUS,
#endif #endif
ADVERT, ADVERT,
#if ENV_INCLUDE_GPS == 1 #if ENV_INCLUDE_GPS == 1
@@ -301,14 +303,16 @@ public:
display.drawTextCentered(display.width() / 2, y, tmp); display.drawTextCentered(display.width() / 2, y, tmp);
y += 18; y += 18;
#ifdef WIFI_SSID #if defined(WIFI_SSID) || defined(MECK_WIFI_COMPANION)
IPAddress ip = WiFi.localIP(); IPAddress ip = WiFi.localIP();
snprintf(tmp, sizeof(tmp), "IP: %d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]); if (ip != IPAddress(0,0,0,0)) {
display.setTextSize(1); snprintf(tmp, sizeof(tmp), "IP: %d.%d.%d.%d:%d", ip[0], ip[1], ip[2], ip[3], TCP_PORT);
display.drawTextCentered(display.width() / 2, y, tmp); display.setTextSize(1);
y += 12; display.drawTextCentered(display.width() / 2, y, tmp);
y += 12;
}
#endif #endif
#if defined(BLE_PIN_CODE) || defined(WIFI_SSID) #if defined(BLE_PIN_CODE) || defined(WIFI_SSID) || defined(MECK_WIFI_COMPANION)
if (_task->hasConnection()) { if (_task->hasConnection()) {
display.setColor(DisplayDriver::GREEN); display.setColor(DisplayDriver::GREEN);
display.setTextSize(1); display.setTextSize(1);
@@ -419,6 +423,44 @@ public:
display.setColor(DisplayDriver::GREEN); display.setColor(DisplayDriver::GREEN);
display.setTextSize(1); display.setTextSize(1);
display.drawTextCentered(display.width() / 2, 72, "toggle: " PRESS_LABEL); display.drawTextCentered(display.width() / 2, 72, "toggle: " PRESS_LABEL);
#endif
#ifdef MECK_WIFI_COMPANION
} else if (_page == HomePage::WIFI_STATUS) {
display.setColor(DisplayDriver::GREEN);
display.setTextSize(1);
display.drawTextCentered(display.width() / 2, 18, "WiFi Companion");
int wy = 36;
display.setTextSize(0);
if (WiFi.status() == WL_CONNECTED) {
display.setColor(DisplayDriver::GREEN);
snprintf(tmp, sizeof(tmp), "SSID: %s", WiFi.SSID().c_str());
display.drawTextCentered(display.width() / 2, wy, tmp);
wy += 10;
IPAddress ip = WiFi.localIP();
snprintf(tmp, sizeof(tmp), "IP: %d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
display.drawTextCentered(display.width() / 2, wy, tmp);
wy += 10;
snprintf(tmp, sizeof(tmp), "Port: %d", TCP_PORT);
display.drawTextCentered(display.width() / 2, wy, tmp);
wy += 12;
if (_task->hasConnection()) {
display.setColor(DisplayDriver::GREEN);
display.setTextSize(1);
display.drawTextCentered(display.width() / 2, wy, "< App Connected >");
} else {
display.setColor(DisplayDriver::YELLOW);
display.setTextSize(1);
display.drawTextCentered(display.width() / 2, wy, "Waiting for app...");
}
} else {
display.setColor(DisplayDriver::RED);
display.drawTextCentered(display.width() / 2, wy, "Not connected");
wy += 12;
display.setColor(DisplayDriver::LIGHT);
display.drawTextCentered(display.width() / 2, wy, "Configure in Settings");
}
display.setTextSize(1);
#endif #endif
} else if (_page == HomePage::ADVERT) { } else if (_page == HomePage::ADVERT) {
display.setColor(DisplayDriver::GREEN); display.setColor(DisplayDriver::GREEN);