1
0
forked from iarv/contact

Compare commits

..

8 Commits

Author SHA1 Message Date
pdxlocations
088d13c88b reinit after region set 2025-02-12 16:03:57 -08:00
pdxlocations
c83ccea4ef use protubuf number when setting region 2025-02-12 15:27:33 -08:00
pdxlocations
d7f0bee54c try setting region earlier 2025-02-12 15:22:02 -08:00
pdxlocations
fb60773ae6 don't close interface after region set 2025-02-12 15:18:58 -08:00
pdxlocations
47ab0a5b9a bump version 2025-02-09 22:09:59 -08:00
pdxlocations
989c3cf44e add region check at startup (#127) 2025-02-09 22:09:15 -08:00
pdxlocations
71aeae4f92 add note in draw_node_list 2025-02-09 20:49:49 -08:00
pdxlocations
34cd21b323 Fix Startup Error with Thread Lock (#126)
* more excuses

* none isn't better than nothing

* more checks

* typo

* refactor

* less is more

* grasping at straws

* more global

* back up

* db snapshot

* try a threading lock

* fix conflict

* lock it down

* sir locks a lot

* sir locks a lilttle less
2025-02-09 06:46:42 -08:00
3 changed files with 31 additions and 2 deletions

11
main.py
View File

@@ -3,7 +3,7 @@
'''
Contact - A Console UI for Meshtastic by http://github.com/pdxlocations
Powered by Meshtastic.org
V 1.2.0
V 1.2.1
'''
import curses
@@ -17,7 +17,9 @@ from utilities.arg_parser import setup_parser
from utilities.interfaces import initialize_interface
from message_handlers.rx_handler import on_receive
from ui.curses_ui import main_ui, draw_splash
from input_handlers import get_list_input
from utilities.utils import get_channels, get_node_list, get_nodeNum
from settings import set_region
from db_handler import init_nodedb, load_messages_from_db
import default_config as config
import globals
@@ -50,6 +52,12 @@ def main(stdscr):
logging.info("Initializing interface %s", args)
with globals.lock:
globals.interface = initialize_interface(args)
if globals.interface.localNode.localConfig.lora.region == 0:
confirmation = get_list_input("Your region is UNSET. Set it now?", "Yes", ["Yes", "No"])
if confirmation == "Yes":
set_region()
globals.interface.close()
globals.interface = initialize_interface(args)
logging.info("Interface initialized")
globals.myNodeNum = get_nodeNum()
globals.channel_list = get_channels()
@@ -58,6 +66,7 @@ def main(stdscr):
init_nodedb()
load_messages_from_db()
logging.info("Starting main UI")
main_ui(stdscr)
except Exception as e:
logging.error("An error occurred: %s", e)

View File

@@ -9,6 +9,7 @@ from ui.menus import generate_menu_from_protobuf
from ui.colors import setup_colors, get_color
from utilities.arg_parser import setup_parser
from utilities.interfaces import initialize_interface
from ui.dialog import dialog
from user_config import json_editor
import globals
@@ -348,6 +349,25 @@ def settings_menu(stdscr, interface):
menu_win.refresh()
break
def set_region():
node = globals.interface.getNode('^local')
device_config = node.localConfig
lora_descriptor = device_config.lora.DESCRIPTOR
# Get the enum mapping of region names to their numerical values
region_enum = lora_descriptor.fields_by_name["region"].enum_type
region_name_to_number = {v.name: v.number for v in region_enum.values}
regions = list(region_name_to_number.keys())
new_region_name = get_list_input('Select your region:', 'UNSET', regions)
# Convert region name to corresponding enum number
new_region_number = region_name_to_number.get(new_region_name, 0) # Default to 0 if not found
node.localConfig.lora.region = new_region_number
node.writeConfig("lora")
def main(stdscr):
logging.basicConfig( # Run `tail -f client.log` in another terminal to view live

View File

@@ -422,7 +422,7 @@ def draw_node_list():
# nodes_pad = curses.newpad(1, 1)
nodes_pad = curses.newpad(1, 1)
try:
nodes_pad.erase()
box_width = nodes_win.getmaxyx()[1]