mirror of
https://github.com/pdxlocations/contact.git
synced 2026-03-28 17:12:35 +01:00
Compare commits
18 Commits
v1.2.1
...
fix-startu
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
08f19e653a | ||
|
|
6e05446d6a | ||
|
|
a0cb4f9480 | ||
|
|
89d5890338 | ||
|
|
a645e41146 | ||
|
|
aa736472cc | ||
|
|
4dc1b4b791 | ||
|
|
41050577aa | ||
|
|
d9c249af56 | ||
|
|
ad64004e79 | ||
|
|
d9a84c4b29 | ||
|
|
6cf46a202a | ||
|
|
351f4d7f8f | ||
|
|
5f0277c460 | ||
|
|
f34db01a78 | ||
|
|
463b655684 | ||
|
|
14aa5c00a3 | ||
|
|
a201bcccb2 |
13
main.py
13
main.py
@@ -3,7 +3,7 @@
|
||||
'''
|
||||
Contact - A Console UI for Meshtastic by http://github.com/pdxlocations
|
||||
Powered by Meshtastic.org
|
||||
V 1.2.1
|
||||
V 1.2.0
|
||||
'''
|
||||
|
||||
import curses
|
||||
@@ -17,9 +17,7 @@ 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
|
||||
@@ -52,7 +50,6 @@ def main(stdscr):
|
||||
logging.info("Initializing interface %s", args)
|
||||
with globals.lock:
|
||||
globals.interface = initialize_interface(args)
|
||||
|
||||
logging.info("Interface initialized")
|
||||
globals.myNodeNum = get_nodeNum()
|
||||
globals.channel_list = get_channels()
|
||||
@@ -61,14 +58,6 @@ def main(stdscr):
|
||||
init_nodedb()
|
||||
load_messages_from_db()
|
||||
logging.info("Starting main UI")
|
||||
|
||||
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)
|
||||
|
||||
main_ui(stdscr)
|
||||
except Exception as e:
|
||||
logging.error("An error occurred: %s", e)
|
||||
|
||||
@@ -9,7 +9,6 @@ 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
|
||||
|
||||
@@ -349,14 +348,6 @@ def settings_menu(stdscr, interface):
|
||||
menu_win.refresh()
|
||||
break
|
||||
|
||||
def set_region():
|
||||
node = globals.interface.getNode('^local')
|
||||
device_config = node.localConfig
|
||||
regions = [region.name for region in device_config.lora.DESCRIPTOR.fields_by_name["region"].enum_type.values]
|
||||
new_region = get_list_input('Select your region:', 'UNSET', regions)
|
||||
node.localConfig.lora.region = new_region
|
||||
node.writeConfig("lora")
|
||||
|
||||
|
||||
def main(stdscr):
|
||||
logging.basicConfig( # Run `tail -f client.log` in another terminal to view live
|
||||
|
||||
@@ -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]
|
||||
|
||||
Reference in New Issue
Block a user