mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-13 15:11:20 +10:00
* Infinite calibration loop fix * Save calibration * Screen refresh * reduce repeated code * reduce repeated code to reduce flash * fix Waypoint compass size and no fix no heading labels * Don't show compass unless we have a heading and location * If no calculated heading from moving, we should have no heading * Slow walking calculated heading and auto stale heading when not moving * Triming flash space * cleanup * show "?" when no location or heading for distance and heading screen * cleanup * Stale heading logic * final trim * Compass Calibration screen redesign * Trunk Fix * Compile fix * patch * Update src/motion/MotionSensor.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update WaypointModule.cpp --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
181 lines
5.1 KiB
C++
181 lines
5.1 KiB
C++
#include "configuration.h"
|
|
#if HAS_SCREEN
|
|
#include "CompassRenderer.h"
|
|
#include "graphics/ScreenFonts.h"
|
|
#include "graphics/SharedUIDisplay.h"
|
|
#include <cmath>
|
|
|
|
namespace graphics
|
|
{
|
|
namespace CompassRenderer
|
|
{
|
|
|
|
// Point helper class for compass calculations
|
|
struct Point {
|
|
float x, y;
|
|
Point(float x, float y) : x(x), y(y) {}
|
|
|
|
void rotate(float angle)
|
|
{
|
|
float cos_a = cosf(angle);
|
|
float sin_a = sinf(angle);
|
|
float new_x = x * cos_a - y * sin_a;
|
|
float new_y = x * sin_a + y * cos_a;
|
|
x = new_x;
|
|
y = new_y;
|
|
}
|
|
|
|
void scale(float factor)
|
|
{
|
|
x *= factor;
|
|
y *= factor;
|
|
}
|
|
|
|
void translate(float dx, float dy)
|
|
{
|
|
x += dx;
|
|
y += dy;
|
|
}
|
|
};
|
|
|
|
void drawCompassNorth(OLEDDisplay *display, int16_t compassX, int16_t compassY, float myHeading, int16_t radius)
|
|
{
|
|
// Show the compass heading (not implemented in original)
|
|
// This could draw a "N" indicator or north arrow
|
|
// For now, we'll draw a simple north indicator
|
|
// const float radius = 17.0f;
|
|
if (currentResolution == ScreenResolution::High) {
|
|
radius += 4;
|
|
}
|
|
float northX = 0.0f;
|
|
float northY = -radius;
|
|
if (uiconfig.compass_mode != meshtastic_CompassMode_FIXED_RING) {
|
|
const float c = cosf(-myHeading);
|
|
const float s = sinf(-myHeading);
|
|
const float rx = northX * c - northY * s;
|
|
const float ry = northX * s + northY * c;
|
|
northX = rx;
|
|
northY = ry;
|
|
}
|
|
northX += compassX;
|
|
northY += compassY;
|
|
|
|
display->setFont(FONT_SMALL);
|
|
display->setTextAlignment(TEXT_ALIGN_CENTER);
|
|
display->setColor(BLACK);
|
|
const int16_t nLabelWidth = display->getStringWidth("N");
|
|
if (currentResolution == ScreenResolution::High) {
|
|
display->fillRect(northX - 8, northY - 1, nLabelWidth + 3, FONT_HEIGHT_SMALL - 6);
|
|
} else {
|
|
display->fillRect(northX - 4, northY - 1, nLabelWidth + 2, FONT_HEIGHT_SMALL - 6);
|
|
}
|
|
display->setColor(WHITE);
|
|
display->drawString(northX, northY - 3, "N");
|
|
}
|
|
|
|
void drawNodeHeading(OLEDDisplay *display, int16_t compassX, int16_t compassY, uint16_t compassDiam, float headingRadian)
|
|
{
|
|
Point tip(0.0f, -0.5f), tail(0.0f, 0.35f); // pointing up initially
|
|
float arrowOffsetX = 0.14f, arrowOffsetY = 0.9f;
|
|
Point leftArrow(tip.x - arrowOffsetX, tip.y + arrowOffsetY), rightArrow(tip.x + arrowOffsetX, tip.y + arrowOffsetY);
|
|
|
|
Point *arrowPoints[] = {&tip, &tail, &leftArrow, &rightArrow};
|
|
|
|
for (int i = 0; i < 4; i++) {
|
|
arrowPoints[i]->rotate(headingRadian);
|
|
arrowPoints[i]->scale(compassDiam * 0.6);
|
|
arrowPoints[i]->translate(compassX, compassY);
|
|
}
|
|
|
|
#ifdef USE_EINK
|
|
display->drawTriangle(tip.x, tip.y, rightArrow.x, rightArrow.y, tail.x, tail.y);
|
|
#else
|
|
display->fillTriangle(tip.x, tip.y, rightArrow.x, rightArrow.y, tail.x, tail.y);
|
|
#endif
|
|
display->drawTriangle(tip.x, tip.y, leftArrow.x, leftArrow.y, tail.x, tail.y);
|
|
}
|
|
|
|
void drawArrowToNode(OLEDDisplay *display, int16_t x, int16_t y, int16_t size, float bearing)
|
|
{
|
|
float radians = bearing * DEG_TO_RAD;
|
|
|
|
Point tip(0, -size / 2);
|
|
Point left(-size / 6, size / 4);
|
|
Point right(size / 6, size / 4);
|
|
Point tail(0, size / 4.5);
|
|
|
|
tip.rotate(radians);
|
|
left.rotate(radians);
|
|
right.rotate(radians);
|
|
tail.rotate(radians);
|
|
|
|
tip.translate(x, y);
|
|
left.translate(x, y);
|
|
right.translate(x, y);
|
|
tail.translate(x, y);
|
|
|
|
display->fillTriangle(tip.x, tip.y, left.x, left.y, tail.x, tail.y);
|
|
display->fillTriangle(tip.x, tip.y, right.x, right.y, tail.x, tail.y);
|
|
}
|
|
|
|
bool getHeadingRadians(double lat, double lon, float &headingRadian)
|
|
{
|
|
headingRadian = 0.0f;
|
|
|
|
if (uiconfig.compass_mode == meshtastic_CompassMode_FREEZE_HEADING)
|
|
return true;
|
|
|
|
if (!screen)
|
|
return false;
|
|
|
|
if (screen->hasHeading()) {
|
|
headingRadian = screen->getHeading() * DEG_TO_RAD;
|
|
return true;
|
|
}
|
|
|
|
const float estimatedHeadingDeg = screen->estimatedHeading(lat, lon);
|
|
if (!(estimatedHeadingDeg >= 0.0f))
|
|
return false;
|
|
|
|
headingRadian = estimatedHeadingDeg * DEG_TO_RAD;
|
|
return true;
|
|
}
|
|
|
|
float adjustBearingForCompassMode(float bearingRadian, float headingRadian)
|
|
{
|
|
if (uiconfig.compass_mode != meshtastic_CompassMode_FIXED_RING)
|
|
return bearingRadian - headingRadian;
|
|
|
|
return bearingRadian;
|
|
}
|
|
|
|
float radiansToDegrees360(float angleRadian)
|
|
{
|
|
constexpr float fullTurnDeg = 360.0f;
|
|
float degrees = angleRadian * RAD_TO_DEG;
|
|
if (degrees < 0.0f)
|
|
degrees += fullTurnDeg;
|
|
else if (degrees >= fullTurnDeg)
|
|
degrees -= fullTurnDeg;
|
|
return degrees;
|
|
}
|
|
|
|
uint16_t getCompassDiam(uint32_t displayWidth, uint32_t displayHeight)
|
|
{
|
|
// Calculate appropriate compass diameter based on display size
|
|
uint16_t minDimension = (displayWidth < displayHeight) ? displayWidth : displayHeight;
|
|
uint16_t maxDiam = minDimension / 3; // Use 1/3 of the smaller dimension
|
|
|
|
// Ensure minimum and maximum bounds
|
|
if (maxDiam < 16)
|
|
maxDiam = 16;
|
|
if (maxDiam > 64)
|
|
maxDiam = 64;
|
|
|
|
return maxDiam;
|
|
}
|
|
|
|
} // namespace CompassRenderer
|
|
} // namespace graphics
|
|
#endif
|