mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-10-21 21:12:03 +00:00
refactor(ui-core): move position + course over ground into CourseEngine
COG ring sampling (every ~1 s from UiCore::loop), outlier rejection and currentCourse/currentLocation move from UITask to ui-core/CourseEngine.h. UITask keeps one-line wrappers; screens unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,89 @@
|
||||
#pragma once
|
||||
// Position + course over ground. The single source of truth for "where am I"
|
||||
// and "which way am I heading", shared by the nav / compass / map screens.
|
||||
//
|
||||
// Course-over-ground ring: a heading source independent of trail recording,
|
||||
// sampled every ~1 s from the GPS whenever it has a fix. Heading = bearing
|
||||
// across the window (oldest→newest) once the cumulative movement clears
|
||||
// MIN_MOVE_M; gross GPS jumps are rejected on insert.
|
||||
|
||||
#include "../GeoUtils.h"
|
||||
|
||||
class CourseEngine {
|
||||
public:
|
||||
void begin(SensorManager* sensors) { _sensors = sensors; }
|
||||
|
||||
void loop() {
|
||||
if ((int32_t)(millis() - _next_sample_ms) < 0) return;
|
||||
_next_sample_ms = millis() + 1000UL;
|
||||
int32_t lat, lon;
|
||||
if (currentLocation(lat, lon)) pushFix(lat, lon);
|
||||
}
|
||||
|
||||
// Current GPS position (1e6-scaled degrees), false when there's no usable fix.
|
||||
bool currentLocation(int32_t& lat, int32_t& lon) const {
|
||||
LocationProvider* loc = _sensors ? _sensors->getLocationProvider() : nullptr;
|
||||
if (loc && loc->isValid()) {
|
||||
lat = (int32_t)loc->getLatitude();
|
||||
lon = (int32_t)loc->getLongitude();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// Current course over ground in degrees (0..359), or false if not enough
|
||||
// recent movement to derive a stable heading. Holds the last good heading
|
||||
// while standing still.
|
||||
bool currentCourse(int& deg_out) const {
|
||||
static const float MIN_MOVE_M = 6.0f; // window must span ≥ this to be a real heading
|
||||
if (_count < 2) {
|
||||
if (_deg >= 0) { deg_out = _deg; return true; } // hold last good
|
||||
return false;
|
||||
}
|
||||
const Fix& oldest = _ring[_head];
|
||||
const Fix& newest = _ring[(_head + _count - 1) % RING];
|
||||
float span_m = geo::haversineKm(oldest.lat, oldest.lon, newest.lat, newest.lon) * 1000.0f;
|
||||
if (span_m < MIN_MOVE_M) {
|
||||
if (_deg >= 0) { deg_out = _deg; return true; } // standing still → hold last
|
||||
return false;
|
||||
}
|
||||
_deg = geo::bearingDeg(oldest.lat, oldest.lon, newest.lat, newest.lon);
|
||||
deg_out = _deg;
|
||||
return true;
|
||||
}
|
||||
|
||||
private:
|
||||
// Insert a GPS fix into the ring, rejecting gross outliers (a jump implying
|
||||
// an impossible speed) so one bad fix can't swing the heading.
|
||||
void pushFix(int32_t lat, int32_t lon) {
|
||||
static const uint32_t MAX_GAP_MS = 15000; // GPS gap longer than this → window is stale
|
||||
uint32_t now = millis();
|
||||
if (_count > 0) {
|
||||
const Fix& prev = _ring[(_head + _count - 1) % RING];
|
||||
uint32_t dt = now - prev.ms;
|
||||
if (dt > MAX_GAP_MS) {
|
||||
// GPS was lost for a while: the old fixes are far in the past, so a
|
||||
// window spanning them would imply a bogus "teleport" heading. Restart
|
||||
// the ring from this fix (the last-good _deg is kept for display).
|
||||
_head = 0; _count = 0;
|
||||
} else if (dt > 0) {
|
||||
float dist_m = geo::haversineKm(prev.lat, prev.lon, lat, lon) * 1000.0f;
|
||||
float speed = dist_m / (dt / 1000.0f); // m/s
|
||||
if (speed > 50.0f) return; // > 180 km/h between fixes → reject
|
||||
}
|
||||
}
|
||||
int pos;
|
||||
if (_count < RING) { pos = (_head + _count) % RING; _count++; }
|
||||
else { pos = _head; _head = (_head + 1) % RING; }
|
||||
_ring[pos].lat = lat; _ring[pos].lon = lon; _ring[pos].ms = now;
|
||||
}
|
||||
|
||||
static const int RING = 5;
|
||||
struct Fix { int32_t lat, lon; uint32_t ms; };
|
||||
|
||||
SensorManager* _sensors = nullptr;
|
||||
Fix _ring[RING];
|
||||
uint8_t _head = 0, _count = 0;
|
||||
mutable int _deg = -1; // last good heading (cached by currentCourse), -1 = none yet
|
||||
uint32_t _next_sample_ms = 0;
|
||||
};
|
||||
@@ -12,17 +12,20 @@
|
||||
#include "UiEvents.h"
|
||||
#include "ClockEngine.h"
|
||||
#include "PingEngine.h"
|
||||
#include "CourseEngine.h"
|
||||
|
||||
class UiCore {
|
||||
public:
|
||||
void begin(NodePrefs* prefs) {
|
||||
void begin(NodePrefs* prefs, SensorManager* sensors) {
|
||||
clock.begin(prefs, &events);
|
||||
ping.begin(prefs);
|
||||
course.begin(sensors);
|
||||
}
|
||||
|
||||
// Driven from the frontend's loop(), before it drains `events`.
|
||||
void loop() {
|
||||
clock.loop();
|
||||
course.loop();
|
||||
}
|
||||
|
||||
UiEventQueue events; // Core → frontend; drained by the frontend's loop()
|
||||
@@ -30,6 +33,7 @@ public:
|
||||
// ── Engines ───────────────────────────────────────────────────────────────
|
||||
ClockEngine clock; // alarm / countdown / ring
|
||||
PingEngine ping; // single in-flight ping + last result
|
||||
CourseEngine course; // GPS position + course-over-ground ring
|
||||
|
||||
// ── Models ────────────────────────────────────────────────────────────────
|
||||
MessageHistory history; // channel + DM rings, delivery state, channel unread
|
||||
|
||||
Reference in New Issue
Block a user