devpath

Fallback to localhost not meshtastic.local

.vscode/launch.json

@@ -7,7 +7,7 @@
             "request": "launch",
             "cwd": "${workspaceFolder}",
             "module": "contact.__main__",
-            "args": ["-c"]
+            "args": []
         }
     ]
 }

README.md

@@ -9,9 +9,9 @@ This Python curses client for Meshtastic is a terminal-based client designed to
 <img width="846" alt="Contact - Main UI Screenshot" src="https://github.com/user-attachments/assets/d2996bfb-2c6d-46a8-b820-92a9143375f4">
 
 <br><br>
-The settings dialogue can be accessed within the client or may be run standalone to configure your node by launching `settings.py`
+The settings dialogue can be accessed within the client or may be run standalone to configure your node by launching `contact --settings` or `contact -c`
 
-<img width="441" alt="Contact - Settings Dialogue" src="https://github.com/user-attachments/assets/dd47f52a-d4d8-4e40-8001-9ea53d87f816" />
+<img width="573" alt="Contact - Settings Dialogue" src="https://github.com/user-attachments/assets/dbe1287b-5558-407c-84b8-2a1bc913dec8" />
 
 ## Message Persistence 
 
@@ -48,6 +48,7 @@ Optional arguments to specify a device to connect to and how.
 - `--port`, `--serial`, `-s`: The port to connect to via serial, e.g. `/dev/ttyUSB0`.
 - `--host`, `--tcp`, `-t`: The hostname or IP address to connect to using TCP, will default to localhost if no host is passed.
 - `--ble`, `-b`: The BLE device MAC address or name to connect to.
+- `--settings`, `--set`, `--control`, `-c`: Launch directly into the settings.
 
 If no connection arguments are specified, the client will attempt a serial connection and then a TCP connection to localhost.
 

contact/__main__.py

@@ -21,7 +21,7 @@ import threading
 from contact.utilities.db_handler import init_nodedb, load_messages_from_db
 from contact.message_handlers.rx_handler import on_receive
 from contact.settings import set_region
-from contact.ui.curses_ui import main_ui
+from contact.ui.contact_ui import main_ui
 from contact.ui.colors import setup_colors
 from contact.ui.splash import draw_splash
 import contact.ui.default_config as config
@@ -42,7 +42,7 @@ if os.environ.get("COLORTERM") == "gnome-terminal":
 # Run `tail -f client.log` in another terminal to view live
 logging.basicConfig(
     filename=config.log_file_path,
-    level=logging.DEBUG,  # DEBUG, INFO, WARNING, ERROR, CRITICAL)
+    level=logging.INFO,  # DEBUG, INFO, WARNING, ERROR, CRITICAL)
     format="%(asctime)s - %(levelname)s - %(message)s"
 )
 

contact/localisations/en.ini

@@ -78,6 +78,13 @@ dns, "IPv4 DNS server", ""
 rsyslog_server, "RSyslog server", ""
 enabled_protocols, "Enabled protocols", ""
 
+[config.network.ipv4_config]
+title, "IPv4 Config", ""
+ip, "IP", ""
+gateway, "Gateway", ""
+subnet, "Subnet", ""
+dns, "DNS", ""
+
 [config.display]
 title, "Display"
 screen_on_secs, "Screen on duration", "How long the screen remains on in seconds after the user button is pressed or messages are received."
@@ -105,6 +112,35 @@ theme, "Theme", ""
 alert_enabled, "Alert enabled", ""
 banner_enabled, "Banner enabled", ""
 ring_tone_id, "Ring tone ID", ""
+language, "Language", ""
+node_filter, "Node Filter", ""
+node_highlight, "Node Highlight", ""
+calibration_data, "Calibration Data", ""
+map_data, "Map Data", ""
+
+[config.device_ui.node_filter]
+title, "Node Filter"
+unknown_switch, "Unknown Switch", ""
+offline_switch, "Offline Switch", ""
+public_key_switch, "Public Key Switch", ""
+hops_away, "Hops Away", ""
+position_switch, "Position Switch", ""
+node_name, "Node Name", ""
+channel, "Channel", ""
+
+[config.device_ui.node_highlight]
+title, "Node Highlight"
+chat_switch, "Chat Switch", ""
+position_switch, "Position Switch", ""
+telemetry_switch, "Telemetry Switch", ""
+iaq_switch, "IAQ Switch", ""
+node_name, "Node Name", ""
+
+[config.device_ui.map_data]
+title, "Map Data"
+home, "Home", ""
+style, "Style", ""
+follow_gps, "Follow GPS", ""
 
 [config.lora]
 title, "LoRa"

contact/message_handlers/rx_handler.py

@@ -2,7 +2,7 @@ import logging
 import time
 from contact.utilities.utils import refresh_node_list
 from datetime import datetime
-from contact.ui.curses_ui import draw_packetlog_win, draw_node_list, draw_messages_window, draw_channel_list, add_notification
+from contact.ui.contact_ui import draw_packetlog_win, draw_node_list, draw_messages_window, draw_channel_list, add_notification
 from contact.utilities.db_handler import save_message_to_db, maybe_store_nodeinfo_in_db, get_name_from_database, update_node_info_in_db
 import contact.ui.default_config as config
 import contact.globals as globals

contact/message_handlers/tx_handler.py

@@ -12,7 +12,7 @@ ack_naks = {}
 # Note "onAckNak" has special meaning to the API, thus the nonstandard naming convention
 # See https://github.com/meshtastic/python/blob/master/meshtastic/mesh_interface.py#L462
 def onAckNak(packet):
-    from contact.ui.curses_ui import draw_messages_window
+    from contact.ui.contact_ui import draw_messages_window
     request = packet['decoded']['requestId']
     if(request not in ack_naks):
         return
@@ -43,7 +43,7 @@ def onAckNak(packet):
 
 def on_response_traceroute(packet):
     """on response for trace route"""
-    from contact.ui.curses_ui import draw_channel_list, draw_messages_window, add_notification
+    from contact.ui.contact_ui import draw_channel_list, draw_messages_window, add_notification
 
     refresh_channels = False
     refresh_messages = False

contact/ui/contact_ui.py

@@ -1,5 +1,6 @@
 import curses
 import textwrap
+import time
 import logging
 import traceback
 from contact.utilities.utils import get_channels, get_readable_duration, get_time_ago, refresh_node_list
@@ -294,6 +295,28 @@ def main_ui(stdscr):
                     draw_channel_list()
                     draw_messages_window()
 
