From b79b7ceb40d05d7a9dd751e4c9aa2f24d1bb0977 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Thu, 16 Jun 2022 20:31:14 -0500 Subject: [PATCH] Correct config --- .pylintrc | 2 +- meshtastic/__init__.py | 2 +- meshtastic/__main__.py | 10 +++++----- meshtastic/tests/test_main.py | 4 ++-- meshtastic/tests/test_mesh_interface.py | 2 +- meshtastic/tests/test_node.py | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.pylintrc b/.pylintrc index 6ca11fa..6b99262 100644 --- a/.pylintrc +++ b/.pylintrc @@ -7,7 +7,7 @@ # Add files or directories matching the regex patterns to the blacklist. The # regex matches against base names, not paths. -ignore-patterns=mqtt_pb2.py,channel_pb2.py,telemetry_pb2.py,admin_pb2.py,radioconfig_pb2.py,deviceonly_pb2.py,apponly_pb2.py,remote_hardware_pb2.py,portnums_pb2.py,mesh_pb2.py,storeforward_pb2.py,cannedmessages_pb2.py +ignore-patterns=mqtt_pb2.py,channel_pb2.py,telemetry_pb2.py,admin_pb2.py,config_pb2.py,deviceonly_pb2.py,apponly_pb2.py,remote_hardware_pb2.py,portnums_pb2.py,mesh_pb2.py,storeforward_pb2.py,cannedmessages_pb2.py diff --git a/meshtastic/__init__.py b/meshtastic/__init__.py index 7832174..be32b51 100644 --- a/meshtastic/__init__.py +++ b/meshtastic/__init__.py @@ -80,7 +80,7 @@ from meshtastic.util import fixme, catchAndIgnore, stripnl, DeferredExecution, T from meshtastic.node import Node from meshtastic import (mesh_pb2, portnums_pb2, apponly_pb2, admin_pb2, telemetry_pb2, remote_hardware_pb2, - channel_pb2, radioconfig_pb2, util) + channel_pb2, config_pb2, util) # Note: To follow PEP224, comments should be after the module variable. diff --git a/meshtastic/__main__.py b/meshtastic/__main__.py index fc3fdf9..782f2c8 100644 --- a/meshtastic/__main__.py +++ b/meshtastic/__main__.py @@ -16,7 +16,7 @@ import meshtastic.util import meshtastic.test from meshtastic import remote_hardware from meshtastic.ble_interface import BLEInterface -from meshtastic import portnums_pb2, channel_pb2, radioconfig_pb2 +from meshtastic import portnums_pb2, channel_pb2, config_pb2 from meshtastic.globals import Globals from meshtastic.__init__ import BROADCAST_ADDR @@ -229,12 +229,12 @@ def onConnected(interface): try: for field in args.pos_fields: - v_field = radioconfig_pb2.PositionFlags.Value(field) + v_field = config_pb2.PositionFlags.Value(field) allFields |= v_field except ValueError: print("ERROR: supported position fields are:") - print(radioconfig_pb2.PositionFlags.keys()) + print(config_pb2.PositionFlags.keys()) print("If no fields are specified, will read and display current value.") else: @@ -249,9 +249,9 @@ def onConnected(interface): prefs = interface.getNode(args.dest).radioConfig.preferences fieldNames = [] - for bit in radioconfig_pb2.PositionFlags.values(): + for bit in config_pb2.PositionFlags.values(): if prefs.position_flags & bit: - fieldNames.append(radioconfig_pb2.PositionFlags.Name(bit)) + fieldNames.append(config_pb2.PositionFlags.Name(bit)) print(' '.join(fieldNames)) if args.set_team: diff --git a/meshtastic/tests/test_main.py b/meshtastic/tests/test_main.py index 10c4b72..f185fcb 100644 --- a/meshtastic/tests/test_main.py +++ b/meshtastic/tests/test_main.py @@ -12,14 +12,14 @@ import pytest from meshtastic.__main__ import initParser, main, Globals, onReceive, onConnection, export_config, getPref, setPref, onNode, tunnelMain #from ..radioconfig_pb2 import UserPreferences -import meshtastic.radioconfig_pb2 +import meshtastic.config_pb2 from ..serial_interface import SerialInterface from ..tcp_interface import TCPInterface #from ..ble_interface import BLEInterface from ..node import Node from ..channel_pb2 import Channel from ..remote_hardware import onGPIOreceive -from ..radioconfig_pb2 import RadioConfig +from ..config_pb2 import Config @pytest.mark.unit diff --git a/meshtastic/tests/test_mesh_interface.py b/meshtastic/tests/test_mesh_interface.py index 863b955..27592b0 100644 --- a/meshtastic/tests/test_mesh_interface.py +++ b/meshtastic/tests/test_mesh_interface.py @@ -10,7 +10,7 @@ from ..mesh_interface import MeshInterface from ..node import Node from .. import mesh_pb2 from ..__init__ import LOCAL_ADDR, BROADCAST_ADDR -from ..radioconfig_pb2 import RadioConfig +from ..config_pb2 import Config from ..util import Timeout diff --git a/meshtastic/tests/test_node.py b/meshtastic/tests/test_node.py index 0a1c8fa..20c7303 100644 --- a/meshtastic/tests/test_node.py +++ b/meshtastic/tests/test_node.py @@ -10,7 +10,7 @@ from ..node import Node from ..serial_interface import SerialInterface from ..admin_pb2 import AdminMessage from ..channel_pb2 import Channel -from ..radioconfig_pb2 import RadioConfig +from ..config_pb2 import Config #from ..cannedmessages_pb2 import (CannedMessagePluginMessagePart1, CannedMessagePluginMessagePart2, # CannedMessagePluginMessagePart3, CannedMessagePluginMessagePart4, # CannedMessagePluginMessagePart5)