Skip to content

Commit 8038189

Browse files
committed
trunk fmt
1 parent bec7320 commit 8038189

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/graphics/BRC.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
#include "BRC.h"
12
#include "GPSStatus.h"
23
#include "gps/GeoCoord.h"
34
#include "graphics/Screen.h"
4-
#include "BRC.h"
55

66
using namespace meshtastic;
77

@@ -106,7 +106,8 @@ int BRCAddress::annular(char *buf, size_t len, bool noUnit)
106106
unitMultiplier = 1.0;
107107
unit = "ft";
108108
}
109-
if (noUnit) unit = "";
109+
if (noUnit)
110+
unit = "";
110111

111112
if (bearing > 1.75 && bearing < 10.25) {
112113
const char *street = nullptr;

src/graphics/draw/NodeListRenderer.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
#include "UIRenderer.h"
77
#include "gps/GeoCoord.h"
88
#include "gps/RTC.h" // for getTime() function
9+
#include "graphics/BRC.h"
910
#include "graphics/ScreenFonts.h"
1011
#include "graphics/SharedUIDisplay.h"
1112
#include "graphics/images.h"
12-
#include "graphics/BRC.h"
1313
#include "meshUtils.h"
1414
#include <algorithm>
1515

@@ -341,7 +341,6 @@ void drawEntryCompass(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16
341341
}
342342
}
343343

344-
345344
void drawEntryBRC(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16_t x, int16_t y, int columnWidth)
346345
{
347346
bool isLeftCol = (x < SCREEN_WIDTH / 2);
@@ -360,7 +359,6 @@ void drawEntryBRC(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16_t x
360359
auto nameWidth = display->getStringWidth("WWWW"); // Fixed width so they are aligned.
361360
display->drawString(xText + nameWidth, y, buf);
362361

363-
364362
if (node->is_favorite) {
365363
if (isHighResolution) {
366364
drawScaledXBitmap16x16(x, y + 6, smallbulletpoint_width, smallbulletpoint_height, smallbulletpoint, display);
@@ -442,7 +440,7 @@ void drawLastSeenExtra(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int1
442440
int rightEdge = x + columnWidth - timeOffset;
443441
if (timeStr[strlen(timeStr) - 1] == 'm') // Fix the fact that our fonts don't line up well all the time
444442
rightEdge -= 1;
445-
//display->setTextAlignment(TEXT_ALIGN_RIGHT);
443+
// display->setTextAlignment(TEXT_ALIGN_RIGHT);
446444
int textWidth = display->getStringWidth(timeStr);
447445
display->drawString(rightEdge - textWidth, y, timeStr);
448446
}
@@ -452,7 +450,8 @@ void drawLastSeenExtra(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int1
452450
// =============================
453451

454452
void drawNodeListScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y, const char *title,
455-
EntryRenderer renderer, NodeExtrasRenderer extras, float heading, double lat, double lon, int totalColumns)
453+
EntryRenderer renderer, NodeExtrasRenderer extras, float heading, double lat, double lon,
454+
int totalColumns)
456455
{
457456
const int COMMON_HEADER_HEIGHT = FONT_HEIGHT_SMALL - 1;
458457
const int rowYOffset = FONT_HEIGHT_SMALL - 3;

0 commit comments

Comments
 (0)