mirror of
https://github.com/mikecarper/MeshCore.git
synced 2026-09-26 18:47:56 +00:00
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.
123 lines
4.2 KiB
C++
123 lines
4.2 KiB
C++
#pragma once
|
|
|
|
#include "helpers/ui/DisplayDriver.h"
|
|
#include "helpers/ui/DisplayViewport.h"
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
// A DisplayDriver that records physical-pixel draw calls instead of pushing
|
|
// them at a panel, reproducing the two real ST7789LCDDisplay coordinate and
|
|
// text-metric profiles:
|
|
//
|
|
// portrait (ST7789_PORTRAIT_PROFILE) 240x320, DisplayViewport mapping,
|
|
// physical text scale = logical * 2
|
|
// landscape (default) 320x240, x * 2.5 / y * 3.75,
|
|
// physical text scale = (int)(logical * 2.5)
|
|
//
|
|
// Text extents are recorded at the size the layout *asked* for, so a row that
|
|
// only fits because the driver would silently shrink or clip it still shows up
|
|
// as an out-of-bounds op.
|
|
class MockDisplay : public DisplayDriver {
|
|
public:
|
|
enum Mode { PORTRAIT, LANDSCAPE };
|
|
|
|
struct Op {
|
|
enum Kind { FILL, RECT, TEXT } kind;
|
|
int x, y, w, h; // physical pixels
|
|
ColorVal color;
|
|
std::string text;
|
|
int logical_size;
|
|
bool scale_fallback; // portrait driver would have shrunk this string
|
|
};
|
|
|
|
explicit MockDisplay(Mode mode)
|
|
: DisplayDriver(128, 64), _mode(mode), _on(true), _color(0), _size(1), _cx(0), _cy(0) {}
|
|
|
|
std::vector<Op> ops;
|
|
|
|
int panelWidth() const { return _mode == PORTRAIT ? 240 : 320; }
|
|
int panelHeight() const { return _mode == PORTRAIT ? 320 : 240; }
|
|
|
|
void reset() { ops.clear(); }
|
|
|
|
// --- DisplayDriver ---
|
|
bool isOn() override { return _on; }
|
|
void turnOn() override { _on = true; }
|
|
void turnOff() override { _on = false; }
|
|
void clear() override { ops.clear(); }
|
|
void startFrame(ColorVal bkg = UIColor::window_bkg) override {
|
|
ops.clear();
|
|
ops.push_back(Op{Op::FILL, 0, 0, panelWidth(), panelHeight(), bkg, "", 1, false});
|
|
_size = 1;
|
|
}
|
|
void setTextSize(int sz) override { _size = sz > 0 ? sz : 1; }
|
|
void setColor(ColorVal c) override { _color = c; }
|
|
void setCursor(int x, int y) override { _cx = x; _cy = y; }
|
|
|
|
void print(const char* str) override {
|
|
if (!str || !*str) return;
|
|
int n = (int)strlen(str);
|
|
int scale = physicalScale(_size);
|
|
int px = mapX(_cx), py = mapY(_cy);
|
|
bool fallback = false;
|
|
if (_mode == PORTRAIT) {
|
|
int available = panelWidth() - px;
|
|
if (n * 6 * scale > available) {
|
|
fallback = true; // the real driver drops to the minimum scale here
|
|
}
|
|
}
|
|
ops.push_back(Op{Op::TEXT, px, py, n * 6 * scale, 8 * scale, _color, std::string(str), _size,
|
|
fallback});
|
|
_cx += (int)((n * 6 * scale) / xScale());
|
|
}
|
|
|
|
void fillRect(int x, int y, int w, int h) override {
|
|
ops.push_back(Op{Op::FILL, mapX(x), mapY(y), spanX(x, w), spanY(y, h), _color, "", _size,
|
|
false});
|
|
}
|
|
void drawRect(int x, int y, int w, int h) override {
|
|
ops.push_back(Op{Op::RECT, mapX(x), mapY(y), spanX(x, w), spanY(y, h), _color, "", _size,
|
|
false});
|
|
}
|
|
void drawXbm(int, int, const uint8_t*, int, int) override {}
|
|
void endFrame() override {}
|
|
|
|
uint16_t getTextWidth(const char* str) override {
|
|
if (!str) return 0;
|
|
int n = (int)strlen(str);
|
|
int scale = physicalScale(_size);
|
|
if (_mode == PORTRAIT) {
|
|
// Mirrors ST7789LCDDisplay::getTextWidth(): measure at the scale the
|
|
// driver would pick, clamp to the panel, convert back to logical.
|
|
if (n * 6 * scale > panelWidth()) scale = _size;
|
|
int w = n * 6 * scale;
|
|
if (w > panelWidth()) w = panelWidth();
|
|
DisplayViewport::Geometry g{128, 64, 240, 320};
|
|
return g.logicalWidthForPhysical((uint16_t)w);
|
|
}
|
|
return (uint16_t)((n * 6 * scale) / 2.5f);
|
|
}
|
|
|
|
private:
|
|
Mode _mode;
|
|
bool _on;
|
|
ColorVal _color;
|
|
int _size, _cx, _cy;
|
|
|
|
float xScale() const { return _mode == PORTRAIT ? (240.0f / 128.0f) : 2.5f; }
|
|
|
|
int physicalScale(int logical) const {
|
|
return _mode == PORTRAIT ? logical * 2 : (int)(uint8_t)(logical * 2.5f);
|
|
}
|
|
|
|
int mapX(int x) const {
|
|
return _mode == PORTRAIT ? (int)((int32_t)x * 240 / 128) : (int)(x * 2.5f);
|
|
}
|
|
int mapY(int y) const {
|
|
return _mode == PORTRAIT ? (int)((int32_t)y * 320 / 64) : (int)(y * 3.75f);
|
|
}
|
|
int spanX(int x, int w) const { return mapX(x + w) - mapX(x); }
|
|
int spanY(int y, int h) const { return mapY(y + h) - mapY(y); }
|
|
};
|