diff --git a/src/graphics/BRC.cpp b/src/graphics/BRC.cpp index d54ef4380..a65a8ee7c 100644 --- a/src/graphics/BRC.cpp +++ b/src/graphics/BRC.cpp @@ -1,7 +1,7 @@ +#include "BRC.h" #include "GPSStatus.h" #include "gps/GeoCoord.h" #include "graphics/Screen.h" -#include "BRC.h" using namespace meshtastic; @@ -106,7 +106,8 @@ int BRCAddress::annular(char *buf, size_t len, bool noUnit) unitMultiplier = 1.0; unit = "ft"; } - if (noUnit) unit = ""; + if (noUnit) + unit = ""; if (bearing > 1.75 && bearing < 10.25) { const char *street = nullptr; diff --git a/src/graphics/draw/NodeListRenderer.cpp b/src/graphics/draw/NodeListRenderer.cpp index 62954a764..991ebc29d 100644 --- a/src/graphics/draw/NodeListRenderer.cpp +++ b/src/graphics/draw/NodeListRenderer.cpp @@ -6,10 +6,10 @@ #include "UIRenderer.h" #include "gps/GeoCoord.h" #include "gps/RTC.h" // for getTime() function +#include "graphics/BRC.h" #include "graphics/ScreenFonts.h" #include "graphics/SharedUIDisplay.h" #include "graphics/images.h" -#include "graphics/BRC.h" #include "meshUtils.h" #include @@ -341,7 +341,6 @@ void drawEntryCompass(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16 } } - void drawEntryBRC(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16_t x, int16_t y, int columnWidth) { bool isLeftCol = (x < SCREEN_WIDTH / 2); @@ -360,7 +359,6 @@ void drawEntryBRC(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16_t x auto nameWidth = display->getStringWidth("WWWW"); // Fixed width so they are aligned. display->drawString(xText + nameWidth, y, buf); - if (node->is_favorite) { if (isHighResolution) { drawScaledXBitmap16x16(x, y + 6, smallbulletpoint_width, smallbulletpoint_height, smallbulletpoint, display); @@ -442,7 +440,7 @@ void drawLastSeenExtra(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int1 int rightEdge = x + columnWidth - timeOffset; if (timeStr[strlen(timeStr) - 1] == 'm') // Fix the fact that our fonts don't line up well all the time rightEdge -= 1; - //display->setTextAlignment(TEXT_ALIGN_RIGHT); + // display->setTextAlignment(TEXT_ALIGN_RIGHT); int textWidth = display->getStringWidth(timeStr); display->drawString(rightEdge - textWidth, y, timeStr); } @@ -452,7 +450,8 @@ void drawLastSeenExtra(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int1 // ============================= void drawNodeListScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y, const char *title, - EntryRenderer renderer, NodeExtrasRenderer extras, float heading, double lat, double lon, int totalColumns) + EntryRenderer renderer, NodeExtrasRenderer extras, float heading, double lat, double lon, + int totalColumns) { const int COMMON_HEADER_HEIGHT = FONT_HEIGHT_SMALL - 1; const int rowYOffset = FONT_HEIGHT_SMALL - 3;