mirror of
https://github.com/meshtastic/firmware.git
synced 2025-12-28 21:50:35 +00:00
* First try at multimessage storage and display * Nrf built issue fix * Message view mode * Add channel name instead of channel slot * trunk fix * Fix for DM threading * fix for message time * rename of view mode to Conversations * Reply in thread feature * rename Select View Mode to Select Conversation * dismiss all live fix * Messages from phone show on screen * Decoupled message packets from screen.cpp and cleaned up * Cannedmessage cleanup and emotes fixed * Ack on messages sent * Ack message cleanup * Dismiss feature fixed * removed legacy temporary messages * Emote picker fix * Memory size debug * Build error fix * Sanity checks are okay sometimes * Lengthen channel name and finalize cleanup removal of Broadcast * Change DM to @ in order to unify on a single method * Continue unifying display, also show message status on the "isMine" lines * Add context for incoming messages * Better to say "in" vs "on" * crash fix for confirmation nodes * Fix outbound labels based to avoid creating delays * Eink autoscroll dissabled * gating for message storage when not using a screen * revert * Build fail fix * Don't error out with unset MAC address in unit tests * Provide some extra spacing for low hanging characters in messages * Reorder menu options and reword Respond * Reword menus to better reflect actions * Go to thread from favorite screen * Reorder Favorite Action Menu with simple word modifications * Consolidate wording on "Chats" * Mute channel fix * trunk fix * Clean up how muting works along with when we wake the screen * Fix builds for HELTEC_MESH_SOLAR * Signal bars for message ack * fix for notification renderer * Remove duplicate code, fix more Chats, and fix C6L MessageRenderer * Fix to many warnings related to BaseUI * preset aware signal strength display * More C6L fixes and clean up header lines * Use text aligns for message layout where necessary * Attempt to fix memory usage of invalidLifetime * Update channel mute for adjusted protobuf * Missed a comma in merge conflicts * cleanup to get more space * Trunk fixes * Optimize Hi Rez Chirpy to save space * more fixes * More cleanup * Remove used getConversationWith * Remove unused dismissNewestMessage * Fix another build error on occassion * Dimiss key combo function deprecated * More cleanup * Fn symbol code removed * Waypoint cleanup * Trunk fix * Fixup Waypoint screen with BaseUI code * Implement Haruki's ClockRenderer and broadcast decomposeTime across various files. * Revert "Implement Haruki's ClockRenderer and broadcast decomposeTime across various files." This reverts commit2f65721774. * Implement Haruki's ClockRenderer and broadcast decomposeTime across various files. Attempt 2! * remove memory usage debug * Revert only RangeTestModule.cpp change * Switch from dynamic std::string storage to fixed-size char[] * Removing old left over code * More optimization * Free Heap when not on Message screen * build error fixes * Restore ellipsis to end of long names * Remove legacy function renderMessageContent * improved destination filtering * force PKI * cleanup * Shorten longNames to not exceed message popups * log messages sent from apps * Trunk fix * Improve layout of messages screen * Fix potential crash for undefined variable * Revert changes to RedirectablePrint.cpp * Apply shortening to longNames in Select Destination * Fix short name displays * Fix sprintfOverlappingData issue * Fix nullPointerRedundantCheck warning on ESP32 * Add "Delete All Chats" to all chat views * Improve getSafeNodeName / sanitizeString code. * Improve getSafeNodeName further * Restore auto favorite; but only if not CLIENT_BASE * Don't favorite if WE are CLIENT_BASE role * Don't run message persistent in MUI * Fix broken endifs * Unkwnown nodes no longer show as ??? on message thread * More delete options and cleanup of code * fix for delete this chat * Message menu cleanup * trunk fix * Clean up some menu options and remove some Unit C6L ifdefines * Rework Delete flow * Desperate times call for desperate measures * Create a background on the connected icon to reduce overlap impact * Optimize code for background image * Fix for Muzi_Base * Trunk Fixes * Remove the up/down shortcut to launch canned messages (#8370) * Remove the up/down shortcut to launch canned messages * Enabled MQTT and WEBSERVER by default (#8679) Signed-off-by: kur1k0 <zhuzirun@m5stack.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz> --------- Signed-off-by: kur1k0 <zhuzirun@m5stack.com> Co-authored-by: Riker <zhuzirun@m5stack.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com> * Correct string length calculation for signal bars * Manual message scrolling * Fix * Restore CannedMessages on Home Frame * UpDown situational destination for textMessage * Correct up/down destinations on textMessage frame * Update Screen.h for handleTextMessage * Update Screen.cpp to repair a merge issue * Add nudge scroll on UpDownEncoder devices. * Set nodeName to maximum size * Revert "Set nodeName to maximum size" This reverts commite254f39925. * Reflow Node Lists and TLora Pager Views (#8942) * Add files via upload * Move files into the right place * Short or Long Names for everyone! * Add scrolling to Node list * Pagination fix for Latest to oldest per page * Page counters * Dynamic scaling of column counts based upon screen size, clean up box drawing * Reflow Node Lists and TLora Pager Views (#8942) * Add files via upload * Move files into the right place * Short or Long Names for everyone! * Add scrolling to Node list * Pagination fix for Latest to oldest per page * Page counters * Dynamic scaling of column counts based upon screen size, clean up box drawing * Update exempt labels for stale bot workflow Adds triaged and backlog to the list of exempt labels. * Update naming of Frame Visibility toggles * Fix to scrolling * Fix for content cutting off when from us * Fix for "delete this chat" now it does delete the current one * Rework isHighResolution to be an enum called ScreenResolution * Migrate Unit C6L macro guards into currentResolution UltraLow checks * Mistakes happen - restoring NodeList Renderer line --------- Signed-off-by: kur1k0 <zhuzirun@m5stack.com> Co-authored-by: Jason P <applewiz@mac.com> Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz> Co-authored-by: Riker <zhuzirun@m5stack.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: whywilson <m.tools@qq.com> Co-authored-by: Tom Fifield <tom@tomfifield.net>
140 lines
4.1 KiB
C++
140 lines
4.1 KiB
C++
#include "configuration.h"
|
|
#if HAS_SCREEN
|
|
#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 (currentResolution == ScreenResolution::High) {
|
|
radius += 4;
|
|
}
|
|
Point north(0, -radius);
|
|
if (uiconfig.compass_mode != meshtastic_CompassMode_FIXED_RING)
|
|
north.rotate(-myHeading);
|
|
north.translate(compassX, compassY);
|
|
|
|
display->setFont(FONT_SMALL);
|
|
display->setTextAlignment(TEXT_ALIGN_CENTER);
|
|
display->setColor(BLACK);
|
|
if (currentResolution == ScreenResolution::High) {
|
|
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
|
|
#endif |