2025-08-16 20:04:54 +10:00
|
|
|
#pragma once
|
|
|
|
|
|
|
|
|
|
#include <MeshCore.h>
|
|
|
|
|
#include <helpers/ui/DisplayDriver.h>
|
|
|
|
|
#include <helpers/ui/UIScreen.h>
|
|
|
|
|
#include <helpers/SensorManager.h>
|
|
|
|
|
#include <helpers/BaseSerialInterface.h>
|
|
|
|
|
#include <Arduino.h>
|
|
|
|
|
|
|
|
|
|
#ifdef PIN_BUZZER
|
|
|
|
|
#include <helpers/ui/buzzer.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include "NodePrefs.h"
|
|
|
|
|
|
|
|
|
|
enum class UIEventType {
|
|
|
|
|
none,
|
|
|
|
|
contactMessage,
|
|
|
|
|
channelMessage,
|
|
|
|
|
roomMessage,
|
2026-06-07 10:53:17 +02:00
|
|
|
advertReceivedFlood,
|
|
|
|
|
advertReceivedZeroHop,
|
2025-08-16 20:04:54 +10:00
|
|
|
ack
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class AbstractUITask {
|
|
|
|
|
protected:
|
|
|
|
|
mesh::MainBoard* _board;
|
|
|
|
|
BaseSerialInterface* _serial;
|
|
|
|
|
bool _connected;
|
|
|
|
|
|
|
|
|
|
AbstractUITask(mesh::MainBoard* board, BaseSerialInterface* serial) : _board(board), _serial(serial) {
|
|
|
|
|
_connected = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public:
|
2026-06-12 12:59:41 +02:00
|
|
|
void setHasConnection(bool connected) {
|
|
|
|
|
bool prev = _connected;
|
|
|
|
|
_connected = connected;
|
|
|
|
|
if (prev && !connected) onBLEDisconnected();
|
|
|
|
|
}
|
2025-08-16 20:04:54 +10:00
|
|
|
bool hasConnection() const { return _connected; }
|
2026-06-12 12:59:41 +02:00
|
|
|
virtual void onBLEDisconnected() {}
|
2026-06-14 23:33:16 +02:00
|
|
|
// An end-to-end ACK (CRC) arrived for one of our sent messages — drives the
|
|
|
|
|
// DM delivery-status marker. Default no-op for UIs that don't track it.
|
|
|
|
|
virtual void onMsgAck(uint32_t ack_crc) { (void)ack_crc; }
|
|
|
|
|
// A repeater rebroadcast of one of our channel sends was heard (seq from
|
|
|
|
|
// lastChannelRelaySeq()) — drives the channel "relayed into mesh" marker.
|
|
|
|
|
virtual void onChannelRelayed(uint32_t seq) { (void)seq; }
|
2026-06-26 10:55:24 +02:00
|
|
|
// Result of an on-device-UI-triggered MyMesh::sendRoomLogin() arrived.
|
|
|
|
|
// pub_key is the contact's key prefix (>=4 bytes valid); permissions is the
|
|
|
|
|
// room/repeater ACL byte (only meaningful when success is true).
|
|
|
|
|
virtual void onRoomLoginResult(const uint8_t* pub_key, bool success, uint8_t permissions) { (void)pub_key; (void)success; (void)permissions; }
|
feat(ui): on-device channel management, remote admin tool, per-language keyboards
Messages:
- Add/edit/delete channels on-device (new ChannelsView, owned by the renamed
MessagesScreen — was QuickMsgScreen, whose name no longer matched its scope).
Channel secret entry supports a typed passphrase (SHA-256'd, same primitive
the library already uses for the routing hash) or a raw 32-hex-char key.
- MyMesh::setChannelLocal() factors out the setChannel/saveChannels/
onChannelRemoved sequence previously duplicated across the two
CMD_SET_CHANNEL branches, shared now by the BLE and on-device paths.
Tools > Admin (new):
- Log into a repeater/room server's admin account and send CLI commands,
the on-device equivalent of the app's repeater-admin feature.
- Commands are organised into category tabs (System/Radio/Routing/Actions)
with common get/set fields (name, radio profile, tx power, repeat, advert
intervals, ...) plus a free-text "Custom command..." fallback for anything
else. A field row fetches the current value, opens it pre-filled for
editing, and sends the change — falling back to a blank editor if the
fetch fails or times out.
- The admin password persists and self-heals exactly like room logins in
Messages: saved on a confirmed admin-level login, forgotten on a failed
one, left alone if merely under-privileged.
- New MyMesh::sendAdminCommand()/AbstractUITask::onAdminReply() plumbing so
a reply reaches the UI without touching the existing BLE/app CLI-terminal
path (queueMessage's should_display gate is untouched).
Shared TabBar.h extracted from NearbyScreen/BotScreen's independently
duplicated tab-carousel rendering (now a third consumer via Admin) — also
fixes neighbouring tabs vanishing outright when they didn't fully fit;
they now truncate with an ellipsis instead.
Keyboard: the combined "Ext.Latin" alphabet split into 8 separate,
linguistically complete per-language keyboards (Polish, Czech, Slovak,
German, French, Spanish, Portuguese, Nordic), and fixed an OLED-only bug
where tall accented glyphs overlapped the keyboard's separator line
(SH1106's Lemon-font ascent constant was 2-3px short for them).
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-12 19:40:53 +02:00
|
|
|
// Text reply to an on-device-UI-triggered MyMesh::sendAdminCommand() arrived
|
|
|
|
|
// (see AdminScreen). pub_key is the contact's key prefix (>=4 bytes valid).
|
|
|
|
|
virtual void onAdminReply(const uint8_t* pub_key, const char* text) { (void)pub_key; (void)text; }
|
2026-06-05 12:03:38 +02:00
|
|
|
// True only when a BLE central is actually bonded/connected. On a dual
|
|
|
|
|
// (BLE+USB) interface hasConnection() is always true (USB counts), so use
|
|
|
|
|
// this for BLE-specific UI like the pairing-PIN prompt.
|
|
|
|
|
bool isBLEConnected() const { return _serial->isBLEConnected(); }
|
2026-06-05 12:42:14 +02:00
|
|
|
// True when a companion app is connected over any transport (BLE bonded or an
|
|
|
|
|
// open USB-CDC port). For app-connected behaviour like Auto buzzer mute.
|
|
|
|
|
bool isClientConnected() const { return _serial->isClientConnected(); }
|
2025-08-16 20:04:54 +10:00
|
|
|
uint16_t getBattMilliVolts() const { return _board->getBattMilliVolts(); }
|
|
|
|
|
bool isSerialEnabled() const { return _serial->isEnabled(); }
|
|
|
|
|
void enableSerial() { _serial->enable(); }
|
|
|
|
|
void disableSerial() { _serial->disable(); }
|
|
|
|
|
virtual void msgRead(int msgcount) = 0;
|
2026-05-13 10:25:55 +02:00
|
|
|
virtual void newMsg(uint8_t path_len, const char* from_name, const char* text, int msgcount, uint8_t contact_type = 0, const uint8_t* pub_key = nullptr) = 0;
|
2025-09-17 08:53:50 +08:00
|
|
|
virtual void notify(UIEventType t = UIEventType::none) = 0;
|
2026-06-28 11:00:45 +02:00
|
|
|
virtual void addChannelMsg(uint8_t channel_idx, const char* text, uint32_t timestamp = 0) {}
|
2026-06-14 23:33:16 +02:00
|
|
|
virtual void addDMMsg(const uint8_t* pub_key, bool outgoing, const char* text, uint32_t sender_timestamp = 0) {}
|
feat(companion): live location sharing, Locator geofencing, trail auto-pause
Squash merge of feat/location-beacon-alerts-autopause (v1.21).
Features:
- Live Location Sharing — broadcast position as movement-gated [LOC]
messages to a channel or contact; live shares show as map pins with
distance/bearing in Nearby Nodes and a status-bar indicator. [LOC] is
parsed in DMs, channel messages and room messages; DM shares name the
sender.
- Locator (geofence) — arm a geofence around a saved waypoint or a person
(live [LOC] or last-known position), alert on arrive/leave or near/far,
with an optional homing beeper (gated to arrive/both modes). Arm from
Tools > Locator, Nearby Nodes, or Waypoints; target picker lists
favourites first, clearable via a "None" entry. Active target is drawn
as a flag on the map.
- One active target shared across Locator / Navigate / Map via a single
resolver (resolvePersonPos / activeTargetPos) that prefers a live
[LOC] share over the last-advertised GPS fix.
- Follow live contacts — Navigate to a live-sharing contact follows them
as they move and adds an ETA line; quick-share your own position from
the Map.
- Map & status-bar upgrades — home mini-map gets a north marker, scale
tick, and a connected trail line (was disconnected dots); status line
shows tracked-node count, an arrow + distance to the active Locator/Nav
target (falling back to the nearest live-tracked contact); GPS fix icon
in the top status bar, shown only on GPS boards with GPS enabled.
- Trail auto-pause — recording freezes on stops (banking elapsed time,
breaking the map line across the idle gap) and resumes on movement
without ending the session.
- Streaming trail simplification — GPS points are simplified in-stream
via a fixed-corridor (Reumann-Witkam) pass tuned for fidelity: straight
runs collapse to their endpoints, curves stay bounded to the Min-dist
tolerance, so the 512-point buffer covers a far longer route than a
flat point budget would suggest.
- Collapsible Tools (Location / Comms / System sections, fold-in-place
like Settings) and page-indicator icons on the home carousel.
- Waypoint coordinate editor — add a waypoint by scroll-editing lat/lon
digit by digit.
Fixes:
- Critical: low-heap hang and contact loss on RAM-tight builds. Halved
message-history scrollback rings (recovering ~14 KB free heap) and
made contacts/channels/prefs persistence atomic (temp file + rename),
so an interrupted save can no longer corrupt or wipe the store.
- Serial.write() bounded so a stalled USB host can't hang the device.
- Nearby Nodes: live [LOC] senders respect the type filter, sort by
shared position, and the list refreshes so live shares bubble up.
- Map: live contacts are labelled before waypoints.
- GPS status icon hidden when GPS is off in Settings.
- Splash screen no longer truncates a pre-release tag's own dash (e.g.
v1.21-rc1) when stripping the build's commit-hash suffix.
- Null-guarded the Locator target picker; clamped loc-share channel
index on load.
Under the hood:
- -Os size optimisation on the e-ink and GAT562 30S solo envs.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-25 19:04:21 +02:00
|
|
|
// A node shared its current position via a [LOC] message. pub_key is the
|
|
|
|
|
// sender's key prefix for a verified DM share, or null for a channel share
|
|
|
|
|
// (keyed by name, best-effort). Default no-op so UI variants opt in.
|
|
|
|
|
virtual void onSharedLocation(const uint8_t* pub_key, const char* name,
|
|
|
|
|
int32_t lat_1e6, int32_t lon_1e6,
|
|
|
|
|
uint32_t ts, bool verified) {}
|
2026-06-27 00:31:06 +02:00
|
|
|
// A contact is gone — removed explicitly (companion app / CLI command) or
|
|
|
|
|
// silently auto-evicted to make room when the contact table is full. Lets
|
|
|
|
|
// UI state that references contacts by pubkey (favourite slots, the
|
|
|
|
|
// Locator/Live Share target) drop a reference that would otherwise dangle.
|
|
|
|
|
// Default no-op.
|
2026-06-26 17:48:05 +02:00
|
|
|
virtual void onContactRemoved(const uint8_t* pub_key) {}
|
2026-06-27 00:39:10 +02:00
|
|
|
// A channel slot was cleared (companion app set it to an empty secret).
|
|
|
|
|
// Drop any setting that referenced it by index — otherwise a new channel
|
|
|
|
|
// added later at the same slot would silently inherit the old one's bot/
|
|
|
|
|
// share target or notification melody. Default no-op.
|
|
|
|
|
virtual void onChannelRemoved(uint8_t channel_idx) {}
|
2025-08-17 16:31:50 +10:00
|
|
|
virtual void loop() = 0;
|
2025-08-16 20:04:54 +10:00
|
|
|
};
|