+            if(globals.current_window == 2):
+                curses.curs_set(0)
+                confirmation = get_list_input(f"Remove {get_name_from_database(globals.node_list[globals.selected_node])} from nodedb?", "No", ["Yes", "No"])
+                if confirmation == "Yes":
+                    globals.interface.localNode.removeNode(globals.node_list[globals.selected_node])
+
+                    # Directly modifying the interface from client code - good? Bad? If it's stupid but it works, it's not supid?
+                    del(globals.interface.nodesByNum[globals.node_list[globals.selected_node]])
+
+                    # Convert to "!hex" representation that interface.nodes uses
+                    hexid = f"!{hex(globals.node_list[globals.selected_node])[2:]}"
+                    del(globals.interface.nodes[hexid])
+
+                    globals.node_list.pop(globals.selected_node)
+
+                    draw_messages_window()
+                    draw_node_list()
+                else:
+                    draw_messages_window()
+                curses.curs_set(1)
+                continue
+
         # ^/
         elif char == chr(31):
             if(globals.current_window == 2 or globals.current_window == 0):
@@ -307,8 +330,8 @@ def main_ui(stdscr):
                 curses.curs_set(0)
 
                 if 'isFavorite' not in selectedNode or selectedNode['isFavorite'] == False:
-                    confirmation = get_list_input(f"Set {get_name_from_database(globals.node_list[globals.selected_node])} as Favorite?", "no", ["yes", "no"])
+                    confirmation = get_list_input(f"Set {get_name_from_database(globals.node_list[globals.selected_node])} as Favorite?", None, ["Yes", "No"])
-                    if confirmation == "yes":
+                    if confirmation == "Yes":
                         globals.interface.localNode.setFavorite(globals.node_list[globals.selected_node])
                         # Maybe we shouldn't be modifying the nodedb, but maybe it should update itself
                         globals.interface.nodesByNum[globals.node_list[globals.selected_node]]['isFavorite'] = True
@@ -316,8 +339,8 @@ def main_ui(stdscr):
                         refresh_node_list()
 
                 else:
-                    confirmation = get_list_input(f"Remove {get_name_from_database(globals.node_list[globals.selected_node])} from Favorites?", "no", ["yes", "no"])
+                    confirmation = get_list_input(f"Remove {get_name_from_database(globals.node_list[globals.selected_node])} from Favorites?", None, ["Yes", "No"])
-                    if confirmation == "yes":
+                    if confirmation == "Yes":
                         globals.interface.localNode.removeFavorite(globals.node_list[globals.selected_node])
                         # Maybe we shouldn't be modifying the nodedb, but maybe it should update itself
                         globals.interface.nodesByNum[globals.node_list[globals.selected_node]]['isFavorite'] = False
@@ -333,13 +356,13 @@ def main_ui(stdscr):
                 curses.curs_set(0)
 
                 if 'isIgnored' not in selectedNode or selectedNode['isIgnored'] == False:
-                    confirmation = get_list_input(f"Set {get_name_from_database(globals.node_list[globals.selected_node])} as Ignored?", "no", ["yes", "no"])
+                    confirmation = get_list_input(f"Set {get_name_from_database(globals.node_list[globals.selected_node])} as Ignored?", "No", ["Yes", "No"])
-                    if confirmation == "yes":
+                    if confirmation == "Yes":
                         globals.interface.localNode.setIgnored(globals.node_list[globals.selected_node])
                         globals.interface.nodesByNum[globals.node_list[globals.selected_node]]['isIgnored'] = True
                 else:
-                    confirmation = get_list_input(f"Remove {get_name_from_database(globals.node_list[globals.selected_node])} from Ignored?", "no", ["yes", "no"])
+                    confirmation = get_list_input(f"Remove {get_name_from_database(globals.node_list[globals.selected_node])} from Ignored?", "No", ["Yes", "No"])
-                    if confirmation == "yes":
+                    if confirmation == "Yes":
                         globals.interface.localNode.removeIgnored(globals.node_list[globals.selected_node])
                         globals.interface.nodesByNum[globals.node_list[globals.selected_node]]['isIgnored'] = False
 

contact/ui/control_ui.py

@@ -13,8 +13,10 @@ from contact.ui.colors import get_color
 from contact.ui.dialog import dialog
 from contact.utilities.control_utils import parse_ini_file, transform_menu_path
 from contact.ui.user_config import json_editor
+from contact.ui.ui_state import MenuState
+
+state = MenuState()
 
-import contact.localisations
 
 # Constants
 width = 80
@@ -37,13 +39,10 @@ config_folder = os.path.join(locals_dir, "node-configs")
 field_mapping, help_text = parse_ini_file(translation_file)
 
 
-def display_menu(current_menu, menu_path, selected_index, show_save_option, help_text):
+def display_menu(state):
+
     min_help_window_height = 6
-    num_items = len(current_menu) + (1 if show_save_option else 0)
+    num_items = len(state.current_menu) + (1 if state.show_save_option else 0)
-        # Track visible range
-    global start_index
-    if 'start_index' not in globals():
-        start_index = [0]  # Initialize if not set
 
     # Determine the available height for the menu
     max_menu_height = curses.LINES 
