mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-07-26 23:08:11 +00:00
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>
82 lines
2.4 KiB
C++
82 lines
2.4 KiB
C++
#include "ArduinoSerialInterface.h"
|
|
#include "StreamUtils.h"
|
|
|
|
// Worst-case time we'll let writeFrame() block waiting for the host to drain
|
|
// the link, before giving up on the rest of the frame. See StreamUtils.h.
|
|
#define SERIAL_WRITE_TIMEOUT_MS 300
|
|
|
|
#define RECV_STATE_IDLE 0
|
|
#define RECV_STATE_HDR_FOUND 1
|
|
#define RECV_STATE_LEN1_FOUND 2
|
|
#define RECV_STATE_LEN2_FOUND 3
|
|
|
|
void ArduinoSerialInterface::enable() {
|
|
_isEnabled = true;
|
|
_state = RECV_STATE_IDLE;
|
|
}
|
|
void ArduinoSerialInterface::disable() {
|
|
_isEnabled = false;
|
|
}
|
|
|
|
bool ArduinoSerialInterface::isConnected() const {
|
|
return true; // no way of knowing, so assume yes
|
|
}
|
|
|
|
bool ArduinoSerialInterface::isWriteBusy() const {
|
|
return false;
|
|
}
|
|
|
|
size_t ArduinoSerialInterface::writeFrame(const uint8_t src[], size_t len) {
|
|
if (len > MAX_FRAME_SIZE) {
|
|
// frame is too big!
|
|
return 0;
|
|
}
|
|
|
|
uint8_t hdr[3];
|
|
hdr[0] = '>';
|
|
hdr[1] = (len & 0xFF); // LSB
|
|
hdr[2] = (len >> 8); // MSB
|
|
|
|
// Single deadline shared across header + payload, so a stalled host costs
|
|
// at most SERIAL_WRITE_TIMEOUT_MS total, not that much per write() call.
|
|
uint32_t deadline = millis() + SERIAL_WRITE_TIMEOUT_MS;
|
|
if (streamWriteUntil(*_serial, hdr, 3, deadline) < 3) return 0;
|
|
return streamWriteUntil(*_serial, src, len, deadline);
|
|
}
|
|
|
|
size_t ArduinoSerialInterface::checkRecvFrame(uint8_t dest[]) {
|
|
while (_serial->available()) {
|
|
int c = _serial->read();
|
|
if (c < 0) break;
|
|
|
|
switch (_state) {
|
|
case RECV_STATE_IDLE:
|
|
if (c == '<') {
|
|
_state = RECV_STATE_HDR_FOUND;
|
|
}
|
|
break;
|
|
case RECV_STATE_HDR_FOUND:
|
|
_frame_len = (uint8_t)c; // LSB
|
|
_state = RECV_STATE_LEN1_FOUND;
|
|
break;
|
|
case RECV_STATE_LEN1_FOUND:
|
|
_frame_len |= ((uint16_t)c) << 8; // MSB
|
|
rx_len = 0;
|
|
_state = _frame_len > 0 ? RECV_STATE_LEN2_FOUND : RECV_STATE_IDLE;
|
|
break;
|
|
default:
|
|
if (rx_len < MAX_FRAME_SIZE) {
|
|
rx_buf[rx_len] = (uint8_t)c; // rest of frame will be discarded if > MAX
|
|
}
|
|
rx_len++;
|
|
if (rx_len >= _frame_len) { // received a complete frame?
|
|
if (_frame_len > MAX_FRAME_SIZE) _frame_len = MAX_FRAME_SIZE; // truncate
|
|
memcpy(dest, rx_buf, _frame_len);
|
|
_state = RECV_STATE_IDLE; // reset state, for next frame
|
|
return _frame_len;
|
|
}
|
|
}
|
|
}
|
|
return 0;
|
|
}
|