pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-05 05:04:46 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Re-arranged Lora Screen

Browse Source
This commit is contained in:
HarukiToreda 2025-05-20 23:08:32 -04:00
parent f1d4e5fa48
commit 93aa88129c
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/graphics/Screen.cpp
View File

@ -2773,27 +2773,26 @@ static void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int
display->setColor(WHITE); display->setColor(WHITE);
display->setTextAlignment(TEXT_ALIGN_LEFT); display->setTextAlignment(TEXT_ALIGN_LEFT);
// === First Row: Region / Radio Preset === // === First Row: Region / BLE Name ===
drawNodes(display, x, compactFirstLine + 3, nodeStatus, 0, true); drawNodes(display, x, compactFirstLine + 3, nodeStatus, 0, true);
auto mode = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, false);
// Display Region and Radio Preset
char regionradiopreset[25];
const char *region = myRegion ? myRegion->name : NULL;
snprintf(regionradiopreset, sizeof(regionradiopreset), "%s/%s", region, mode);
int textWidth = display->getStringWidth(regionradiopreset);
display->drawString(SCREEN_WIDTH - textWidth, compactFirstLine, regionradiopreset);
// === Second Row: BLE Name ===
uint8_t dmac[6]; uint8_t dmac[6];
char shortnameble[35]; char shortnameble[35];
getMacAddr(dmac); getMacAddr(dmac);
snprintf(ourId, sizeof(ourId), "%02x%02x", dmac[4], dmac[5]); snprintf(ourId, sizeof(ourId), "%02x%02x", dmac[4], dmac[5]);
snprintf(shortnameble, sizeof(shortnameble), "BLE: %s", ourId); snprintf(shortnameble, sizeof(shortnameble), "BLE: %s", ourId);
textWidth = display->getStringWidth(shortnameble); int textWidth = display->getStringWidth(shortnameble);
int nameX = (SCREEN_WIDTH - textWidth) / 2; int nameX = (SCREEN_WIDTH - textWidth);
display->drawString(nameX, compactSecondLine, shortnameble); display->drawString(nameX, compactFirstLine, shortnameble);
// === Second Row: Radio Preset ===
auto mode = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, false);
char regionradiopreset[25];
const char *region = myRegion ? myRegion->name : NULL;
snprintf(regionradiopreset, sizeof(regionradiopreset), "%s/%s", region, mode);
textWidth = display->getStringWidth(regionradiopreset);
nameX = (SCREEN_WIDTH - textWidth) / 2;
display->drawString(nameX, compactSecondLine, regionradiopreset);
// === Third Row: Frequency / ChanNum === // === Third Row: Frequency / ChanNum ===
char frequencyslot[35]; char frequencyslot[35];