rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-21 18:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some menu options and remove some Unit C6L ifdefines

Browse Source
This commit is contained in:
Jason P
2025-11-10 10:46:00 -06:00
parent 46391ff5e3
commit fb2223ada3
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -515,11 +515,7 @@ void menuHandler::replyMenu()
optionsEnumArray[options++] = Back; optionsEnumArray[options++] = Back;
// Preset reply // Preset reply
#if defined(M5STACK_UNITC6L)
optionsArray[options] = "With Preset"; optionsArray[options] = "With Preset";
#else
optionsArray[options] = "With Preset";
#endif
optionsEnumArray[options++] = ReplyPreset; optionsEnumArray[options++] = ReplyPreset;
// Freetext reply (only when keyboard exists) // Freetext reply (only when keyboard exists)
@@ -544,6 +540,7 @@ void menuHandler::replyMenu()
bannerOptions.optionsArrayPtr = optionsArray; bannerOptions.optionsArrayPtr = optionsArray;
bannerOptions.optionsEnumPtr = optionsEnumArray; bannerOptions.optionsEnumPtr = optionsEnumArray;
bannerOptions.optionsCount = options; bannerOptions.optionsCount = options;
bannerOptions.InitialSelected = 1;
bannerOptions.bannerCallback = [](int selected) -> void { bannerOptions.bannerCallback = [](int selected) -> void {
auto mode = graphics::MessageRenderer::getThreadMode(); auto mode = graphics::MessageRenderer::getThreadMode();
@@ -833,16 +830,6 @@ void menuHandler::homeBaseMenu()
optionsArray[options] = "Send Node Info"; optionsArray[options] = "Send Node Info";
} }
optionsEnumArray[options++] = Position; optionsEnumArray[options++] = Position;
#if defined(M5STACK_UNITC6L)
optionsArray[options] = "New Preset";
#else
optionsArray[options] = "New Preset Msg";
#endif
optionsEnumArray[options++] = Preset;
if (kb_found) {
optionsArray[options] = "New Freetext Msg";
optionsEnumArray[options++] = Freetext;
}
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
#if defined(M5STACK_UNITC6L) #if defined(M5STACK_UNITC6L)