pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-07 12:09:31 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix date display to be upper right bound (#7876)
Some checks are pending
CI / setup (check) (push) Waiting to run
Details
CI / setup (esp32) (push) Waiting to run
Details
CI / setup (esp32c3) (push) Waiting to run
Details
CI / setup (esp32c6) (push) Waiting to run
Details
CI / setup (esp32s3) (push) Waiting to run
Details
CI / setup (nrf52840) (push) Waiting to run
Details
CI / setup (rp2040) (push) Waiting to run
Details
CI / setup (rp2350) (push) Waiting to run
Details
CI / setup (stm32) (push) Waiting to run
Details
CI / version (push) Waiting to run
Details
CI / check (push) Blocked by required conditions
Details
CI / build-esp32 (push) Blocked by required conditions
Details
CI / build-esp32s3 (push) Blocked by required conditions
Details
CI / build-esp32c3 (push) Blocked by required conditions
Details
CI / build-esp32c6 (push) Blocked by required conditions
Details
CI / build-nrf52840 (push) Blocked by required conditions
Details
CI / build-rp2040 (push) Blocked by required conditions
Details
CI / build-rp2350 (push) Blocked by required conditions
Details
CI / build-stm32 (push) Blocked by required conditions
Details
CI / build-debian-src (push) Waiting to run
Details
CI / package-pio-deps-native-tft (push) Waiting to run
Details
CI / test-native (push) Waiting to run
Details
CI / docker-deb-amd64 (push) Waiting to run
Details
CI / docker-deb-amd64-tft (push) Waiting to run
Details
CI / docker-alp-amd64 (push) Waiting to run
Details
CI / docker-alp-amd64-tft (push) Waiting to run
Details
CI / docker-deb-arm64 (push) Waiting to run
Details
CI / docker-deb-armv7 (push) Waiting to run
Details
CI / gather-artifacts (esp32) (push) Blocked by required conditions
Details
CI / gather-artifacts (esp32c3) (push) Blocked by required conditions
Details
CI / gather-artifacts (esp32c6) (push) Blocked by required conditions
Details
CI / gather-artifacts (esp32s3) (push) Blocked by required conditions
Details
CI / gather-artifacts (nrf52840) (push) Blocked by required conditions
Details
CI / gather-artifacts (rp2040) (push) Blocked by required conditions
Details
CI / gather-artifacts (rp2350) (push) Blocked by required conditions
Details
CI / gather-artifacts (stm32) (push) Blocked by required conditions
Details
CI / release-artifacts (push) Blocked by required conditions
Details
CI / release-firmware (esp32) (push) Blocked by required conditions
Details
CI / release-firmware (esp32c3) (push) Blocked by required conditions
Details
CI / release-firmware (esp32c6) (push) Blocked by required conditions
Details
CI / release-firmware (esp32s3) (push) Blocked by required conditions
Details
CI / release-firmware (nrf52840) (push) Blocked by required conditions
Details
CI / release-firmware (rp2040) (push) Blocked by required conditions
Details
CI / release-firmware (rp2350) (push) Blocked by required conditions
Details
CI / release-firmware (stm32) (push) Blocked by required conditions
Details
CI / publish-firmware (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
Jason P 2025-09-05 22:21:33 -05:00 committed by GitHub
parent d6df664102
commit e1634076f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/graphics/draw/ClockRenderer.cpp
View File

@ -302,14 +302,28 @@ void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int1
secondString);
#endif
display->setFont(FONT_SMALL);
// Display GPS derived date
char datetimeStr[25];
UIRenderer::formatDateTime(datetimeStr, sizeof(datetimeStr), rtc_sec, display, false);
char fullLine[40];
snprintf(fullLine, sizeof(fullLine), "%s", datetimeStr);
yOffset = (isHighResolution) ? 12 : 1;
display->drawString(startingHourMinuteTextX + timeStringWidth - display->getStringWidth(fullLine),
getTextPositions(display)[line] + yOffset, fullLine);
xOffset = 1;
if (isHighResolution) {
snprintf(fullLine, sizeof(fullLine), "%s", datetimeStr);
} else {
snprintf(fullLine, sizeof(fullLine), "%s", &datetimeStr[2]);
}
if (hasUnreadMessage) {
if (isHighResolution) {
xOffset = 23;
snprintf(fullLine, sizeof(fullLine), "%s", &datetimeStr[2]);
} else {
xOffset = 15;
snprintf(fullLine, sizeof(fullLine), "%s", &datetimeStr[5]);
}
}
display->drawString(display->getWidth() - xOffset - display->getStringWidth(fullLine), getTextPositions(display)[line],
fullLine);
}
void drawBluetoothConnectedIcon(OLEDDisplay *display, int16_t x, int16_t y)
@ -529,12 +543,22 @@ void drawAnalogClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
char datetimeStr[25];
UIRenderer::formatDateTime(datetimeStr, sizeof(datetimeStr), rtc_sec, display, false);
char fullLine[40];
int xOffset = 1;
if (isHighResolution) {
snprintf(fullLine, sizeof(fullLine), "%s", datetimeStr);
} else {
snprintf(fullLine, sizeof(fullLine), "%s", &datetimeStr[2]);
}
display->drawString(display->getWidth() - 1 - display->getStringWidth(fullLine), getTextPositions(display)[line],
if (hasUnreadMessage) {
if (isHighResolution) {
xOffset = 23;
snprintf(fullLine, sizeof(fullLine), "%s", &datetimeStr[2]);
} else {
xOffset = 15;
snprintf(fullLine, sizeof(fullLine), "%s", &datetimeStr[5]);
}
}
display->drawString(display->getWidth() - xOffset - display->getStringWidth(fullLine), getTextPositions(display)[line],
fullLine);
}
}