From 19b9270e13c4c4c5525bb6466fa44f6c107f69e6 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Tue, 9 Jul 2024 16:06:17 -0700 Subject: [PATCH] fix Dot13 API changes --- curses-client.py | 7 ++++++- settings.py | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/curses-client.py b/curses-client.py index b946691..69a4b03 100644 --- a/curses-client.py +++ b/curses-client.py @@ -9,9 +9,14 @@ V 0.1.7 import curses import meshtastic.serial_interface, meshtastic.tcp_interface from pubsub import pub -from meshtastic import config_pb2, BROADCAST_NUM import textwrap # Import the textwrap module +try: + from meshtastic.protobuf import config_pb2 + from meshtastic import BROADCAST_NUM +except ImportError: + from meshtastic import config_pb2, BROADCAST_NUM + from settings import settings # Initialize Meshtastic interface diff --git a/settings.py b/settings.py index 0eefcb3..cd4624b 100644 --- a/settings.py +++ b/settings.py @@ -1,8 +1,11 @@ import curses -from meshtastic import config_pb2, module_config_pb2, mesh_pb2, channel_pb2 import meshtastic.serial_interface, meshtastic.tcp_interface import ipaddress +try: + from meshtastic.protobuf import config_pb2, module_config_pb2, mesh_pb2, channel_pb2 +except ImportError: + from meshtastic import config_pb2, module_config_pb2, mesh_pb2, channel_pb2 def display_enum_menu(stdscr, enum_values, menu_item): menu_height = len(enum_values) + 2