pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-30 03:13:51 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Update Screen.cpp

Browse Source
This commit is contained in:
loodydo 2022-07-04 13:16:29 -06:00 committed by GitHub
parent 9f78dff25f
commit cf331dc58b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/graphics/Screen.cpp
View File

@ -595,7 +595,7 @@ class Point
void rotate(float radian) void rotate(float radian)
{ {
float cos = cosf(radian), sin = sinf(radian); float cos = cosf(radian), sin = sinf(radian);
float rx = x * cos - y * sin, ry = x * sin + y * cos; float rx = x * cos + y * sin, ry = -x * sin + y * cos;
x = rx; x = rx;
y = ry; y = ry;
@ -609,8 +609,10 @@ class Point
void scale(float f) void scale(float f)
{ {
//We use -f here to counter the flip that happens
//on the y axis when drawing and rotating on screen
x *= f; x *= f;
y *= f; y *= -f;
} }
}; };
@ -682,16 +684,17 @@ static void drawNodeHeading(OLEDDisplay *display, int16_t compassX, int16_t comp
drawLine(display, rightArrow, tip); drawLine(display, rightArrow, tip);
} }
// Draw the compass heading // Draw north
static void drawCompassHeading(OLEDDisplay *display, int16_t compassX, int16_t compassY, float myHeading) static void drawCompassNorth(OLEDDisplay *display, int16_t compassX, int16_t compassY, float myHeading)
{ {
Point N1(-0.04f, -0.65f), N2(0.04f, -0.65f); Point N1(-0.04f, 0.65f), N2(0.04f, 0.65f);
Point N3(-0.04f, -0.55f), N4(0.04f, -0.55f); Point N3(-0.04f, 0.55f), N4(0.04f, 0.55f);
Point *rosePoints[] = {&N1, &N2, &N3, &N4}; Point *rosePoints[] = {&N1, &N2, &N3, &N4};
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
rosePoints[i]->rotate(myHeading); // North on compass will be negative of heading
rosePoints[i]->scale(-1 * COMPASS_DIAM); rosePoints[i]->rotate(-myHeading);
rosePoints[i]->scale(COMPASS_DIAM);
rosePoints[i]->translate(compassX, compassY); rosePoints[i]->translate(compassX, compassY);
} }
drawLine(display, N1, N3); drawLine(display, N1, N3);
@ -762,7 +765,7 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
if (ourNode && hasPosition(ourNode)) { if (ourNode && hasPosition(ourNode)) {
Position &op = ourNode->position; Position &op = ourNode->position;
float myHeading = estimatedHeading(DegD(op.latitude_i), DegD(op.longitude_i)); float myHeading = estimatedHeading(DegD(op.latitude_i), DegD(op.longitude_i));
drawCompassHeading(display, compassX, compassY, myHeading); drawCompassNorth(display, compassX, compassY, myHeading);
if (hasPosition(node)) { if (hasPosition(node)) {
// display direction toward node // display direction toward node
@ -775,10 +778,8 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
else else
snprintf(distStr, sizeof(distStr), "%.1f km", d / 1000); snprintf(distStr, sizeof(distStr), "%.1f km", d / 1000);
// FIXME, also keep the guess at the operators heading and add/substract
// it. currently we don't do this and instead draw north up only.
float bearingToOther = float bearingToOther =
GeoCoord::bearing(DegD(p.latitude_i), DegD(p.longitude_i), DegD(op.latitude_i), DegD(op.longitude_i)); GeoCoord::bearing(DegD(op.latitude_i), DegD(op.longitude_i), DegD(p.latitude_i), DegD(p.longitude_i));
float headingRadian = bearingToOther - myHeading; float headingRadian = bearingToOther - myHeading;
drawNodeHeading(display, compassX, compassY, headingRadian); drawNodeHeading(display, compassX, compassY, headingRadian);
} }