mirror of
https://github.com/meshtastic/firmware.git
synced 2025-08-15 09:45:06 +00:00

* Update Favorite Node Message Options to unify against other screens * Rebuild Horizontal Battery, Resolve overlap concerns * Update positioning on Message frame and fix drawCommonHeader overlay * Beginnings of creating isHighResolution bool * Fixup determineResolution() * Implement isHighResolution in place of SCREEN_WIDTH > 128 checks * Line Spacing bound to isHighResolution * Analog Clock for all * Add AM/PM to Analog Clock if isHighResolution and not TWatch * Simple Menu Queue, and add time menu * Fix prompt string for 12/24 hour picker * More menu banners into functions * Fix Action Menu on Home frame * Correct pop-up calculation size and continue to leverage isHighResolution * Move menu bits to MenuHandler * Plumb in the digital/analog picker * Correct Clock Face Picker title * Clock picker fixes * Migrate the rest of the menus to MenuHandler.* * Add compass menu and needle point option * Minor fix for compass point menu * Correct Home menu into typical format * Fix emoji bounce, overlap, and missing commonHeader * Sanitize long_names and removed unused variables * Slightly better sanitizeString variation * Resolved apostrophe being shown as upside down question mark * Gotta keep height and width in expected order * Remove Second Hand for Analog Clock on EInk displays * Fix Clock menu option decision tree * Improvements to Eink Navigation * Pause Banner for Eink moved to bottom * Updated working for 12-/24-hour menu and Added US/Arizona to timezone picker * Add Adhoc Ping and resolve error with std::string sanitized * Hide quick toggle as option is available within Action Menu, commented out for the moment * Remove old battery icon and option, use drawCommonHeader throughout, re-add battery to Clock frames * fix misc build warnings. NFC * Update Analog Clock on EInk to show more digits * Establish Action Menu on all node list screens, add NodeDB reset (with confirmation) option * Add Toggle Backlight for EInk Displays * Suppress action screen Full refresh for Eink * Adjust drawBluetoothConnectedIcon on TWatch * Maintain clock frame when switching between Clock Faces * Move modules beyond the clock in navigation * addressed the conflicts, and changed target branch to 2.7-MiscFixes-Week1 * cleanup, cheers * Add AM/PM to low resolution clock also * Small adjustments to AM/PM replacement across various devices * Resolve dangling pointer issues with sanitize code * Update comments for Screen.cpp related to module load change * Trunk runs * Update message caching to correct aged timestamp * Menu wording adjustments * Time Format wording * Use all the rows on EInk since with autohide the navigation bar * Finalize Time Format picker word change * Retired drawFunctionOverlay code No longer being used * Actually honor the points-north setting * Trunk * Compressed action list * Update no-op showOverlayBanner function * trunk * Correct T_Watch_S3 specific line * Autosized Action menu per screen * Finalize Autosized Action menu per screen * Unify Message Titles * Reorder Timezones to match expectations * Adjust text location for pop-ups * Revert "Actually honor the points-north setting" This reverts commit20988aa4fa
. * Make NodeDB sort its internal vector when lastheard is updated. Don't sort in NodeListRenderer * Update src/graphics/draw/NodeListRenderer.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/mesh/NodeDB.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Pass by reference -- Thanks Copilot! * Throttle sorting just a touch * Check more carefully for own node * Eliminate some now-unneeded sorting * Move function after include * Putting Modules back to position 0 and some trunk checks found * Add Scrollbar for Action menus * Second attempt to move modules down the navigation bar * Continue effort of moving modules in the navigation * Canned Messages tweak * Replicate Function + Space through the Menu System * Move init button parameters into config struct (#7145) * Remove bundling of web-ui from ESP32 devices (#7143) * Fixed triple click GPS toggle bungle * Move init button parameters into config struct * Reapply "Actually honor the points-north setting" This reverts commit42c1967e7b
. * Actually do compass pointings correctly * Tweak to node bearings * Menu wording tweaks * Get the compass_north_top logic right * Don't jump frames after setting Compass * Get rid of the extra bearingTo functions * Don't blink Mail on EInk Clock Screens * Actually set lat and long * Calibrate * Convert Radians to Degrees * More degree vs radians fixes * De-duplicate draw arrow function * Don't advertise compass calibration without an accell thread. --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz> Co-authored-by: HarukiToreda <116696711+HarukiToreda@users.noreply.github.com> Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com> Co-authored-by: csrutil <keming.cao@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
138 lines
4.0 KiB
C++
138 lines
4.0 KiB
C++
#include "CompassRenderer.h"
|
|
#include "NodeDB.h"
|
|
#include "UIRenderer.h"
|
|
#include "configuration.h"
|
|
#include "gps/GeoCoord.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 = cos(angle);
|
|
float sin_a = sin(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 (isHighResolution) {
|
|
radius += 4;
|
|
}
|
|
Point north(0, -radius);
|
|
if (!config.display.compass_north_top)
|
|
north.rotate(-myHeading);
|
|
north.translate(compassX, compassY);
|
|
|
|
display->setFont(FONT_SMALL);
|
|
display->setTextAlignment(TEXT_ALIGN_CENTER);
|
|
display->setColor(BLACK);
|
|
if (isHighResolution) {
|
|
display->fillRect(north.x - 8, north.y - 1, display->getStringWidth("N") + 3, FONT_HEIGHT_SMALL - 6);
|
|
} else {
|
|
display->fillRect(north.x - 4, north.y - 1, display->getStringWidth("N") + 2, FONT_HEIGHT_SMALL - 6);
|
|
}
|
|
display->setColor(WHITE);
|
|
display->drawString(north.x, north.y - 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);
|
|
}
|
|
|
|
float estimatedHeading(double lat, double lon)
|
|
{
|
|
// Simple magnetic declination estimation
|
|
// This is a very basic implementation - the original might be more sophisticated
|
|
return 0.0f; // Return 0 for now, indicating no heading available
|
|
}
|
|
|
|
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
|