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

Show/Hide Favorites as an option

Browse Source
This commit is contained in:
Jason P 2025-07-20 20:09:10 -05:00
parent a60002a7f9
commit a97e40dc8e
3 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/graphics/Screen.cpp
View File

@ -1003,27 +1003,29 @@ void Screen::setFrames(FrameFocus focus)
if (numMeshNodes > 0) if (numMeshNodes > 0)
numMeshNodes--; numMeshNodes--;
// Temporary array to hold favorite node frames if (!hiddenFrames.show_favorites) {
std::vector<FrameCallback> favoriteFrames; // Temporary array to hold favorite node frames
std::vector<FrameCallback> favoriteFrames;
for (size_t i = 0; i < nodeDB->getNumMeshNodes(); i++) { for (size_t i = 0; i < nodeDB->getNumMeshNodes(); i++) {
const meshtastic_NodeInfoLite *n = nodeDB->getMeshNodeByIndex(i); const meshtastic_NodeInfoLite *n = nodeDB->getMeshNodeByIndex(i);
if (n && n->num != nodeDB->getNodeNum() && n->is_favorite) { if (n && n->num != nodeDB->getNodeNum() && n->is_favorite) {
favoriteFrames.push_back(graphics::UIRenderer::drawNodeInfo); favoriteFrames.push_back(graphics::UIRenderer::drawNodeInfo);
}
} }
}
// Insert favorite frames *after* collecting them all // Insert favorite frames *after* collecting them all
if (!favoriteFrames.empty()) { if (!favoriteFrames.empty()) {
fsi.positions.firstFavorite = numframes; fsi.positions.firstFavorite = numframes;
for (const auto &f : favoriteFrames) { for (const auto &f : favoriteFrames) {
normalFrames[numframes++] = f; normalFrames[numframes++] = f;
indicatorIcons.push_back(icon_node); indicatorIcons.push_back(icon_node);
}
fsi.positions.lastFavorite = numframes - 1;
} else {
fsi.positions.firstFavorite = 255;
fsi.positions.lastFavorite = 255;
} }
fsi.positions.lastFavorite = numframes - 1;
} else {
fsi.positions.firstFavorite = 255;
fsi.positions.lastFavorite = 255;
} }
fsi.frameCount = numframes; // Total framecount is used to apply FOCUS_PRESERVE fsi.frameCount = numframes; // Total framecount is used to apply FOCUS_PRESERVE
@ -1122,6 +1124,9 @@ void Screen::toggleFrameVisibility(const std::string &frameName)
if (frameName == "clock") { if (frameName == "clock") {
hiddenFrames.clock = !hiddenFrames.clock; hiddenFrames.clock = !hiddenFrames.clock;
} }
if (frameName == "show_favorites") {
hiddenFrames.show_favorites = !hiddenFrames.show_favorites;
}
} }
bool Screen::isFrameHidden(const std::string &frameName) const bool Screen::isFrameHidden(const std::string &frameName) const
@ -1148,6 +1153,8 @@ bool Screen::isFrameHidden(const std::string &frameName) const
return hiddenFrames.lora; return hiddenFrames.lora;
if (frameName == "clock") if (frameName == "clock")
return hiddenFrames.clock; return hiddenFrames.clock;
if (frameName == "show_favorites")
return hiddenFrames.show_favorites;
return false; return false;
} }

1
src/graphics/Screen.h
View File

@ -695,6 +695,7 @@ class Screen : public concurrency::OSThread
bool gps = false; bool gps = false;
#endif #endif
bool lora = false; bool lora = false;
bool show_favorites = false;
} hiddenFrames; } hiddenFrames;
/// Try to start drawing ASAP /// Try to start drawing ASAP

8
src/graphics/draw/MenuHandler.cpp
View File

@ -1103,6 +1103,7 @@ void menuHandler::FrameToggles_menu()
gps, gps,
lora, lora,
clock, clock,
show_favorites,
enumEnd enumEnd
}; };
static const char *optionsArray[enumEnd] = {"Finish"}; static const char *optionsArray[enumEnd] = {"Finish"};
@ -1133,6 +1134,9 @@ void menuHandler::FrameToggles_menu()
optionsArray[options] = screen->isFrameHidden("clock") ? "Show Clock" : "Hide Clock"; optionsArray[options] = screen->isFrameHidden("clock") ? "Show Clock" : "Hide Clock";
optionsEnumArray[options++] = clock; optionsEnumArray[options++] = clock;
optionsArray[options] = screen->isFrameHidden("show_favorites") ? "Show Favorites" : "Hide Favorites";
optionsEnumArray[options++] = show_favorites;
#endif #endif
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
@ -1175,6 +1179,10 @@ void menuHandler::FrameToggles_menu()
screen->toggleFrameVisibility("clock"); screen->toggleFrameVisibility("clock");
menuHandler::menuQueue = menuHandler::FrameToggles; menuHandler::menuQueue = menuHandler::FrameToggles;
screen->runNow(); screen->runNow();
} else if (selected == show_favorites) {
screen->toggleFrameVisibility("show_favorites");
menuHandler::menuQueue = menuHandler::FrameToggles;
screen->runNow();
} }
}; };
screen->showOverlayBanner(bannerOptions); screen->showOverlayBanner(bannerOptions);