Unify the native display config between legacy display and MUI (#6838)
* Add missed include
* Another Warning fix
* Add another HAS_SCREEN
* Namespace fixes
* Removed depricated destination types and re-factored destination screen
* Get rid of Arduino Strings
* Clean up after Copilot
* SixthLine Def, Screen Rename
Added Sixth Line Definition Screen Rename, and Automatic Line Adjustment
* Consistency is hard - fixed "Sixth"
* System Frame Updates
Adjusted line construction to ensure we fit maximum content per screen.
* Fix up notifications
* Add a couple more ifdef HAS_SCREEN lines
* Add screen->isOverlayBannerShowing()
* Don't forget the invert!
* Adjust Nodelist Center Divider
Adjust Nodelist Center Divider
* Fix variable casting
* Fix entryText variable as empty before update to fix validation
* Altitude is int32_t
* Update PowerTelemetry to have correct data type
* Fix cppcheck warnings (#6945)
* Fix cppcheck warnings
* Adjust logic in Power.cpp for power sensor
---------
Co-authored-by: Jason P <applewiz@mac.com>
* More pixel wrangling so things line up NodeList edition
* Adjust NodeList alignments and plumb some background padding for a possible title fix
* Better alignment for banner notifications
* Move title into drawCommonHeader; initial screen tested
* Fonts make spacing items difficult
* Improved beeping booping and other buzzer based feedback (#6947)
* Improved beeping booping and other buzzer based feedback
* audible button feedback (#6949)
* Refactor
---------
Co-authored-by: todd-herbert <herbert.todd@gmail.com>
* Sandpapered the corners of the notification popup
* Finalize drawCommonHeader migration
* Update Title of Favorite Node Screens
* Update node metric alignment on LoRa screen
* Update the border for popups to separate it from background
* Update PaxcounterModule.cpp with CommonHeader
* Update WiFi screen with CommonHeader and related data reflow
* It was not, in fact, pointing up
* Fix build on wismeshtap
* T-deck trackball debounce
* Fix uptime on Device Focused page to actually detail
* Update Sys screen for new uptime, add label to Freq/Chan on LoRa
* Don't display DOP any longer, make Uptime consistent
* Revert Uptime change on Favorites, Apply to Device Focused
* Label the satelite number to avoid confusion
* Boop boop boop boop
* Correct GPS positioning and string consistency across strings for GPS
* Fix GPS text alignment
* Enable canned messages by default
* Don't wake screen on new nodes
* Cannedmessage list emote support added
* Fn+e emote picker for freetext screen
* Actually block CannedInput actions while display is shown
* Add selection menu to bannerOverlay
* Off by one
* Move to unified text layouts and spacing
* Still my Fav without an "e"
* Fully remove EVENT_NODEDB_UPDATED
* Simply LoRa screen
* Make some char pointers const to fix compilation on native targets
* Update drawCompassNorth to include radius
* Fix warning
* button thread cleanup
* Pull OneButton handling from PowerFSM and add MUI switch (#6973)
* Trunk
* Onebutton Menu Support
* Add temporary clock icon
* Add gps location to fsi
* Banner message state reset
* Cast to char to satisfy compiler
* Better fast handling of input during banner
* Fix warning
* Derp
* oops
* Update ref
* Wire buzzer_mode
* remove legacy string->print()
* Only init screen if one found
* Unsigned Char
* More buttonThread cleaning
* screen.cpp button handling cleanup
* The Great Event Rename of 2025
* Fix the Radiomaster
* Missed trackball type change
* Remove unused function
* Make ButtonThread an InputBroker
* Coffee hadn't kicked in yet
* Add clock icon for Navigation Bar
* Restore clock screen definition code - whoops
* ExternalNotifications now observe inputBroker
* Clock rework (#6992)
* Move Clock bits into ClockRenderer space
* Rework clock into all device navigation
* T-Watch Actually Builds Different
* Compile fix
---------
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
* Add AM/PM to Digital Clock
* Flip Seconds and AM/PM on Clock Display
* Tik-tok pixels are hard
* Fix builds on Thinknode M1
* Check for GPS and don't crash
* Don't endif til the end
* Rework the OneButton thread to be much less of a mess. (#6997)
* Rework the OneButton thread to be much less of a mess. And break lots of targets temporarily
* Update src/input/ButtonThread.h
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* fix GPS toggle
* Send the shutdown event, not just the kbchar
* Honor the back button in a notificaiton popup
* Draw the right size box for popup with options
* Try to un-break all the things
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* 24-hour Clock Should have leading zero, but not 12-hour
* Fixup some compile errors
* Add intRoutine to ButtonThread init, to get more responsive user button back
* Add Timezone picker
* Fix Warning
* Optionally set the initial selection for the chooser popup
* Make back buttons work in canned messages
* Drop the wrapper classes
* LonPressTime now configurable
* Clock Frame can not longer be blank; just add valid time
* Back buttons everywhere!
* Key Verification confirm banner
* Make Elecrow M* top button a back button
* Add settings saves
* EInk responsiveness fixes
* Linux Input Fixes
* Add Native Trackball/Joystick support, and move UserButton to Input
* No Flight Stick Mode
* Send input event
* Add Channel Utilization to Device Focused frame
* Don't shift screens when we draw new ones
* Add showOverlayBanner arguments to no-op
* trunk
* Default Native trackball to NC
* Fix crash in simulator mode
* Add longLong button press
* Get the args right
* Adjust Bluetooth Pairing Screen to account for bottom navigation.
* Trackball everywhere, and unPhone buttons
* Remap visionmaster secondary button to TB_UP
* Kill ScanAndSelect
* trunk
* No longer need the canned messages input filter
* All Canned All the time
* Fix stm32 compile error regarding inputBroker
* Unify tft lineheights (#7033)
* Create variable line heights based upon SCREEN_HEIGHT
* Refactor textPositions into method -> getTextPositions
* Update SharedUIDisplay.h
---------
Co-authored-by: Jason P <applewiz@mac.com>
* Adjust top distance for larger displays
* Adjust icon sizes for larger displays
* Fix Paxcounter compile errors after code updates
* Pixel wrangling to make larger screens fit better
* Alert frame has precedence over banner -- for now
* Unify on ALT_BUTTON
* Align AM/PM to the digit, not the segment on larger displays
* Move some global pin defines into configuration.h
* Scaffolding for BMM150 9-axis gyro
* Alt button behavior
* Don't add the blank GPS frames without HAS_GPS
* EVENT_NODEDB_UPDATED has been retired
* Clean out LOG_WARN messages from debugging
* Add dismiss message function
* Minor buttonThread cleanup
* Add BMM150 support
* Clean up last warning from dev
* Simplify bmm150 init return logic
* Add option to reply to messages
* Add minimal menu upon selecting home screen
* Move Messages to slot 2, rename GPS to Position, move variables nearer functional usage in Screen.cpp
* Properly dismiss message
* T-Deck Trackball press is not user button
* Add select on favorite frame to launch cannedMessage DM
* Minor wording change
* Less capital letters
* Fix empty message check, time isn't reliable
* drop dead code
* Make UIRenderer a static class instead of namespace
* Fix the select on favorite
* Check if message is empty early and then 'return'
* Add kb_found, and show the option to launch freetype if appropriate
* Ignore impossible touchscreen touches
* Auto scroll fix
* Move linebreak after "from" for banners to maximize screen usage.
* Center "No messages to show" on Message frame
* Start consolidating buzzer behavior
* Fixed signed / unsigned warning
* Cast second parameter of max() to make some targets happy
* Cast kbchar to (char) to make arduino string happy
* Shorten the notice of "No messages"
* Add buzzer mode chooser
* Add regionPicker to Lora icon
* Reduce line spacing and reorder Position screen to resolve overlapping issues
* Update message titles, fix GPS icons, add Back options
* Leftover boops
* Remove chirp
* Make the region selection dismissable when a region is already set
* Add read-aloud functionality on messages w/ esp8266sam
* "Last Heard" is a better label
* tweak the beep
* 5 options
* properly tear down freetext upon cancel
* de-convelute canned messages just a bit
* Correct height of Mail icon in navigation bar
* Remove unused warning
* Consolidate time methods into TimeFormatters
* Oops
* Change LoRa Picker Cancel to Back
* Tweak selection characters on Banner
* Message render not scrolling on 5th line
* More fixes for message scrolling
* Remove the safety next on text overflow - we found that root cause
* Add pin definitions to fix compilation for obscure target
* Don't let the touchscreen send unitialized kbchar values
* Make virtual KB just a bit quicker
* No more double tap, swipe!
* Left is left, and Right is right
* Update horizontal lightning bolt design
* Move from solid to dashed separator for Message Frame
* Single emote feature fix
* Manually sort overlapping elements for now
* Freetext and clearer choices
* Fix ESP32 InkHUD builds on the unify-tft branch (#7087)
* Remove BaseUI branding
* Capitalization is fun
* Revert Meshtastic Boot Frame Changes
* Add ANZ_433 LoRa region to picker
* Update settings.json
---------
Co-authored-by: HarukiToreda <116696711+HarukiToreda@users.noreply.github.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Jason P <applewiz@mac.com>
Co-authored-by: todd-herbert <herbert.todd@gmail.com>
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-06-21 06:36:04 -05:00
|
|
|
#include "TimeFormatters.h"
|
|
|
|
|
#include "configuration.h"
|
|
|
|
|
#include "gps/RTC.h"
|
|
|
|
|
#include "mesh/NodeDB.h"
|
|
|
|
|
#include <cstring>
|
|
|
|
|
|
|
|
|
|
bool deltaToTimestamp(uint32_t secondsAgo, uint8_t *hours, uint8_t *minutes, int32_t *daysAgo)
|
|
|
|
|
{
|
|
|
|
|
// Cache the result - avoid frequent recalculation
|
|
|
|
|
static uint8_t hoursCached = 0, minutesCached = 0;
|
|
|
|
|
static uint32_t daysAgoCached = 0;
|
|
|
|
|
static uint32_t secondsAgoCached = 0;
|
|
|
|
|
static bool validCached = false;
|
|
|
|
|
|
|
|
|
|
// Abort: if timezone not set
|
|
|
|
|
if (strlen(config.device.tzdef) == 0) {
|
|
|
|
|
validCached = false;
|
|
|
|
|
return validCached;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Abort: if invalid pointers passed
|
|
|
|
|
if (hours == nullptr || minutes == nullptr || daysAgo == nullptr) {
|
|
|
|
|
validCached = false;
|
|
|
|
|
return validCached;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Abort: if time seems invalid.. (> 6 months ago, probably seen before RTC set)
|
|
|
|
|
if (secondsAgo > SEC_PER_DAY * 30UL * 6) {
|
|
|
|
|
validCached = false;
|
|
|
|
|
return validCached;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// If repeated request, don't bother recalculating
|
|
|
|
|
if (secondsAgo - secondsAgoCached < 60 && secondsAgoCached != 0) {
|
|
|
|
|
if (validCached) {
|
|
|
|
|
*hours = hoursCached;
|
|
|
|
|
*minutes = minutesCached;
|
|
|
|
|
*daysAgo = daysAgoCached;
|
|
|
|
|
}
|
|
|
|
|
return validCached;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Get local time
|
|
|
|
|
uint32_t secondsRTC = getValidTime(RTCQuality::RTCQualityDevice, true); // Get local time
|
|
|
|
|
|
|
|
|
|
// Abort: if RTC not set
|
|
|
|
|
if (!secondsRTC) {
|
|
|
|
|
validCached = false;
|
|
|
|
|
return validCached;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Get absolute time when last seen
|
|
|
|
|
uint32_t secondsSeenAt = secondsRTC - secondsAgo;
|
|
|
|
|
|
|
|
|
|
// Calculate daysAgo
|
|
|
|
|
*daysAgo = (secondsRTC / SEC_PER_DAY) - (secondsSeenAt / SEC_PER_DAY); // How many "midnights" have passed
|
|
|
|
|
|
|
|
|
|
// Get seconds since midnight
|
|
|
|
|
uint32_t hms = (secondsRTC - secondsAgo) % SEC_PER_DAY;
|
|
|
|
|
hms = (hms + SEC_PER_DAY) % SEC_PER_DAY;
|
|
|
|
|
|
|
|
|
|
// Tear apart hms into hours and minutes
|
|
|
|
|
*hours = hms / SEC_PER_HOUR;
|
|
|
|
|
*minutes = (hms % SEC_PER_HOUR) / SEC_PER_MIN;
|
|
|
|
|
|
|
|
|
|
// Cache the result
|
|
|
|
|
daysAgoCached = *daysAgo;
|
|
|
|
|
hoursCached = *hours;
|
|
|
|
|
minutesCached = *minutes;
|
|
|
|
|
secondsAgoCached = secondsAgo;
|
|
|
|
|
|
|
|
|
|
validCached = true;
|
|
|
|
|
return validCached;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void getTimeAgoStr(uint32_t agoSecs, char *timeStr, uint8_t maxLength)
|
|
|
|
|
{
|
|
|
|
|
// Use an absolute timestamp in some cases.
|
|
|
|
|
// Particularly useful with E-Ink displays. Static UI, fewer refreshes.
|
|
|
|
|
uint8_t timestampHours, timestampMinutes;
|
|
|
|
|
int32_t daysAgo;
|
|
|
|
|
bool useTimestamp = deltaToTimestamp(agoSecs, ×tampHours, ×tampMinutes, &daysAgo);
|
|
|
|
|
|
|
|
|
|
if (agoSecs < 120) // last 2 mins?
|
|
|
|
|
snprintf(timeStr, maxLength, "%u seconds ago", agoSecs);
|
|
|
|
|
// -- if suitable for timestamp --
|
|
|
|
|
else if (useTimestamp && agoSecs < 15 * SECONDS_IN_MINUTE) // Last 15 minutes
|
|
|
|
|
snprintf(timeStr, maxLength, "%u minutes ago", agoSecs / SECONDS_IN_MINUTE);
|
|
|
|
|
else if (useTimestamp && daysAgo == 0) // Today
|
|
|
|
|
snprintf(timeStr, maxLength, "Last seen: %02u:%02u", (unsigned int)timestampHours, (unsigned int)timestampMinutes);
|
|
|
|
|
else if (useTimestamp && daysAgo == 1) // Yesterday
|
|
|
|
|
snprintf(timeStr, maxLength, "Seen yesterday");
|
|
|
|
|
else if (useTimestamp && daysAgo > 1) // Last six months (capped by deltaToTimestamp method)
|
|
|
|
|
snprintf(timeStr, maxLength, "%li days ago", (long)daysAgo);
|
|
|
|
|
// -- if using time delta instead --
|
|
|
|
|
else if (agoSecs < 120 * 60) // last 2 hrs
|
|
|
|
|
snprintf(timeStr, maxLength, "%u minutes ago", agoSecs / 60);
|
|
|
|
|
// Only show hours ago if it's been less than 6 months. Otherwise, we may have bad data.
|
|
|
|
|
else if ((agoSecs / 60 / 60) < (730 * 6))
|
|
|
|
|
snprintf(timeStr, maxLength, "%u hours ago", agoSecs / 60 / 60);
|
|
|
|
|
else
|
|
|
|
|
snprintf(timeStr, maxLength, "unknown age");
|
|
|
|
|
}
|
2025-11-19 13:59:45 -08:00
|
|
|
|
|
|
|
|
void getUptimeStr(uint32_t uptimeMillis, const char *prefix, char *uptimeStr, uint8_t maxLength, bool includeSecs)
|
|
|
|
|
{
|
|
|
|
|
uint32_t days = uptimeMillis / 86400000;
|
|
|
|
|
uint32_t hours = (uptimeMillis % 86400000) / 3600000;
|
|
|
|
|
uint32_t mins = (uptimeMillis % 3600000) / 60000;
|
|
|
|
|
uint32_t secs = (uptimeMillis % 60000) / 1000;
|
|
|
|
|
|
|
|
|
|
if (days) {
|
|
|
|
|
snprintf(uptimeStr, maxLength, "%s: %ud %uh", prefix, days, hours);
|
|
|
|
|
} else if (hours) {
|
|
|
|
|
snprintf(uptimeStr, maxLength, "%s: %uh %um", prefix, hours, mins);
|
|
|
|
|
} else if (!includeSecs) {
|
|
|
|
|
snprintf(uptimeStr, maxLength, "%s: %um", prefix, mins);
|
|
|
|
|
} else if (mins) {
|
|
|
|
|
snprintf(uptimeStr, maxLength, "%s: %um %us", prefix, mins, secs);
|
|
|
|
|
} else {
|
|
|
|
|
snprintf(uptimeStr, maxLength, "%s: %us", prefix, secs);
|
|
|
|
|
}
|
|
|
|
|
}
|