@@ -63,18 +62,18 @@ def display_menu(current_menu, menu_path, selected_index, show_save_option, help
     menu_win.border()
     menu_win.keypad(True)
 
-    menu_pad = curses.newpad(len(current_menu) + 1, width - 8)
+    menu_pad = curses.newpad(len(state.current_menu) + 1, width - 8)
     menu_pad.bkgd(get_color("background"))
 
-    header = " > ".join(word.title() for word in menu_path)
+    header = " > ".join(word.title() for word in state.menu_path)
     if len(header) > width - 4:
         header = header[:width - 7] + "..."
     menu_win.addstr(1, 2, header, get_color("settings_breadcrumbs", bold=True))
 
-    transformed_path = transform_menu_path(menu_path)
+    transformed_path = transform_menu_path(state.menu_path)
 
-    for idx, option in enumerate(current_menu):
+    for idx, option in enumerate(state.current_menu):
-        field_info = current_menu[option]
+        field_info = state.current_menu[option]
         current_value = field_info[1] if isinstance(field_info, tuple) else ""
         full_key = '.'.join(transformed_path + [option])
         display_name = field_mapping.get(full_key, option)
@@ -83,41 +82,41 @@ def display_menu(current_menu, menu_path, selected_index, show_save_option, help
         display_value = f"{current_value}"[:width // 2 - 4]
 
         try:
-            color = get_color("settings_sensitive" if option in sensitive_settings else "settings_default", reverse=(idx == selected_index))
+            color = get_color("settings_sensitive" if option in sensitive_settings else "settings_default", reverse=(idx == state.selected_index))
             menu_pad.addstr(idx, 0, f"{display_option:<{width // 2 - 2}} {display_value}".ljust(width - 8), color)
         except curses.error:
             pass
 
-    if show_save_option:
+    if state.show_save_option:
         save_position = menu_height - 2
-        menu_win.addstr(save_position, (width - len(save_option)) // 2, save_option, get_color("settings_save", reverse=(selected_index == len(current_menu))))
+        menu_win.addstr(save_position, (width - len(save_option)) // 2, save_option, get_color("settings_save", reverse=(state.selected_index == len(state.current_menu))))
 
     # Draw help window with dynamically updated max_help_lines
-    draw_help_window(start_y, start_x, menu_height, max_help_lines, current_menu, selected_index, transformed_path)
+    draw_help_window(start_y, start_x, menu_height, max_help_lines, transformed_path, state)
 
     menu_win.refresh()
     menu_pad.refresh(
-        start_index[-1], 0,
+        state.start_index[-1], 0,
         menu_win.getbegyx()[0] + 3, menu_win.getbegyx()[1] + 4,
-        menu_win.getbegyx()[0] + 3 + menu_win.getmaxyx()[0] - 5 - (2 if show_save_option else 0),
+        menu_win.getbegyx()[0] + 3 + menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0),
-        menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 8
+        menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4
     )
 
-    max_index = num_items + (1 if show_save_option else 0) - 1
+    max_index = num_items + (1 if state.show_save_option else 0) - 1
-    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if show_save_option else 0)
+    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0)
 
-    draw_arrows(menu_win, visible_height, max_index, start_index, show_save_option)
+    draw_arrows(menu_win, visible_height, max_index, state)
 
     return menu_win, menu_pad
 
 
-def draw_help_window(menu_start_y, menu_start_x, menu_height, max_help_lines, current_menu, selected_index, transformed_path):
+def draw_help_window(menu_start_y, menu_start_x, menu_height, max_help_lines, transformed_path, state):
     global help_win
 
     if 'help_win' not in globals():
         help_win = None  # Initialize if it does not exist
 
-    selected_option = list(current_menu.keys())[selected_index] if current_menu else None
+    selected_option = list(state.current_menu.keys())[state.selected_index] if state.current_menu else None
     help_y = menu_start_y + menu_height
 
     help_win = update_help_window(help_win, help_text, transformed_path, selected_option, max_help_lines, width, help_y, menu_start_x)
@@ -252,66 +251,66 @@ def get_wrapped_help_text(help_text, transformed_path, selected_option, width, m
     return wrapped_help
 
 
-def move_highlight(old_idx, new_idx, options, show_save_option, menu_win, menu_pad, help_win, help_text, menu_path, max_help_lines):
+def move_highlight(old_idx, options, menu_win, menu_pad, help_win, help_text, max_help_lines, state):
-    if old_idx == new_idx:  # No-op
+    if old_idx == state.selected_index:  # No-op
         return
 
-    max_index = len(options) + (1 if show_save_option else 0) - 1
+    max_index = len(options) + (1 if state.show_save_option else 0) - 1
-    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if show_save_option else 0)
+    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0)
 
-    # Adjust start_index only when moving out of visible range
+    # Adjust state.start_index only when moving out of visible range
-    if new_idx == max_index and show_save_option:
+    if state.selected_index == max_index and state.show_save_option:
         pass
-    elif new_idx < start_index[-1]:  # Moving above the visible area
+    elif state.selected_index < state.start_index[-1]:  # Moving above the visible area
-        start_index[-1] = new_idx
+        state.start_index[-1] = state.selected_index
-    elif new_idx >= start_index[-1] + visible_height:  # Moving below the visible area
+    elif state.selected_index >= state.start_index[-1] + visible_height:  # Moving below the visible area
-        start_index[-1] = new_idx - visible_height
+        state.start_index[-1] = state.selected_index - visible_height
     pass
 
-    # Ensure start_index is within bounds
+    # Ensure state.start_index is within bounds
-    start_index[-1] = max(0, min(start_index[-1], max_index - visible_height + 1))
+    state.start_index[-1] = max(0, min(state.start_index[-1], max_index - visible_height + 1))
 
     # Clear old selection
-    if show_save_option and old_idx == max_index:
+    if state.show_save_option and old_idx == max_index:
         menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option)) // 2, len(save_option), get_color("settings_save"))
     else:
         menu_pad.chgat(old_idx, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive") if options[old_idx] in sensitive_settings else get_color("settings_default"))
 
     # Highlight new selection
-    if show_save_option and new_idx == max_index:
+    if state.show_save_option and state.selected_index == max_index:
         menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option)) // 2, len(save_option), get_color("settings_save", reverse=True))
     else:
