feat(display): add R8 observer TFT dashboard, touch toggle and display.timeout
Replace the sparse Heltec V4 R8 observer home screen with a padded dark analytics dashboard, add manual display control, and make blanking a runtime setting. Dashboard (DISPLAY_ACTIVITY_DASHBOARD, the four R8 TFT observer envs): - RadioActivityWindow: 20 one-minute buckets of valid RX packets, no heap. The caller's 32-bit millis() is extended to a monotonic 64-bit clock, so nothing downstream has a rollover case; an always-on node passes 2^32 ms after ~49.7 days, which would otherwise re-enter warm-up and divide 20 minutes of traffic by seconds. Rates use 19 whole minutes plus the elapsed part of the current one rather than a fixed 1200 s. - ObserverDashboard: header, radio strip, headline totals, a 20-bar packets-per-minute graph and RF/status footers, with separate portrait and landscape layouts. A text row is a fixed 16 px, which is 3.2 logical units in portrait but 4.27 in landscape, so one shared grid would overlap. Text is trimmed by character budget, not measured width: getTextWidth() reports an over-long string at the portrait driver's fallback scale, so DisplayDriver::drawTextEllipsized() under-trims and the row renders at half height. - Six per-row signatures computed from what is actually drawn, so only the rows whose pixels changed repaint. No startFrame(), no whole-screen clear. Link state moved out of the full-frame signature, so a DHCP renewal or WiFi flap repaints one footer row instead of the panel. - Dark theme by retuning the UIColor statics at runtime, which needs no display-driver edit and carries boot, setup, reboot and power-off with it. Touch and button (DISPLAY_TOUCH_TOGGLE): - CHSC6X at I2C 0x2E, polled; TP_INT is unusable (optional R13, and GPIO 43 is U0TXD). The point-count byte is tested against a valid count, never against non-zero: an idle read returns 0xFF, which reads as a finger held down forever and latches the tap detector after one event. - turnOff() no longer parks PIN_TFT_RST low on this board. GPIO 21 is a shared LCD_RST/TP_RST net, so doing that held the touch controller in reset for as long as the display was off. Verified against Heltec's expansion-board and mainboard schematics and the V4-R8 datasheet pinout, which also correct the pin comment in HeltecV4R8Board.cpp. - The USER button click now toggles the display too; it previously did nothing whenever the display was already on. display.timeout: - `set display.timeout <secs>` / `get display.timeout`, 0 = stay on, 60 s default, 3600 max. Read live, so a change applies without a reboot and restarts the countdown rather than firing on the old deadline. - Stored in MQTTPrefs (/mqtt.json), keeping NodePrefs aligned with upstream. Runtime-only: LegacyV1MQTTPrefs and the four frozen binary payload sizes are unchanged. No JSON format-version bump - the loader skips keys no def() claims, so older firmware reads newer files and this firmware reads older ones with the default applied. Both directions are covered by tests. - Joins the observer atomic-setter contract, so a failed save rolls the live value back instead of only claiming to. New periodic work uses a wrap-safe deadline check; `millis() >= deadline` fires every loop for a whole interval before each rollover. Adds test_radio_activity_window, test_observer_dashboard (driving the real renderer against a recording DisplayDriver in both orientation profiles) and test_touch_tap_detector. 440 native cases pass.
This commit is contained in:
1 parent
fc361ca94b
commit
fcd92e985f
27 files changed
+2709
-25
No files matched your search
@@ -540,6 +540,11 @@ void MyMesh::logRxRaw(float snr, float rssi, const uint8_t raw[], int len) {
|
||||
}
|
||||
|
||||
void MyMesh::logRx(mesh::Packet *pkt, int len, float score) {
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
// Valid parsed RF packet: the only event the dashboard's window counts.
|
||||
_activity.recordPacket(millis(), (uint16_t)len, _radio->getEstAirtimeFor(len),
|
||||
(int8_t)(pkt->getSNR() * 4.0f), (int16_t)_radio->getLastRSSI());
|
||||
#endif
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
// MQTT bridge: always feed RX packets — bridge decides based on mqtt.rx setting
|
||||
if (bridge) bridge->onPacketReceived(pkt);
|
||||
|
||||
@@ -35,6 +35,10 @@
|
||||
#include "helpers/SNMPAgent.h"
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
#include <helpers/RadioActivityWindow.h>
|
||||
#endif
|
||||
|
||||
#include <helpers/AdvertDataHelpers.h>
|
||||
#include <helpers/AlertReporter.h>
|
||||
#include <helpers/ArduinoHelpers.h>
|
||||
@@ -101,6 +105,9 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks
|
||||
uint64_t uptime_millis;
|
||||
unsigned long next_local_advert, next_flood_advert;
|
||||
bool _logging;
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
RadioActivityWindow _activity; // rolling RF receive window, for the TFT dashboard
|
||||
#endif
|
||||
NodePrefs _prefs;
|
||||
ClientACL acl;
|
||||
CommonCLI _cli;
|
||||
@@ -282,6 +289,14 @@ public:
|
||||
return &_prefs;
|
||||
}
|
||||
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
RadioActivityWindow* getActivityWindow() { return &_activity; }
|
||||
#endif
|
||||
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
MQTTPrefs* getObserverPrefs() { return _cli.getObserverPrefs(); }
|
||||
#endif
|
||||
|
||||
void savePrefs() override {
|
||||
_cli.savePrefs(_fs);
|
||||
}
|
||||
|
||||
@@ -16,7 +16,31 @@
|
||||
#include <helpers/esp32/WebConfigServer.h> // defines WITH_WEBCONFIG on ESP32
|
||||
#endif
|
||||
|
||||
#define AUTO_OFF_MILLIS 20000 // 20 seconds
|
||||
#ifndef AUTO_OFF_MILLIS
|
||||
#define AUTO_OFF_MILLIS 20000 // 20 seconds; 0 keeps the screen on
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_TOUCH_TOGGLE
|
||||
#define TOUCH_POLL_MILLIS 50
|
||||
#endif
|
||||
|
||||
// Wrap-safe deadline test. `millis() >= deadline` fires early for the whole
|
||||
// interval before a rollover, because the deadline has already wrapped to a
|
||||
// small value while millis() is still near UINT32_MAX; the signed difference
|
||||
// stays correct across it.
|
||||
static inline bool millisReached(unsigned long now, unsigned long deadline) {
|
||||
return (int32_t)((uint32_t)now - (uint32_t)deadline) >= 0;
|
||||
}
|
||||
|
||||
// `display.timeout` when the observer prefs are available, otherwise the
|
||||
// compiled-in default. Read on every use so a `set display.timeout` takes
|
||||
// effect immediately.
|
||||
unsigned long UITask::displayTimeoutMillis() const {
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
if (_observer_prefs) return (unsigned long)_observer_prefs->display_timeout_secs * 1000UL;
|
||||
#endif
|
||||
return AUTO_OFF_MILLIS;
|
||||
}
|
||||
#define BOOT_SCREEN_MILLIS 4000 // 4 seconds
|
||||
|
||||
#define POWEROFF_DELAY 3000
|
||||
@@ -40,10 +64,17 @@ static const uint8_t meshcore_logo [] PROGMEM = {
|
||||
|
||||
void UITask::begin(NodePrefs* node_prefs, const char* build_date, const char* firmware_version) {
|
||||
_prevBtnState = HIGH;
|
||||
_auto_off = millis() + AUTO_OFF_MILLIS;
|
||||
_timeout_seen = displayTimeoutMillis();
|
||||
_auto_off = millis() + displayTimeoutMillis();
|
||||
_started_at = millis();
|
||||
_node_prefs = node_prefs;
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
ObserverDashboard::applyDarkPalette(); // retunes UIColor for this target only
|
||||
#endif
|
||||
_display->turnOn();
|
||||
#ifdef DISPLAY_TOUCH_TOGGLE
|
||||
_touch.begin();
|
||||
#endif
|
||||
#ifdef DISPLAY_REDRAW_ON_CHANGE
|
||||
_frame_valid = false;
|
||||
#endif
|
||||
@@ -67,6 +98,9 @@ void UITask::begin(NodePrefs* node_prefs, const char* build_date, const char* fi
|
||||
|
||||
void UITask::renderCurrScreen() {
|
||||
char tmp[80];
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
_rows_valid = false;
|
||||
#endif
|
||||
if (millis() < _started_at + BOOT_SCREEN_MILLIS) { // boot screen
|
||||
// meshcore logo
|
||||
_display->setColor(UIColor::corp_blue);
|
||||
@@ -140,6 +174,10 @@ void UITask::renderCurrScreen() {
|
||||
_display->print(wc_ip);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
renderDashboard();
|
||||
return;
|
||||
#endif
|
||||
// node name
|
||||
_display->setCursor(0, 0);
|
||||
@@ -204,7 +242,7 @@ uint32_t UITask::getFrameSignature() {
|
||||
snprintf(tmp, sizeof(tmp), "BW: %03.2f CR: %d", _node_prefs->bw, _node_prefs->cr);
|
||||
signature = DisplayFrameSignature::append(signature, tmp);
|
||||
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
#if defined(WITH_MQTT_BRIDGE) && !defined(DISPLAY_ACTIVITY_DASHBOARD)
|
||||
if (WiFi.status() == WL_CONNECTED) {
|
||||
IPAddress ip = WiFi.localIP();
|
||||
snprintf(tmp, sizeof(tmp), "IP: %d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
|
||||
@@ -218,19 +256,94 @@ uint32_t UITask::getFrameSignature() {
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
#define ACTIVITY_REFRESH_MILLIS 5000
|
||||
|
||||
bool UITask::buildDashboardContext(ObserverDashboard::Context* ctx) {
|
||||
if (_node_prefs == NULL) return false;
|
||||
ctx->node_name = _node_prefs->node_name;
|
||||
ctx->role_label = "REPEATER";
|
||||
ctx->freq = _node_prefs->freq;
|
||||
ctx->sf = _node_prefs->sf;
|
||||
ctx->bw = _node_prefs->bw;
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
ctx->link_up = (WiFi.status() == WL_CONNECTED);
|
||||
#else
|
||||
ctx->link_up = false;
|
||||
#endif
|
||||
return true;
|
||||
}
|
||||
|
||||
void UITask::renderDashboard() {
|
||||
ObserverDashboard::Context ctx;
|
||||
if (!buildDashboardContext(&ctx)) return;
|
||||
|
||||
RadioActivitySnapshot snap;
|
||||
if (_activity) {
|
||||
_activity->snapshot(millis(), &snap);
|
||||
} else {
|
||||
memset(&snap, 0, sizeof(snap));
|
||||
}
|
||||
|
||||
const ObserverDashboard::Layout& layout = ObserverDashboard::activeLayout();
|
||||
ObserverDashboard::drawFull(*_display, layout, ctx, snap);
|
||||
ObserverDashboard::allRowSignatures(layout, ctx, snap, _row_signatures);
|
||||
_rows_valid = true;
|
||||
_next_activity = millis() + ACTIVITY_REFRESH_MILLIS;
|
||||
}
|
||||
|
||||
// Repaints just the analytics rows whose contents moved. No startFrame(), so
|
||||
// the header, the radio strip and the rest of the panel are never cleared.
|
||||
void UITask::updateActivityRows() {
|
||||
if (!_rows_valid || _activity == NULL) return; // not showing the dashboard
|
||||
|
||||
ObserverDashboard::Context ctx;
|
||||
if (!buildDashboardContext(&ctx)) return;
|
||||
|
||||
RadioActivitySnapshot snap;
|
||||
_activity->snapshot(millis(), &snap);
|
||||
ObserverDashboard::drawChangedRows(*_display, ObserverDashboard::activeLayout(), ctx, snap,
|
||||
_row_signatures);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_TOUCH_TOGGLE
|
||||
void UITask::toggleDisplay() {
|
||||
if (_display->isOn()) {
|
||||
_display->turnOff();
|
||||
} else {
|
||||
_display->turnOn();
|
||||
}
|
||||
#ifdef DISPLAY_REDRAW_ON_CHANGE
|
||||
_frame_valid = false; // wake draws one complete current frame
|
||||
#endif
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
_rows_valid = false;
|
||||
#endif
|
||||
_auto_off = millis() + displayTimeoutMillis();
|
||||
}
|
||||
#endif
|
||||
|
||||
void UITask::loop() {
|
||||
#if defined(PIN_USER_BTN) && defined(DISPLAY_CLASS)
|
||||
int ev = user_btn.check();
|
||||
if (ev == BUTTON_EVENT_CLICK) {
|
||||
#ifdef DISPLAY_TOUCH_TOGGLE
|
||||
toggleDisplay(); // same action as tapping the panel
|
||||
#else
|
||||
if (_display->isOn()) {
|
||||
// TODO: any action ?
|
||||
} else {
|
||||
_display->turnOn();
|
||||
#ifdef DISPLAY_REDRAW_ON_CHANGE
|
||||
_frame_valid = false;
|
||||
#endif
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
_rows_valid = false;
|
||||
#endif
|
||||
}
|
||||
_auto_off = millis() + AUTO_OFF_MILLIS; // extend auto-off timer
|
||||
_auto_off = millis() + displayTimeoutMillis(); // extend auto-off timer
|
||||
#endif
|
||||
} else if (ev == BUTTON_EVENT_LONG_PRESS) {
|
||||
_display->turnOn();
|
||||
Serial.println("Powering Off");
|
||||
@@ -246,9 +359,22 @@ void UITask::loop() {
|
||||
_display->turnOn();
|
||||
#ifdef DISPLAY_REDRAW_ON_CHANGE
|
||||
_frame_valid = false;
|
||||
#endif
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
_rows_valid = false;
|
||||
#endif
|
||||
}
|
||||
_auto_off = millis() + AUTO_OFF_MILLIS;
|
||||
_auto_off = millis() + displayTimeoutMillis();
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_TOUCH_TOGGLE
|
||||
{
|
||||
unsigned long now = millis();
|
||||
if (millisReached(now, _next_touch)) {
|
||||
_next_touch = now + TOUCH_POLL_MILLIS;
|
||||
if (_touch.checkTap(now)) toggleDisplay();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -268,13 +394,30 @@ void UITask::loop() {
|
||||
_frame_valid = true;
|
||||
#endif
|
||||
}
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
else if (millisReached(millis(), _next_activity)) {
|
||||
updateActivityRows();
|
||||
_next_activity = millis() + ACTIVITY_REFRESH_MILLIS;
|
||||
}
|
||||
#endif
|
||||
|
||||
_next_refresh = millis() + 1000; // check for visible changes every second
|
||||
}
|
||||
if (millis() > _auto_off) {
|
||||
// `_auto_off` is only armed on activity, so a timeout changed at runtime has
|
||||
// to restart the countdown here - otherwise 0 -> 60 blanks instantly off a
|
||||
// boot-time deadline, and 60 -> 3600 still blanks at the old 60 s mark.
|
||||
unsigned long timeout = displayTimeoutMillis();
|
||||
if (timeout != _timeout_seen) {
|
||||
_timeout_seen = timeout;
|
||||
_auto_off = millis() + timeout;
|
||||
}
|
||||
if (timeout > 0 && millisReached(millis(), _auto_off)) {
|
||||
_display->turnOff();
|
||||
#ifdef DISPLAY_REDRAW_ON_CHANGE
|
||||
_frame_valid = false;
|
||||
#endif
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
_rows_valid = false;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,19 @@
|
||||
#include <helpers/ui/DisplayDriver.h>
|
||||
#include <helpers/CommonCLI.h>
|
||||
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
#ifndef DISPLAY_REDRAW_ON_CHANGE
|
||||
#error "DISPLAY_ACTIVITY_DASHBOARD needs DISPLAY_REDRAW_ON_CHANGE: without it every frame clears the whole screen"
|
||||
#endif
|
||||
#include <helpers/RadioActivityWindow.h>
|
||||
#include <helpers/ui/ObserverDashboard.h>
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_TOUCH_TOGGLE
|
||||
#include <helpers/ui/CHSC6XTouch.h>
|
||||
#endif
|
||||
|
||||
class UITask {
|
||||
mesh::MainBoard* _board;
|
||||
DisplayDriver* _display;
|
||||
@@ -20,10 +33,45 @@ class UITask {
|
||||
uint32_t getFrameSignature();
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
RadioActivityWindow* _activity = NULL;
|
||||
unsigned long _next_activity = 0;
|
||||
uint32_t _row_signatures[ObserverDashboard::ROW_COUNT] = {0};
|
||||
bool _rows_valid = false; // true only while the dashboard is the drawn screen
|
||||
|
||||
bool buildDashboardContext(ObserverDashboard::Context* ctx);
|
||||
void renderDashboard();
|
||||
void updateActivityRows();
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_TOUCH_TOGGLE
|
||||
CHSC6XTouch _touch;
|
||||
unsigned long _next_touch = 0;
|
||||
|
||||
void toggleDisplay();
|
||||
#endif
|
||||
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
MQTTPrefs* _observer_prefs = NULL;
|
||||
#endif
|
||||
unsigned long _timeout_seen = 0; // to notice a live `display.timeout` change
|
||||
|
||||
unsigned long displayTimeoutMillis() const;
|
||||
|
||||
void renderCurrScreen();
|
||||
public:
|
||||
UITask(mesh::MainBoard& board, DisplayDriver& display) : _board(&board), _display(&display) { _next_read = _next_refresh = 0; }
|
||||
void begin(NodePrefs* node_prefs, const char* build_date, const char* firmware_version);
|
||||
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
// Supplies `display.timeout`, which is read live so a config change applies
|
||||
// without a reboot. Call before begin().
|
||||
void setObserverPrefs(MQTTPrefs* prefs) { _observer_prefs = prefs; }
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
void setActivityWindow(RadioActivityWindow* activity) { _activity = activity; }
|
||||
#endif
|
||||
|
||||
void loop();
|
||||
};
|
||||
@@ -115,7 +115,13 @@ void setup() {
|
||||
|
||||
#ifdef DISPLAY_CLASS
|
||||
if (display_ready) {
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
ui_task.setObserverPrefs(the_mesh.getObserverPrefs());
|
||||
#endif
|
||||
ui_task.begin(the_mesh.getNodePrefs(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION);
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
ui_task.setActivityWindow(the_mesh.getActivityWindow());
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -246,6 +246,11 @@ void MyMesh::logRxRaw(float snr, float rssi, const uint8_t raw[], int len) {
|
||||
}
|
||||
|
||||
void MyMesh::logRx(mesh::Packet *pkt, int len, float score) {
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
// Valid parsed RF packet: the only event the dashboard's window counts.
|
||||
_activity.recordPacket(millis(), (uint16_t)len, _radio->getEstAirtimeFor(len),
|
||||
(int8_t)(pkt->getSNR() * 4.0f), (int16_t)_radio->getLastRSSI());
|
||||
#endif
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
// MQTT bridge: always feed RX packets — bridge decides based on mqtt.rx setting
|
||||
if (_prefs.bridge_enabled && bridge) bridge->onPacketReceived(pkt);
|
||||
|
||||
@@ -15,6 +15,10 @@
|
||||
#include <helpers/StaticPoolPacketManager.h>
|
||||
#include <helpers/SimpleMeshTables.h>
|
||||
#include <helpers/IdentityStore.h>
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
#include <helpers/RadioActivityWindow.h>
|
||||
#endif
|
||||
|
||||
#include <helpers/AdvertDataHelpers.h>
|
||||
#include <helpers/AlertReporter.h>
|
||||
#include <helpers/TxtDataHelpers.h>
|
||||
@@ -117,6 +121,9 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks
|
||||
uint64_t uptime_millis;
|
||||
unsigned long next_local_advert, next_flood_advert;
|
||||
bool _logging;
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
RadioActivityWindow _activity; // rolling RF receive window, for the TFT dashboard
|
||||
#endif
|
||||
bool region_load_active;
|
||||
NodePrefs _prefs;
|
||||
TransportKeyStore key_store;
|
||||
@@ -286,6 +293,14 @@ public:
|
||||
return &_prefs;
|
||||
}
|
||||
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
RadioActivityWindow* getActivityWindow() { return &_activity; }
|
||||
#endif
|
||||
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
MQTTPrefs* getObserverPrefs() { return _cli.getObserverPrefs(); }
|
||||
#endif
|
||||
|
||||
void savePrefs() override {
|
||||
_cli.savePrefs(_fs);
|
||||
}
|
||||
|
||||
@@ -15,7 +15,31 @@
|
||||
#include <helpers/esp32/WebConfigServer.h> // defines WITH_WEBCONFIG on ESP32
|
||||
#endif
|
||||
|
||||
#define AUTO_OFF_MILLIS 20000 // 20 seconds
|
||||
#ifndef AUTO_OFF_MILLIS
|
||||
#define AUTO_OFF_MILLIS 20000 // 20 seconds; 0 keeps the screen on
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_TOUCH_TOGGLE
|
||||
#define TOUCH_POLL_MILLIS 50
|
||||
#endif
|
||||
|
||||
// Wrap-safe deadline test. `millis() >= deadline` fires early for the whole
|
||||
// interval before a rollover, because the deadline has already wrapped to a
|
||||
// small value while millis() is still near UINT32_MAX; the signed difference
|
||||
// stays correct across it.
|
||||
static inline bool millisReached(unsigned long now, unsigned long deadline) {
|
||||
return (int32_t)((uint32_t)now - (uint32_t)deadline) >= 0;
|
||||
}
|
||||
|
||||
// `display.timeout` when the observer prefs are available, otherwise the
|
||||
// compiled-in default. Read on every use so a `set display.timeout` takes
|
||||
// effect immediately.
|
||||
unsigned long UITask::displayTimeoutMillis() const {
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
if (_observer_prefs) return (unsigned long)_observer_prefs->display_timeout_secs * 1000UL;
|
||||
#endif
|
||||
return AUTO_OFF_MILLIS;
|
||||
}
|
||||
#define BOOT_SCREEN_MILLIS 4000 // 4 seconds
|
||||
|
||||
// 'meshcore', 128x13px
|
||||
@@ -37,9 +61,16 @@ static const uint8_t meshcore_logo [] PROGMEM = {
|
||||
|
||||
void UITask::begin(NodePrefs* node_prefs, const char* build_date, const char* firmware_version) {
|
||||
_prevBtnState = HIGH;
|
||||
_auto_off = millis() + AUTO_OFF_MILLIS;
|
||||
_timeout_seen = displayTimeoutMillis();
|
||||
_auto_off = millis() + displayTimeoutMillis();
|
||||
_node_prefs = node_prefs;
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
ObserverDashboard::applyDarkPalette(); // retunes UIColor for this target only
|
||||
#endif
|
||||
_display->turnOn();
|
||||
#ifdef DISPLAY_TOUCH_TOGGLE
|
||||
_touch.begin();
|
||||
#endif
|
||||
#ifdef DISPLAY_REDRAW_ON_CHANGE
|
||||
_frame_valid = false;
|
||||
#endif
|
||||
@@ -59,6 +90,9 @@ void UITask::begin(NodePrefs* node_prefs, const char* build_date, const char* fi
|
||||
|
||||
void UITask::renderCurrScreen() {
|
||||
char tmp[80];
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
_rows_valid = false;
|
||||
#endif
|
||||
if (millis() < BOOT_SCREEN_MILLIS) { // boot screen
|
||||
// meshcore logo
|
||||
_display->setColor(UIColor::corp_blue);
|
||||
@@ -121,6 +155,10 @@ void UITask::renderCurrScreen() {
|
||||
_display->print(wc_ip);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
renderDashboard();
|
||||
return;
|
||||
#endif
|
||||
// node name
|
||||
_display->setCursor(0, 0);
|
||||
@@ -181,7 +219,7 @@ uint32_t UITask::getFrameSignature() {
|
||||
snprintf(tmp, sizeof(tmp), "BW: %03.2f CR: %d", _node_prefs->bw, _node_prefs->cr);
|
||||
signature = DisplayFrameSignature::append(signature, tmp);
|
||||
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
#if defined(WITH_MQTT_BRIDGE) && !defined(DISPLAY_ACTIVITY_DASHBOARD)
|
||||
if (WiFi.status() == WL_CONNECTED) {
|
||||
IPAddress ip = WiFi.localIP();
|
||||
snprintf(tmp, sizeof(tmp), "IP: %d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
|
||||
@@ -195,21 +233,96 @@ uint32_t UITask::getFrameSignature() {
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
#define ACTIVITY_REFRESH_MILLIS 5000
|
||||
|
||||
bool UITask::buildDashboardContext(ObserverDashboard::Context* ctx) {
|
||||
if (_node_prefs == NULL) return false;
|
||||
ctx->node_name = _node_prefs->node_name;
|
||||
ctx->role_label = "ROOM SERVER";
|
||||
ctx->freq = _node_prefs->freq;
|
||||
ctx->sf = _node_prefs->sf;
|
||||
ctx->bw = _node_prefs->bw;
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
ctx->link_up = (WiFi.status() == WL_CONNECTED);
|
||||
#else
|
||||
ctx->link_up = false;
|
||||
#endif
|
||||
return true;
|
||||
}
|
||||
|
||||
void UITask::renderDashboard() {
|
||||
ObserverDashboard::Context ctx;
|
||||
if (!buildDashboardContext(&ctx)) return;
|
||||
|
||||
RadioActivitySnapshot snap;
|
||||
if (_activity) {
|
||||
_activity->snapshot(millis(), &snap);
|
||||
} else {
|
||||
memset(&snap, 0, sizeof(snap));
|
||||
}
|
||||
|
||||
const ObserverDashboard::Layout& layout = ObserverDashboard::activeLayout();
|
||||
ObserverDashboard::drawFull(*_display, layout, ctx, snap);
|
||||
ObserverDashboard::allRowSignatures(layout, ctx, snap, _row_signatures);
|
||||
_rows_valid = true;
|
||||
_next_activity = millis() + ACTIVITY_REFRESH_MILLIS;
|
||||
}
|
||||
|
||||
// Repaints just the analytics rows whose contents moved. No startFrame(), so
|
||||
// the header, the radio strip and the rest of the panel are never cleared.
|
||||
void UITask::updateActivityRows() {
|
||||
if (!_rows_valid || _activity == NULL) return; // not showing the dashboard
|
||||
|
||||
ObserverDashboard::Context ctx;
|
||||
if (!buildDashboardContext(&ctx)) return;
|
||||
|
||||
RadioActivitySnapshot snap;
|
||||
_activity->snapshot(millis(), &snap);
|
||||
ObserverDashboard::drawChangedRows(*_display, ObserverDashboard::activeLayout(), ctx, snap,
|
||||
_row_signatures);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_TOUCH_TOGGLE
|
||||
void UITask::toggleDisplay() {
|
||||
if (_display->isOn()) {
|
||||
_display->turnOff();
|
||||
} else {
|
||||
_display->turnOn();
|
||||
}
|
||||
#ifdef DISPLAY_REDRAW_ON_CHANGE
|
||||
_frame_valid = false; // wake draws one complete current frame
|
||||
#endif
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
_rows_valid = false;
|
||||
#endif
|
||||
_auto_off = millis() + displayTimeoutMillis();
|
||||
}
|
||||
#endif
|
||||
|
||||
void UITask::loop() {
|
||||
#ifdef PIN_USER_BTN
|
||||
if (millis() >= _next_read) {
|
||||
int btnState = digitalRead(PIN_USER_BTN);
|
||||
if (btnState != _prevBtnState) {
|
||||
if (btnState == USER_BTN_PRESSED) { // pressed?
|
||||
#ifdef DISPLAY_TOUCH_TOGGLE
|
||||
toggleDisplay(); // same action as tapping the panel
|
||||
#else
|
||||
if (_display->isOn()) {
|
||||
// TODO: any action ?
|
||||
} else {
|
||||
_display->turnOn();
|
||||
#ifdef DISPLAY_REDRAW_ON_CHANGE
|
||||
_frame_valid = false;
|
||||
#endif
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
_rows_valid = false;
|
||||
#endif
|
||||
}
|
||||
_auto_off = millis() + AUTO_OFF_MILLIS; // extend auto-off timer
|
||||
_auto_off = millis() + displayTimeoutMillis(); // extend auto-off timer
|
||||
#endif
|
||||
}
|
||||
_prevBtnState = btnState;
|
||||
}
|
||||
@@ -225,9 +338,22 @@ void UITask::loop() {
|
||||
_display->turnOn();
|
||||
#ifdef DISPLAY_REDRAW_ON_CHANGE
|
||||
_frame_valid = false;
|
||||
#endif
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
_rows_valid = false;
|
||||
#endif
|
||||
}
|
||||
_auto_off = millis() + AUTO_OFF_MILLIS;
|
||||
_auto_off = millis() + displayTimeoutMillis();
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_TOUCH_TOGGLE
|
||||
{
|
||||
unsigned long now = millis();
|
||||
if (millisReached(now, _next_touch)) {
|
||||
_next_touch = now + TOUCH_POLL_MILLIS;
|
||||
if (_touch.checkTap(now)) toggleDisplay();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -247,13 +373,30 @@ void UITask::loop() {
|
||||
_frame_valid = true;
|
||||
#endif
|
||||
}
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
else if (millisReached(millis(), _next_activity)) {
|
||||
updateActivityRows();
|
||||
_next_activity = millis() + ACTIVITY_REFRESH_MILLIS;
|
||||
}
|
||||
#endif
|
||||
|
||||
_next_refresh = millis() + 1000; // check for visible changes every second
|
||||
}
|
||||
if (millis() > _auto_off) {
|
||||
// `_auto_off` is only armed on activity, so a timeout changed at runtime has
|
||||
// to restart the countdown here - otherwise 0 -> 60 blanks instantly off a
|
||||
// boot-time deadline, and 60 -> 3600 still blanks at the old 60 s mark.
|
||||
unsigned long timeout = displayTimeoutMillis();
|
||||
if (timeout != _timeout_seen) {
|
||||
_timeout_seen = timeout;
|
||||
_auto_off = millis() + timeout;
|
||||
}
|
||||
if (timeout > 0 && millisReached(millis(), _auto_off)) {
|
||||
_display->turnOff();
|
||||
#ifdef DISPLAY_REDRAW_ON_CHANGE
|
||||
_frame_valid = false;
|
||||
#endif
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
_rows_valid = false;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,19 @@
|
||||
#include <helpers/ui/DisplayDriver.h>
|
||||
#include <helpers/CommonCLI.h>
|
||||
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
#ifndef DISPLAY_REDRAW_ON_CHANGE
|
||||
#error "DISPLAY_ACTIVITY_DASHBOARD needs DISPLAY_REDRAW_ON_CHANGE: without it every frame clears the whole screen"
|
||||
#endif
|
||||
#include <helpers/RadioActivityWindow.h>
|
||||
#include <helpers/ui/ObserverDashboard.h>
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_TOUCH_TOGGLE
|
||||
#include <helpers/ui/CHSC6XTouch.h>
|
||||
#endif
|
||||
|
||||
class UITask {
|
||||
DisplayDriver* _display;
|
||||
unsigned long _next_read, _next_refresh, _auto_off;
|
||||
@@ -17,10 +30,45 @@ class UITask {
|
||||
uint32_t getFrameSignature();
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
RadioActivityWindow* _activity = NULL;
|
||||
unsigned long _next_activity = 0;
|
||||
uint32_t _row_signatures[ObserverDashboard::ROW_COUNT] = {0};
|
||||
bool _rows_valid = false; // true only while the dashboard is the drawn screen
|
||||
|
||||
bool buildDashboardContext(ObserverDashboard::Context* ctx);
|
||||
void renderDashboard();
|
||||
void updateActivityRows();
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_TOUCH_TOGGLE
|
||||
CHSC6XTouch _touch;
|
||||
unsigned long _next_touch = 0;
|
||||
|
||||
void toggleDisplay();
|
||||
#endif
|
||||
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
MQTTPrefs* _observer_prefs = NULL;
|
||||
#endif
|
||||
unsigned long _timeout_seen = 0; // to notice a live `display.timeout` change
|
||||
|
||||
unsigned long displayTimeoutMillis() const;
|
||||
|
||||
void renderCurrScreen();
|
||||
public:
|
||||
UITask(DisplayDriver& display) : _display(&display) { _next_read = _next_refresh = 0; }
|
||||
void begin(NodePrefs* node_prefs, const char* build_date, const char* firmware_version);
|
||||
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
// Supplies `display.timeout`, which is read live so a config change applies
|
||||
// without a reboot. Call before begin().
|
||||
void setObserverPrefs(MQTTPrefs* prefs) { _observer_prefs = prefs; }
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
void setActivityWindow(RadioActivityWindow* activity) { _activity = activity; }
|
||||
#endif
|
||||
|
||||
void loop();
|
||||
};
|
||||
@@ -91,7 +91,13 @@ void setup() {
|
||||
|
||||
#ifdef DISPLAY_CLASS
|
||||
if (display_ready) {
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
ui_task.setObserverPrefs(the_mesh.getObserverPrefs());
|
||||
#endif
|
||||
ui_task.begin(the_mesh.getNodePrefs(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION);
|
||||
#ifdef DISPLAY_ACTIVITY_DASHBOARD
|
||||
ui_task.setActivityWindow(the_mesh.getActivityWindow());
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in new issue
Block a user