mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-07-26 14:58:12 +00:00
57774d41f3
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>
74 lines
3.0 KiB
C++
74 lines
3.0 KiB
C++
#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,
|
|
advertReceivedFlood,
|
|
advertReceivedZeroHop,
|
|
ack
|
|
};
|
|
|
|
class AbstractUITask {
|
|
protected:
|
|
mesh::MainBoard* _board;
|
|
BaseSerialInterface* _serial;
|
|
bool _connected;
|
|
|
|
AbstractUITask(mesh::MainBoard* board, BaseSerialInterface* serial) : _board(board), _serial(serial) {
|
|
_connected = false;
|
|
}
|
|
|
|
public:
|
|
void setHasConnection(bool connected) {
|
|
bool prev = _connected;
|
|
_connected = connected;
|
|
if (prev && !connected) onBLEDisconnected();
|
|
}
|
|
bool hasConnection() const { return _connected; }
|
|
virtual void onBLEDisconnected() {}
|
|
// 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; }
|
|
// 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(); }
|
|
// 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(); }
|
|
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;
|
|
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;
|
|
virtual void notify(UIEventType t = UIEventType::none) = 0;
|
|
virtual void addChannelMsg(uint8_t channel_idx, const char* text) {}
|
|
virtual void addDMMsg(const uint8_t* pub_key, bool outgoing, const char* text, uint32_t sender_timestamp = 0) {}
|
|
// 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) {}
|
|
virtual void loop() = 0;
|
|
};
|