mirror of
https://github.com/meshtastic/firmware.git
synced 2025-06-09 06:32:06 +00:00
Namespace fixes
This commit is contained in:
parent
49ba114f3e
commit
fd1f028ecf
@ -634,7 +634,8 @@ void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, in
|
|||||||
const int highlightHeight = FONT_HEIGHT_SMALL - 1;
|
const int highlightHeight = FONT_HEIGHT_SMALL - 1;
|
||||||
const int textY = y + 1 + (highlightHeight - FONT_HEIGHT_SMALL) / 2;
|
const int textY = y + 1 + (highlightHeight - FONT_HEIGHT_SMALL) / 2;
|
||||||
const int centerX = x + SCREEN_WIDTH / 2;
|
const int centerX = x + SCREEN_WIDTH / 2;
|
||||||
const char *shortName = (node->has_user && haveGlyphs(node->user.short_name)) ? node->user.short_name : "Node";
|
const char *shortName =
|
||||||
|
(node->has_user && graphics::UIRenderer::haveGlyphs(node->user.short_name)) ? node->user.short_name : "Node";
|
||||||
|
|
||||||
if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_INVERTED)
|
if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_INVERTED)
|
||||||
display->setColor(BLACK);
|
display->setColor(BLACK);
|
||||||
@ -662,7 +663,7 @@ void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, in
|
|||||||
// 2. Signal and Hops (combined on one line, if available)
|
// 2. Signal and Hops (combined on one line, if available)
|
||||||
char signalHopsStr[32] = "";
|
char signalHopsStr[32] = "";
|
||||||
bool haveSignal = false;
|
bool haveSignal = false;
|
||||||
int percentSignal = clamp((int)((node->snr + 10) * 5), 0, 100);
|
int percentSignal = std::clamp((int)((node->snr + 10) * 5), 0, 100);
|
||||||
const char *signalLabel = " Sig";
|
const char *signalLabel = " Sig";
|
||||||
|
|
||||||
// If SNR looks reasonable, show signal
|
// If SNR looks reasonable, show signal
|
||||||
|
Loading…
Reference in New Issue
Block a user