rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-15 14:27:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Dismiss into a Generic Confirmation

Browse Source
This commit is contained in:
Jason P
2025-07-19 07:11:21 -05:00
parent 964afd0335
commit ff8275e0dd
3 changed files with 38 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/graphics/Screen.cpp
View File

@@ -1111,6 +1111,7 @@ void Screen::dismissCurrentFrame()
LOG_INFO("Dismiss Memory");
dismissedFrames.system = true;
dismissed = true;
#if HAS_GPS
} else if (currentFrame == framesetInfo.positions.nodelist_bearings) {
LOG_INFO("Dismiss Bearings");
dismissedFrames.nodelist_bearings = true;
@@ -1119,6 +1120,27 @@ void Screen::dismissCurrentFrame()
LOG_INFO("Dismiss Position");
dismissedFrames.gps = true;
dismissed = true;
#endif
#ifndef USE_EINK
} else if (currentFrame == framesetInfo.positions.nodelist) {
LOG_INFO("Dismiss NodeList");
dismissedFrames.nodelist = true;
dismissed = true;
#endif
#ifdef USE_EINK
} else if (currentFrame == framesetInfo.positions.nodelist_lastheard) {
LOG_INFO("Dismiss NodeList (Last Heard - EInk)");
dismissedFrames.nodelist_lastheard = true;
dismissed = true;
} else if (currentFrame == framesetInfo.positions.nodelist_hopsignal) {
LOG_INFO("Dismiss NodeList (Hop / Signal - EInk)");
dismissedFrames.nodelist_hopsignal = true;
dismissed = true;
} else if (currentFrame == framesetInfo.positions.nodelinodelist_distancest) {
LOG_INFO("Dismiss NodeList (Distance - EInk)");
dismissedFrames.nodelist_distance = true;
dismissed = true;
#endif
}
if (dismissed) {