-        menu_pad.chgat(new_idx, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive", reverse=True) if options[new_idx] in sensitive_settings else get_color("settings_default", reverse=True))
+        menu_pad.chgat(state.selected_index, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive", reverse=True) if options[state.selected_index] in sensitive_settings else get_color("settings_default", reverse=True))
 
     menu_win.refresh()
     
     # Refresh pad only if scrolling is needed
-    menu_pad.refresh(start_index[-1], 0,
+    menu_pad.refresh(state.start_index[-1], 0,
                      menu_win.getbegyx()[0] + 3, menu_win.getbegyx()[1] + 4,
                      menu_win.getbegyx()[0] + 3 + visible_height, 
                      menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4)
 
     # Update help window
-    transformed_path = transform_menu_path(menu_path)
+    transformed_path = transform_menu_path(state.menu_path)
-    selected_option = options[new_idx] if new_idx < len(options) else None
+    selected_option = options[state.selected_index] if state.selected_index < len(options) else None
     help_y = menu_win.getbegyx()[0] + menu_win.getmaxyx()[0]
     help_win = update_help_window(help_win, help_text, transformed_path, selected_option, max_help_lines, width, help_y, menu_win.getbegyx()[1])
 
-    draw_arrows(menu_win, visible_height, max_index, start_index, show_save_option)
+    draw_arrows(menu_win, visible_height, max_index, state)
 
 
-def draw_arrows(win, visible_height, max_index, start_index, show_save_option):
+def draw_arrows(win, visible_height, max_index, state):
 
     # vh = visible_height + (1 if show_save_option else 0)
-    mi = max_index - (2 if show_save_option else 0) 
+    mi = max_index - (2 if state.show_save_option else 0) 
 
     if visible_height < mi:
-        if start_index[-1] > 0:
+        if state.start_index[-1] > 0:
             win.addstr(3, 2, "▲", get_color("settings_default"))
         else:
             win.addstr(3, 2, " ", get_color("settings_default"))
 
-        if mi - start_index[-1] >= visible_height + (0 if show_save_option else 1) :
+        if mi - state.start_index[-1] >= visible_height + (0 if state.show_save_option else 1) :
             win.addstr(visible_height + 3, 2, "▼", get_color("settings_default"))
         else:
             win.addstr(visible_height + 3, 2, " ", get_color("settings_default"))
@@ -321,47 +320,47 @@ def settings_menu(stdscr, interface):
     curses.update_lines_cols()
 
     menu = generate_menu_from_protobuf(interface)
-    current_menu = menu["Main Menu"]
+    state.current_menu = menu["Main Menu"]
-    menu_path = ["Main Menu"]
+    state.menu_path = ["Main Menu"]
-    menu_index = []
+
-    selected_index = 0
+
     modified_settings = {}
     
     need_redraw = True
-    show_save_option = False
+    state.show_save_option = False
 
     while True:
         if(need_redraw):
-            options = list(current_menu.keys())
+            options = list(state.current_menu.keys())
 
-            show_save_option = (
+            state.show_save_option = (
-                len(menu_path) > 2 and ("Radio Settings" in menu_path or "Module Settings" in menu_path)
+                len(state.menu_path) > 2 and ("Radio Settings" in state.menu_path or "Module Settings" in state.menu_path)
             ) or (
-                len(menu_path) == 2 and "User Settings" in menu_path 
+                len(state.menu_path) == 2 and "User Settings" in state.menu_path 
             ) or (
-                len(menu_path) == 3 and "Channels" in menu_path
+                len(state.menu_path) == 3 and "Channels" in state.menu_path
             )
 
             # Display the menu
-            menu_win, menu_pad = display_menu(current_menu, menu_path, selected_index, show_save_option, help_text)
+            menu_win, menu_pad = display_menu(state)
 
             need_redraw = False
 
         # Capture user input
         key = menu_win.getch()
 
-        max_index = len(options) + (1 if show_save_option else 0) - 1
+        max_index = len(options) + (1 if state.show_save_option else 0) - 1
         # max_help_lines = 4
 
         if key == curses.KEY_UP:
-            old_selected_index = selected_index
+            old_selected_index = state.selected_index
-            selected_index = max_index if selected_index == 0 else selected_index - 1
+            state.selected_index = max_index if state.selected_index == 0 else state.selected_index - 1
-            move_highlight(old_selected_index, selected_index, options, show_save_option, menu_win, menu_pad, help_win, help_text, menu_path,max_help_lines)
+            move_highlight(old_selected_index, options, menu_win, menu_pad, help_win, help_text, max_help_lines, state)
             
         elif key == curses.KEY_DOWN:
-            old_selected_index = selected_index
+            old_selected_index = state.selected_index
-            selected_index = 0 if selected_index == max_index else selected_index + 1
+            state.selected_index = 0 if state.selected_index == max_index else state.selected_index + 1
-            move_highlight(old_selected_index, selected_index, options, show_save_option, menu_win, menu_pad, help_win, help_text, menu_path, max_help_lines)
+            move_highlight(old_selected_index, options, menu_win, menu_pad, help_win, help_text, max_help_lines, state)
 
         elif key == curses.KEY_RESIZE:
             need_redraw = True
@@ -373,36 +372,36 @@ def settings_menu(stdscr, interface):
             menu_win.refresh()
             help_win.refresh()
 
-        elif key == ord("\t") and show_save_option:
+        elif key == ord("\t") and state.show_save_option:
-            old_selected_index = selected_index
+            old_selected_index = state.selected_index
-            selected_index = max_index
+            state.selected_index = max_index
-            move_highlight(old_selected_index, selected_index, options, show_save_option, menu_win, menu_pad, help_win, help_text, menu_path, max_help_lines)
+            move_highlight(old_selected_index, options, menu_win, menu_pad, help_win, help_text, max_help_lines, state)
 
         elif key == curses.KEY_RIGHT or key == ord('\n'):
             need_redraw = True
-            start_index.append(0)
+            state.start_index.append(0)
             menu_win.erase()
             help_win.erase()
 
-            # draw_help_window(menu_win.getbegyx()[0], menu_win.getbegyx()[1], menu_win.getmaxyx()[0], max_help_lines, current_menu, selected_index, transform_menu_path(menu_path))
+            # draw_help_window(menu_win.getbegyx()[0], menu_win.getbegyx()[1], menu_win.getmaxyx()[0], max_help_lines, state.current_menu, selected_index, transform_menu_path(state.menu_path))
 
             menu_win.refresh()
             help_win.refresh()
 
-            if show_save_option and selected_index == len(options):
+            if state.show_save_option and state.selected_index == len(options):
-                save_changes(interface, menu_path, modified_settings)
+                save_changes(interface, modified_settings, state)
                 modified_settings.clear()
                 logging.info("Changes Saved")
 
-                if len(menu_path) > 1:
+                if len(state.menu_path) > 1:
-                    menu_path.pop()
+                    state.menu_path.pop()
-                    current_menu = menu["Main Menu"]
+                    state.current_menu = menu["Main Menu"]
-                    for step in menu_path[1:]:
+                    for step in state.menu_path[1:]:
-                        current_menu = current_menu.get(step, {})
+                        state.current_menu = state.current_menu.get(step, {})
-                    selected_index = 0
+                    state.selected_index = 0
                 continue
 
-            selected_option = options[selected_index]
+            selected_option = options[state.selected_index]
 
             if selected_option == "Exit":
                 break
@@ -411,7 +410,7 @@ def settings_menu(stdscr, interface):
                 filename = get_text_input("Enter a filename for the config file")
                 if not filename:
                     logging.info("Export aborted: No filename provided.")
-                    start_index.pop()
+                    state.start_index.pop()
                     continue  # Go back to the menu
                 if not filename.lower().endswith(".yaml"):
                     filename += ".yaml"
@@ -424,14 +423,14 @@ def settings_menu(stdscr, interface):
                         overwrite = get_list_input(f"{filename} already exists. Overwrite?", None, ["Yes", "No"])
                         if overwrite == "No":
                             logging.info("Export cancelled: User chose not to overwrite.")
-                            start_index.pop()
+                            state.start_index.pop()
                             continue  # Return to menu
                     os.makedirs(os.path.dirname(yaml_file_path), exist_ok=True)
                     with open(yaml_file_path, "w", encoding="utf-8") as file:
                         file.write(config_text)
                     logging.info(f"Config file saved to {yaml_file_path}")
                     dialog(stdscr, "Config File Saved:", yaml_file_path)
-                    start_index.pop()
+                    state.start_index.pop()
                     continue
                 except PermissionError:
                     logging.error(f"Permission denied: Unable to write to {yaml_file_path}")
@@ -439,7 +438,7 @@ def settings_menu(stdscr, interface):
                     logging.error(f"OS error while saving config: {e}")
                 except Exception as e:
                     logging.error(f"Unexpected error: {e}")
-                start_index.pop()
+                state.start_index.pop()
                 continue
                 
             elif selected_option == "Load Config File":
@@ -462,7 +461,7 @@ def settings_menu(stdscr, interface):
                     overwrite = get_list_input(f"Are you sure you want to load {filename}?", None, ["Yes", "No"])
                     if overwrite == "Yes":
                         config_import(interface, file_path)
-                start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "Config URL":
@@ -474,7 +473,7 @@ def settings_menu(stdscr, interface):
                     if overwrite == "Yes":
                         interface.localNode.setURL(new_value)
                         logging.info(f"New Config URL sent to node")
-                start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "Reboot":
@@ -482,7 +481,7 @@ def settings_menu(stdscr, interface):
                 if confirmation == "Yes":
                     interface.localNode.reboot()
                     logging.info(f"Node Reboot Requested by menu")
-                start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "Reset Node DB":
@@ -490,7 +489,7 @@ def settings_menu(stdscr, interface):
                 if confirmation == "Yes":
                     interface.localNode.resetNodeDb()
                     logging.info(f"Node DB Reset Requested by menu")
-                start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "Shutdown":
@@ -498,7 +497,7 @@ def settings_menu(stdscr, interface):
                 if confirmation == "Yes":
                     interface.localNode.shutdown()
                     logging.info(f"Node Shutdown Requested by menu")
-                start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "Factory Reset":
@@ -506,22 +505,28 @@ def settings_menu(stdscr, interface):
                 if confirmation == "Yes":
                     interface.localNode.factoryReset()
                     logging.info(f"Factory Reset Requested by menu")
-                start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "App Settings":
                 menu_win.clear()
                 menu_win.refresh()
-                json_editor(stdscr)  # Open the App Settings menu
+                state.menu_path.append("App Settings")
+                state.menu_index.append(state.selected_index)
+                json_editor(stdscr, state)  # Open the App Settings menu
+                state.current_menu = menu["Main Menu"]
+                state.menu_path = ["Main Menu"]
+                state.start_index.pop()
+                state.selected_index = 4
                 continue
                 # need_redraw = True
                 
-            field_info = current_menu.get(selected_option)
+            field_info = state.current_menu.get(selected_option)
             if isinstance(field_info, tuple):
                 field, current_value = field_info
 
                 # Transform the menu path to get the full key
-                transformed_path = transform_menu_path(menu_path)
+                transformed_path = transform_menu_path(state.menu_path)
                 full_key = '.'.join(transformed_path + [selected_option])
 
                 # Fetch human-readable name from field_mapping
@@ -531,70 +536,73 @@ def settings_menu(stdscr, interface):
                     if selected_option in ['longName', 'shortName']:
                         new_value = get_text_input(f"{human_readable_name} is currently: {current_value}")
                         new_value = current_value if new_value is None else new_value
-                        current_menu[selected_option] = (field, new_value)
+                        state.current_menu[selected_option] = (field, new_value)
 
                     elif selected_option == 'isLicensed':
                         new_value = get_list_input(f"{human_readable_name} is currently: {current_value}", str(current_value),  ["True", "False"])
                         new_value = new_value == "True"
-                        current_menu[selected_option] = (field, new_value)
+                        state.current_menu[selected_option] = (field, new_value)
 
-                    for option, (field, value) in current_menu.items():
+                    for option, (field, value) in state.current_menu.items():
                         modified_settings[option] = value
 
-                    start_index.pop()
+                    state.start_index.pop()
 
                 elif selected_option in ['latitude', 'longitude', 'altitude']:
                     new_value = get_text_input(f"{human_readable_name} is currently: {current_value}")
                     new_value = current_value if new_value is None else new_value
-                    current_menu[selected_option] = (field, new_value)
+                    state.current_menu[selected_option] = (field, new_value)
 
                     for option in ['latitude', 'longitude', 'altitude']:
-                        if option in current_menu:
+                        if option in state.current_menu:
-                            modified_settings[option] = current_menu[option][1]
+                            modified_settings[option] = state.current_menu[option][1]
 
-                    start_index.pop()
+                    state.start_index.pop()
 
                 elif selected_option == "admin_key":
                     new_values = get_admin_key_input(current_value)
                     new_value = current_value if new_values is None else [base64.b64decode(key) for key in new_values]
-                    start_index.pop()
+                    state.start_index.pop()
 
                 elif field.type == 8:  # Handle boolean type
-                    new_value = get_list_input(human_readable_name, str(current_value),  ["True", "False"])
+                    new_value = get_list_input(human_readable_name, str(current_value), ["True", "False"])
-                    new_value = new_value == "True" or new_value is True
+                    if new_value == "Not Set":
-                    start_index.pop()
+                        pass  # Leave it as-is
+                    else:
+                        new_value = new_value == "True" or new_value is True
+                    state.start_index.pop()
 
                 elif field.label == field.LABEL_REPEATED:  # Handle repeated field - Not currently used
                     new_value = get_repeated_input(current_value)
                     new_value = current_value if new_value is None else new_value.split(", ")
-                    start_index.pop()
+                    state.start_index.pop()
 
                 elif field.enum_type:  # Enum field
                     enum_options = {v.name: v.number for v in field.enum_type.values}
                     new_value_name = get_list_input(human_readable_name, current_value, list(enum_options.keys()))
                     new_value = enum_options.get(new_value_name, current_value)
-                    start_index.pop()
+                    state.start_index.pop()
 
                 elif field.type == 7: # Field type 7 corresponds to FIXED32
                     new_value = get_fixed32_input(current_value)
-                    start_index.pop()
+                    state.start_index.pop()
 
                 elif field.type == 13: # Field type 13 corresponds to UINT32
                     new_value = get_text_input(f"{human_readable_name} is currently: {current_value}")
                     new_value = current_value if new_value is None else int(new_value)
-                    start_index.pop()
+                    state.start_index.pop()
 
                 elif field.type == 2: # Field type 13 corresponds to INT64
                     new_value = get_text_input(f"{human_readable_name} is currently: {current_value}")
                     new_value = current_value if new_value is None else float(new_value)
-                    start_index.pop()
+                    state.start_index.pop()
 
                 else:  # Handle other field types
                     new_value = get_text_input(f"{human_readable_name} is currently: {current_value}")
                     new_value = current_value if new_value is None else new_value
-                    start_index.pop()
+                    state.start_index.pop()
                 
-                for key in menu_path[3:]:  # Skip "Main Menu"
+                for key in state.menu_path[3:]:  # Skip "Main Menu"
                     modified_settings = modified_settings.setdefault(key, {})
 
                 # Add the new value to the appropriate level
@@ -605,12 +613,12 @@ def settings_menu(stdscr, interface):
                     enum_value_descriptor = field.enum_type.values_by_number.get(new_value)
                     new_value = enum_value_descriptor.name if enum_value_descriptor else new_value
 
-                current_menu[selected_option] = (field, new_value)
+                state.current_menu[selected_option] = (field, new_value)
             else:
-                current_menu = current_menu[selected_option]
+                state.current_menu = state.current_menu[selected_option]
-                menu_path.append(selected_option)
+                state.menu_path.append(selected_option)
-                menu_index.append(selected_index)
+                state.menu_index.append(state.selected_index)
-                selected_index = 0
+                state.selected_index = 0
 
 
         elif key == curses.KEY_LEFT:
@@ -620,22 +628,22 @@ def settings_menu(stdscr, interface):
             help_win.erase()
 
             # max_help_lines = 4
-            # draw_help_window(menu_win.getbegyx()[0], menu_win.getbegyx()[1], menu_win.getmaxyx()[0], max_help_lines, current_menu, selected_index, transform_menu_path(menu_path))
+            # draw_help_window(menu_win.getbegyx()[0], menu_win.getbegyx()[1], menu_win.getmaxyx()[0], max_help_lines, state.current_menu, selected_index, transform_menu_path(state.menu_path))
 
             menu_win.refresh()
             help_win.refresh()
 
-            if len(menu_path) < 2:
+            if len(state.menu_path) < 2:
                 modified_settings.clear()
 
             # Navigate back to the previous menu
-            if len(menu_path) > 1:
+            if len(state.menu_path) > 1:
-                menu_path.pop()
+                state.menu_path.pop()
-                current_menu = menu["Main Menu"]
+                state.current_menu = menu["Main Menu"]
-                for step in menu_path[1:]:
+                for step in state.menu_path[1:]:
-                    current_menu = current_menu.get(step, {})
+                    state.current_menu = state.current_menu.get(step, {})
-                selected_index = menu_index.pop()
+                state.selected_index = state.menu_index.pop()
-                start_index.pop()
+                state.start_index.pop()
                 
         elif key == 27:  # Escape key
             menu_win.erase()

contact/ui/ui_state.py

@@ -0,0 +1,8 @@
+class MenuState:
+    def __init__(self):
+        self.menu_index = []        # Row we left the previous menus
+        self.start_index = [0]      # Row to start the menu if it doesn't all fit
+        self.selected_index = 0     # Selected Row
+        self.current_menu = {}      # Contents of the current menu
+        self.menu_path = []         # Menu Path
+        self.show_save_option = False

contact/ui/user_config.py

@@ -5,8 +5,9 @@ from contact.ui.colors import get_color, setup_colors, COLOR_MAP
 from contact.ui.default_config import format_json_single_line_arrays, loaded_config
 from contact.utilities.input_handlers import get_list_input
 
-width = 60
+width = 80
-save_option_text = "Save Changes"
+save_option = "Save Changes"
+sensitive_settings = []
 
 def edit_color_pair(key, current_value):
 
@@ -19,8 +20,8 @@ def edit_color_pair(key, current_value):
 
     return [fg_color, bg_color]
 
-def edit_value(key, current_value):
+def edit_value(key, current_value, state):
-    width = 60
+
     height = 10
     input_width = width - 16  # Allow space for "New Value: "
     start_y = (curses.LINES - height) // 2
@@ -73,8 +74,10 @@ def edit_value(key, current_value):
         if key in (chr(27), curses.KEY_LEFT):  # ESC or Left Arrow
             curses.curs_set(0)
             return current_value  # Exit without returning a value
+        
         elif key in (chr(curses.KEY_ENTER), chr(10), chr(13)):
             break
+
         elif key in (curses.KEY_BACKSPACE, chr(127)):  # Backspace
             if user_input:  # Only process if there's something to delete
                 user_input = user_input[:-1]
@@ -93,114 +96,144 @@ def edit_value(key, current_value):
     return user_input if user_input else current_value
 
 
-def render_menu(current_data, menu_path, selected_index):
+def display_menu(state):
     """
     Render the configuration menu with a Save button directly added to the window.
     """
-    # Determine menu items based on the type of current_data
+    num_items = len(state.current_menu) + (1 if state.show_save_option else 0)
-    if isinstance(current_data, dict):
+
-        options = list(current_data.keys())
+    # Determine menu items based on the type of current_menu
-    elif isinstance(current_data, list):
+    if isinstance(state.current_menu, dict):
-        options = [f"[{i}]" for i in range(len(current_data))]
+        options = list(state.current_menu.keys())
+    elif isinstance(state.current_menu, list):
+        options = [f"[{i}]" for i in range(len(state.current_menu))]
     else:
         options = []  # Fallback in case of unexpected data types
 
     # Calculate dynamic dimensions for the menu
+    max_menu_height = curses.LINES
+    menu_height = min(max_menu_height, num_items + 5)  
     num_items = len(options)
-    height = min(curses.LINES - 2, num_items + 6)  # Include space for borders and Save button
+    start_y = (curses.LINES - menu_height) // 2
-    start_y = (curses.LINES - height) // 2
     start_x = (curses.COLS - width) // 2
 
     # Create the window
-    menu_win = curses.newwin(height, width, start_y, start_x)
+    menu_win = curses.newwin(menu_height, width, start_y, start_x)
-    menu_win.clear()
+    menu_win.erase()
     menu_win.bkgd(get_color("background"))
     menu_win.attrset(get_color("window_frame"))
     menu_win.border()
     menu_win.keypad(True)
 
-    # Display the menu path
-    header = " > ".join(menu_path)
-    if len(header) > width - 4:
-        header = header[:width - 7] + "..."
-    menu_win.addstr(1, 2, header, get_color("settings_breadcrumbs", bold=True))
-
     # Create the pad for scrolling
     menu_pad = curses.newpad(num_items + 1, width - 8)
     menu_pad.bkgd(get_color("background"))
 
+    # Display the menu path
+    header = " > ".join(state.menu_path)
+    if len(header) > width - 4:
+        header = header[:width - 7] + "..."
+    menu_win.addstr(1, 2, header, get_color("settings_breadcrumbs", bold=True))
+
     # Populate the pad with menu options
     for idx, key in enumerate(options):
-        value = current_data[key] if isinstance(current_data, dict) else current_data[int(key.strip("[]"))]
+        value = state.current_menu[key] if isinstance(state.current_menu, dict) else state.current_menu[int(key.strip("[]"))]
         display_key = f"{key}"[:width // 2 - 2]
         display_value = (
             f"{value}"[:width // 2 - 8]
         )
 
-        color = get_color("settings_default", reverse=(idx == selected_index))
+        color = get_color("settings_default", reverse=(idx == state.selected_index))
         menu_pad.addstr(idx, 0, f"{display_key:<{width // 2 - 2}} {display_value}".ljust(width - 8), color)
 
     # Add Save button to the main window
-    save_button_position = height - 2
+    if state.show_save_option:
-    menu_win.addstr(
+        save_position = menu_height - 2
-        save_button_position,
+        menu_win.addstr(save_position, (width - len(save_option)) // 2, save_option, get_color("settings_save", reverse=(state.selected_index == len(state.current_menu))))
-        (width - len(save_option_text)) // 2,
-        save_option_text,
-        get_color("settings_save", reverse=(selected_index == len(options))),
-    )
 
-    # Refresh menu and pad
     menu_win.refresh()
     menu_pad.refresh(
-        0,
+        state.start_index[-1], 0,
-        0,
+        menu_win.getbegyx()[0] + 3, menu_win.getbegyx()[1] + 4,
-        menu_win.getbegyx()[0] + 3,
+        menu_win.getbegyx()[0] + 3 + menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0),
-        menu_win.getbegyx()[1] + 4,
+        menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4
-        
-        menu_win.getbegyx()[0] + menu_win.getmaxyx()[0] - 3,
-        menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4,
     )
 
+    max_index = num_items + (1 if state.show_save_option else 0) - 1
+    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0)
+
+    draw_arrows(menu_win, visible_height, max_index, state)
+
     return menu_win, menu_pad, options
 
 
-def move_highlight(old_idx, new_idx, options, menu_win, menu_pad):
+def move_highlight(old_idx, options, menu_win, menu_pad, state):
-    if old_idx == new_idx:
+    if old_idx == state.selected_index:  # No-op
-        return # no-op
+        return
 
-    show_save_option = True
+    max_index = len(options) + (1 if state.show_save_option else 0) - 1
+    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0)
 
-    max_index = len(options) + (1 if show_save_option else 0) - 1
+    # Adjust state.start_index only when moving out of visible range
+    if state.selected_index == max_index and state.show_save_option:
+        pass
+    elif state.selected_index < state.start_index[-1]:  # Moving above the visible area
+        state.start_index[-1] = state.selected_index
+    elif state.selected_index >= state.start_index[-1] + visible_height:  # Moving below the visible area
+        state.start_index[-1] = state.selected_index - visible_height
+    pass
 
-    if show_save_option and old_idx == max_index: # special case un-highlight "Save" option
+    # Ensure state.start_index is within bounds
-        menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option_text)) // 2, len(save_option_text), get_color("settings_save"))
+    state.start_index[-1] = max(0, min(state.start_index[-1], max_index - visible_height + 1))
+
+    # Clear old selection
+    if state.show_save_option and old_idx == max_index:
+        menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option)) // 2, len(save_option), get_color("settings_save"))
     else:
