Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-07-26 14:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(nearby): drop geo:: forwarding wrappers, call geo:: directly

Browse Source 
The static haversineKm/bearingDeg/bearingCardinal/fmtDist members were
thin pass-throughs to GeoUtils. Remove them and qualify the call sites
with geo:: so there's no parallel local API to keep in sync.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-06-04 00:15:36 +02:00
parent a5d55a38b9
commit 1d0c655111
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/companion_radio/ui-new/NearbyScreen.h
View File

@@ -83,11 +83,7 @@ class NearbyScreen : public UIScreen {
} }
// Geographic helpers live in GeoUtils.h (geo::) — shared with Waypoints / // Geographic helpers live in GeoUtils.h (geo::) — shared with Waypoints /
// trail course-over-ground. Thin forwarders keep the existing call sites. // trail course-over-ground. Call sites use geo:: directly.
static float haversineKm(int32_t a, int32_t b, int32_t c, int32_t d) { return geo::haversineKm(a, b, c, d); }
static int bearingDeg(int32_t a, int32_t b, int32_t c, int32_t d) { return geo::bearingDeg(a, b, c, d); }
static const char* bearingCardinal(int deg) { return geo::bearingCardinal(deg); }
static void fmtDist(char* buf, int n, float km) { geo::fmtDist(buf, n, km); }
static void fmtAge(char* buf, int n, uint32_t lastmod) { static void fmtAge(char* buf, int n, uint32_t lastmod) {
uint32_t now = rtc_clock.getCurrentTime(); uint32_t now = rtc_clock.getCurrentTime();
@@ -128,7 +124,7 @@ class NearbyScreen : public UIScreen {
e.lon_e6 = ci.gps_lon; e.lon_e6 = ci.gps_lon;
bool remote_gps = (ci.gps_lat != 0 || ci.gps_lon != 0); bool remote_gps = (ci.gps_lat != 0 || ci.gps_lon != 0);
e.dist_km = (_own_gps && remote_gps) e.dist_km = (_own_gps && remote_gps)
? haversineKm(_own_lat, _own_lon, ci.gps_lat, ci.gps_lon) ? geo::haversineKm(_own_lat, _own_lon, ci.gps_lat, ci.gps_lon)
: -1.0f; : -1.0f;
e.type = ci.type; e.type = ci.type;
e.contact_idx = i; e.contact_idx = i;
@@ -370,9 +366,9 @@ class NearbyScreen : public UIScreen {
if (e.dist_km >= 0.0f) { if (e.dist_km >= 0.0f) {
char dist[12]; char dist[12];
fmtDist(dist, sizeof(dist), e.dist_km); geo::fmtDist(dist, sizeof(dist), e.dist_km);
int az = bearingDeg(_own_lat, _own_lon, e.lat_e6, e.lon_e6); int az = geo::bearingDeg(_own_lat, _own_lon, e.lat_e6, e.lon_e6);
snprintf(buf, sizeof(buf), "Dist: %s %s", dist, bearingCardinal(az)); snprintf(buf, sizeof(buf), "Dist: %s %s", dist, geo::bearingCardinal(az));
} else { } else {
snprintf(buf, sizeof(buf), "Dist: no GPS"); snprintf(buf, sizeof(buf), "Dist: no GPS");
} }
@@ -626,7 +622,7 @@ public:
display.setColor(sel ? DisplayDriver::DARK : DisplayDriver::LIGHT); display.setColor(sel ? DisplayDriver::DARK : DisplayDriver::LIGHT);
char dist[10]; char dist[10];
if (e.dist_km >= 0.0f) fmtDist(dist, sizeof(dist), e.dist_km); if (e.dist_km >= 0.0f) geo::fmtDist(dist, sizeof(dist), e.dist_km);
else strncpy(dist, "?GPS", sizeof(dist)); else strncpy(dist, "?GPS", sizeof(dist));
display.setCursor(dist_col, y); display.setCursor(dist_col, y);
display.print(dist); display.print(dist);