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

feat(units): imperial min-distance gate + imperial map grid

Browse Source 
Follow the global Units preference in the two remaining Trail distance
spots that were still metric-only:

- Min dist gate: the index is now a unit-agnostic level (0=finest..3).
  Metric stays 5/10/25/100 m; imperial uses round 15/30/75/300 ft (applied
  as their metre equivalents in the sampling gate).
- Map scale grid: imperial mode uses round ft/mi steps (10 ft … 100 mi)
  instead of metric steps with a converted label. Step storage moved to
  float metres so sub-metre imperial steps keep their geometry; labels come
  from a parallel table so the scale bar reads an exact round value.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-06-04 00:50:42 +02:00
parent 9ae0828fcb
commit d0d20989a0
4 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
examples/companion_radio/Trail.h
View File

@@ -31,14 +31,20 @@ public:
// Min-delta (metres) gates samples too close to the previous one.
// Default 5 m: keeps walking jitter out, dense enough for a visible trail.
// The index is a unit-agnostic "level" (0=finest … 3=coarsest); the actual
// gate distance and its label follow the global metric/imperial preference.
static const uint8_t MIN_DELTA_COUNT = 4;
static uint16_t minDeltaMeters(uint8_t idx) {
static const uint16_t OPTS[MIN_DELTA_COUNT] = { 5, 10, 25, 100 };
return OPTS[idx < MIN_DELTA_COUNT ? idx : 0];
static uint16_t minDeltaMeters(uint8_t idx, bool imperial) {
static const uint16_t MET[MIN_DELTA_COUNT] = { 5, 10, 25, 100 };
static const uint16_t IMP[MIN_DELTA_COUNT] = { 5, 9, 23, 91 }; // ≈ 15/30/75/300 ft
if (idx >= MIN_DELTA_COUNT) idx = 0;
return imperial ? IMP[idx] : MET[idx];
}
static const char* minDeltaLabel(uint8_t idx) {
static const char* L[MIN_DELTA_COUNT] = { "5 m", "10 m", "25 m", "100 m" };
return L[idx < MIN_DELTA_COUNT ? idx : 0];
static const char* minDeltaLabel(uint8_t idx, bool imperial) {
static const char* MET[MIN_DELTA_COUNT] = { "5 m", "10 m", "25 m", "100 m" };
static const char* IMP[MIN_DELTA_COUNT] = { "15 ft", "30 ft", "75 ft", "300 ft" };
if (idx >= MIN_DELTA_COUNT) idx = 0;
return imperial ? IMP[idx] : MET[idx];
}
// Speed / pace display units. UNITS_KMH / UNITS_MPH show speed; UNITS_PACE_KM