-        menu_pad.chgat(old_idx, 0, menu_pad.getmaxyx()[1], get_color("settings_default"))
+        menu_pad.chgat(old_idx, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive") if options[old_idx] in sensitive_settings else get_color("settings_default"))
 
-    if show_save_option and new_idx == max_index: # special case highlight "Save" option
+    # Highlight new selection
-        menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option_text)) // 2, len(save_option_text), get_color("settings_save", reverse = True))
+    if state.show_save_option and state.selected_index == max_index:
+        menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option)) // 2, len(save_option), get_color("settings_save", reverse=True))
     else:
-       menu_pad.chgat(new_idx, 0,menu_pad.getmaxyx()[1], get_color("settings_default", reverse = True))
+        menu_pad.chgat(state.selected_index, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive", reverse=True) if options[state.selected_index] in sensitive_settings else get_color("settings_default", reverse=True))
-
-    start_index = max(0, new_idx - (menu_win.getmaxyx()[0] - 6))
 
     menu_win.refresh()
-    menu_pad.refresh(start_index, 0,
+    
-                     menu_win.getbegyx()[0] + 3,
+    # Refresh pad only if scrolling is needed
-                     menu_win.getbegyx()[1] + 4,
+    menu_pad.refresh(state.start_index[-1], 0,
-                     menu_win.getbegyx()[0] + menu_win.getmaxyx()[0] - 3,
+                     menu_win.getbegyx()[0] + 3, menu_win.getbegyx()[1] + 4,
-                     menu_win.getbegyx()[1] + 4 + menu_win.getmaxyx()[1] - 4)
+                     menu_win.getbegyx()[0] + 3 + visible_height, 
+                     menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4)
+
+    draw_arrows(menu_win, visible_height, max_index, state)
 
 
-def json_editor(stdscr):
+def draw_arrows(win, visible_height, max_index, state):
-    menu_path = ["App Settings"]
+
-    selected_index = 0  # Track the selected option
+    mi = max_index - (2 if state.show_save_option else 0) 
+
+    if visible_height < mi:
+        if state.start_index[-1] > 0:
+            win.addstr(3, 2, "▲", get_color("settings_default"))
+        else:
+            win.addstr(3, 2, " ", get_color("settings_default"))
+
+        if mi - state.start_index[-1] >= visible_height + (0 if state.show_save_option else 1) :
+            win.addstr(visible_height + 3, 2, "▼", get_color("settings_default"))
+        else:
+            win.addstr(visible_height + 3, 2, " ", get_color("settings_default"))
+
+
+def json_editor(stdscr, state):
+
+    state.selected_index = 0  # Track the selected option
 
     script_dir = os.path.dirname(os.path.abspath(__file__))
     parent_dir = os.path.abspath(os.path.join(script_dir, os.pardir))
     file_path = os.path.join(parent_dir, "config.json")
-    # file_path = "config.json"
+
-    show_save_option = True  # Always show the Save button
+    state.show_save_option = True  # Always show the Save button
 
     # Ensure the file exists
     if not os.path.exists(file_path):
@@ -212,76 +245,81 @@ def json_editor(stdscr):
         original_data = json.load(f)
 
     data = original_data  # Reference to the original data
-    current_data = data  # Track the current level of the menu
+    state.current_menu = data  # Track the current level of the menu
 
     # Render the menu
-    menu_win, menu_pad, options = render_menu(current_data, menu_path, selected_index)
+    menu_win, menu_pad, options = display_menu(state)
     need_redraw = True
 
     while True:
         if(need_redraw):
-            menu_win, menu_pad, options = render_menu(current_data, menu_path, selected_index)
+            menu_win, menu_pad, options = display_menu(state)
             menu_win.refresh()
             need_redraw = False
             
-        max_index = len(options) + (1 if show_save_option else 0) - 1
+        max_index = len(options) + (1 if state.show_save_option else 0) - 1
         key = menu_win.getch()
 
-
         if key == curses.KEY_UP:
 
-            old_selected_index = selected_index
+            old_selected_index = state.selected_index
-            selected_index = max_index if selected_index == 0 else selected_index - 1
+            state.selected_index = max_index if state.selected_index == 0 else state.selected_index - 1
-            move_highlight(old_selected_index, selected_index, options, menu_win, menu_pad)
+            move_highlight(old_selected_index, options, menu_win, menu_pad, state)
 
         elif key == curses.KEY_DOWN:
 
-            old_selected_index = selected_index
+            old_selected_index = state.selected_index
-            selected_index = 0 if selected_index == max_index else selected_index + 1
+            state.selected_index = 0 if state.selected_index == max_index else state.selected_index + 1
-            move_highlight(old_selected_index, selected_index, options, menu_win, menu_pad)
+            move_highlight(old_selected_index, options, menu_win, menu_pad, state)
 
-        elif key == ord("\t") and show_save_option:
+        elif key == ord("\t") and state.show_save_option:
-            old_selected_index = selected_index
+            old_selected_index = state.selected_index
-            selected_index = max_index
+            state.selected_index = max_index
-            move_highlight(old_selected_index, selected_index, options, menu_win, menu_pad)
+            move_highlight(old_selected_index, options, menu_win, menu_pad, state)
 
-        elif key in (curses.KEY_RIGHT, ord("\n")):
+        elif key in (curses.KEY_RIGHT, 10, 13):  # 10 = \n, 13 = carriage return
 
             need_redraw = True
             menu_win.erase()
             menu_win.refresh()
 
-
+            if state.selected_index < len(options):  # Handle selection of a menu item
-            if selected_index < len(options):  # Handle selection of a menu item
+                selected_key = options[state.selected_index]
-                selected_key = options[selected_index]
+                state.menu_path.append(str(selected_key))
-
+                state.start_index.append(0)
+                state.menu_index.append(state.selected_index)
+                
                 # Handle nested data
-                if isinstance(current_data, dict):
+                if isinstance(state.current_menu, dict):
-                    if selected_key in current_data:
+                    if selected_key in state.current_menu:
-                        selected_data = current_data[selected_key]
+                        selected_data = state.current_menu[selected_key]
                     else:
                         continue  # Skip invalid key
-                elif isinstance(current_data, list):
+                elif isinstance(state.current_menu, list):
-                    selected_data = current_data[int(selected_key.strip("[]"))]
+                    selected_data = state.current_menu[int(selected_key.strip("[]"))]
 
                 if isinstance(selected_data, list) and len(selected_data) == 2:
                     # Edit color pair
-                    new_value = edit_color_pair(
+                    new_value = edit_color_pair(selected_key, selected_data)
-                        selected_key, selected_data)
+                    state.menu_path.pop()
-                    current_data[selected_key] = new_value
+                    state.start_index.pop()
+                    state.menu_index.pop()
+                    state.current_menu[selected_key] = new_value
 
                 elif isinstance(selected_data, (dict, list)):
                     # Navigate into nested data
-                    menu_path.append(str(selected_key))
+                    state.current_menu = selected_data
-                    current_data = selected_data
+                    state.selected_index = 0  # Reset the selected index
-                    selected_index = 0  # Reset the selected index
 
                 else:
                     # General value editing
-                    new_value = edit_value(selected_key, selected_data)
+                    new_value = edit_value(selected_key, selected_data, state)
-                    current_data[selected_key] = new_value
+                    state.menu_path.pop()
+                    state.menu_index.pop()
+                    state.start_index.pop()
+                    state.current_menu[selected_key] = new_value
                     need_redraw = True
-
+                
             else:
                 # Save button selected
                 save_json(file_path, data)
@@ -294,17 +332,22 @@ def json_editor(stdscr):
             menu_win.erase()
             menu_win.refresh()
 
+            # state.selected_index = state.menu_index[-1]
+
             # Navigate back in the menu
-            if len(menu_path) > 1:
+            if len(state.menu_path) > 2:
-                menu_path.pop()
+                state.menu_path.pop()
-                current_data = data
+                state.start_index.pop()
-                for path in menu_path[1:]:
+                state.current_menu = data
-                    current_data = current_data[path] if isinstance(current_data, dict) else current_data[int(path.strip("[]"))]
+
-                selected_index = 0
+                for path in state.menu_path[2:]:
+                    state.current_menu = state.current_menu[path] if isinstance(state.current_menu, dict) else state.current_menu[int(path.strip("[]"))]
+
             else:
                 # Exit the editor
                 menu_win.clear()
                 menu_win.refresh()
+                
                 break
 
 
@@ -315,10 +358,16 @@ def save_json(file_path, data):
     setup_colors(reinit=True)
 
 def main(stdscr):
+    from contact.ui.ui_state import MenuState
+
+    state = MenuState()
+    if len(state.menu_path) == 0:
+        state.menu_path = ["App Settings"]  # Initialize if not set
+
     curses.curs_set(0)
     stdscr.keypad(True)
     setup_colors()
-    json_editor(stdscr)
+    json_editor(stdscr, state)
 
 if __name__ == "__main__":
     curses.wrapper(main)

contact/utilities/interfaces.py

@@ -10,14 +10,15 @@ def initialize_interface(args):
             return meshtastic.tcp_interface.TCPInterface(args.host)
         else:
             try:
-                return meshtastic.serial_interface.SerialInterface(args.port)
+                client = meshtastic.serial_interface.SerialInterface(args.port)
             except PermissionError as ex:
                 logging.error(f"You probably need to add yourself to the `dialout` group to use a serial connection. {ex}")
             except Exception as ex:
                 logging.error(f"Unexpected error initializing interface: {ex}")
-            if globals.interface.devPath is None:
+            if client.devPath is None:
-                return meshtastic.tcp_interface.TCPInterface("meshtastic.local")
+                client = meshtastic.tcp_interface.TCPInterface("localhost")
     
+            return client
     except Exception as ex:
         logging.critical(f"Fatal error initializing interface: {ex}")
     

contact/utilities/save_to_radio.py

@@ -4,7 +4,7 @@ import logging
 import base64
 import time
 
-def save_changes(interface, menu_path, modified_settings):
+def save_changes(interface, modified_settings, state):
     """
     Save changes to the device based on modified settings.
     :param interface: Meshtastic interface instance
@@ -52,8 +52,8 @@ def save_changes(interface, menu_path, modified_settings):
             if not modified_settings:
                 return
 
-        if menu_path[1] ==  "Radio Settings" or menu_path[1] == "Module Settings":
+        if state.menu_path[1] ==  "Radio Settings" or state.menu_path[1] == "Module Settings":
-            config_category = menu_path[2].lower() # for radio and module configs
+            config_category = state.menu_path[2].lower() # for radio and module configs
 
             if {'latitude', 'longitude', 'altitude'} & modified_settings.keys():
                 lat = float(modified_settings.get('latitude', 0.0))
@@ -64,7 +64,7 @@ def save_changes(interface, menu_path, modified_settings):
                 logging.info(f"Updated {config_category} with Latitude: {lat} and Longitude {lon} and Altitude {alt}")
                 return
 
-        elif menu_path[1] == "User Settings":  # for user configs
+        elif state.menu_path[1] == "User Settings":  # for user configs
             config_category = "User Settings"
             long_name = modified_settings.get("longName")
             short_name = modified_settings.get("shortName")
@@ -77,11 +77,11 @@ def save_changes(interface, menu_path, modified_settings):
 
             return
         
-        elif menu_path[1] == "Channels":    # for channel configs
+        elif state.menu_path[1] == "Channels":    # for channel configs
             config_category = "Channels"
 
             try:
-                channel = menu_path[-1]
+                channel = state.menu_path[-1]
                 channel_num = int(channel.split()[-1]) - 1
             except (IndexError, ValueError) as e:
                 channel_num = None

pyproject.toml

@@ -1,15 +1,9 @@
 [project]
 name = "contact"
-version = "1.3.2"
+version = "1.3.4"
 description = "This Python curses client for Meshtastic is a terminal-based client designed to manage device settings, enable mesh chat communication, and handle configuration backups and restores."
 authors = [
-    {name = "Ben Lipsey",email = "ben@pdxlocations.com"},
+    {name = "Ben Lipsey",email = "ben@pdxlocations.com"}
-    {name = "Russell Schmidt"},
-    {name = "noon92"},
-    {name = "vidplace7"},
-    {name = "SpudGunMan"},
-    {name = "Ian McEwen"},
-    {name = "Nick Maloney"}
 ]
 license = "GPL-3.0-only"
 readme = "README.md"