Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add support for the units selected in the display #1

Open
wants to merge 2 commits into
base: brc-2023
Choose a base branch
from
Open

add support for the units selected in the display #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
089951b
add support for the units selected in the display
exadeci Aug 15, 2023
d3228ad
Merge pull request #1 from tschundler/brc-2023
exadeci Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/graphics/Screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,11 +514,16 @@ const double BRC_LATF = 40.786400;
const double BRC_LONF = -119.203500;
const double BRC_NOON = 1.5;
const double RAD_TO_HOUR = (6.0/3.14159);
const double METER_TO_FEET = 3.28084;

static char* BRCAddress(int32_t lat, int32_t lon)
{
static char addrStr[20];
double unitMultiplier = 1;
const char* unit = "m";
if (config.display.units == meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL) {
unitMultiplier = 3.28084;
unit = "ft";
}

float bearingToMan =
GeoCoord::bearing(BRC_LATF, BRC_LONF, DegD(lat), DegD(lon)) * RAD_TO_HOUR;
Expand All @@ -530,7 +535,7 @@ static char* BRCAddress(int32_t lat, int32_t lon)
if (hour == 0) {hour = 12;}

float d =
GeoCoord::latLongToMeter(BRC_LATF, BRC_LONF, DegD(lat), DegD(lon)) * METER_TO_FEET;
GeoCoord::latLongToMeter(BRC_LATF, BRC_LONF, DegD(lat), DegD(lon)) * unitMultiplier;

if (bearingToMan > 1.75 && bearingToMan < 10.25) {
const char* street = NULL;
Expand Down Expand Up @@ -559,13 +564,13 @@ static char* BRCAddress(int32_t lat, int32_t lon)
}
}
if (street) {
snprintf(addrStr, sizeof(addrStr), "%d:%02d & %s %dft", hour, minute, street, int(dist));
snprintf(addrStr, sizeof(addrStr), "%d:%02d & %s %d%s", hour, minute, street, int(dist), unit);
return addrStr;
}

}

snprintf(addrStr, sizeof(addrStr), "%d:%02d & %dft", hour, minute, (uint32_t)d);
snprintf(addrStr, sizeof(addrStr), "%d:%02d & %d%s", hour, minute, (uint32_t)d, unit);
return addrStr;
}

Expand Down