From ed1e9a3055af8fcc417067b06023e87f72baf64b Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Sat, 25 Jan 2025 20:45:23 -0800 Subject: [PATCH] reorder config menu --- ui/menus.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ui/menus.py b/ui/menus.py index f573180..adafc74 100644 --- a/ui/menus.py +++ b/ui/menus.py @@ -41,16 +41,6 @@ def generate_menu_from_protobuf(interface): # Function to generate the menu structure from protobuf messages menu_structure = {"Main Menu": {}} - # Add Radio Settings - radio = config_pb2.Config() - current_radio_config = interface.localNode.localConfig if interface else None - menu_structure["Main Menu"]["Radio Settings"] = extract_fields(radio, current_radio_config) - - # Add Module Settings - module = module_config_pb2.ModuleConfig() - current_module_config = interface.localNode.moduleConfig if interface else None - menu_structure["Main Menu"]["Module Settings"] = extract_fields(module, current_module_config) - # Add User Settings current_node_info = interface.getMyNodeInfo() if interface else None @@ -82,6 +72,16 @@ def generate_menu_from_protobuf(interface): channel_config = extract_fields(channel, current_channel.settings) menu_structure["Main Menu"]["Channels"][f"Channel {i + 1}"] = channel_config + # Add Radio Settings + radio = config_pb2.Config() + current_radio_config = interface.localNode.localConfig if interface else None + menu_structure["Main Menu"]["Radio Settings"] = extract_fields(radio, current_radio_config) + + # Add Module Settings + module = module_config_pb2.ModuleConfig() + current_module_config = interface.localNode.moduleConfig if interface else None + menu_structure["Main Menu"]["Module Settings"] = extract_fields(module, current_module_config) + # Add additional settings options menu_structure["Main Menu"]["Reboot"] = settings_reboot menu_structure["Main Menu"]["Reset Node DB"] = settings_reset_nodedb