mirror/python
1
0
Fork 0
mirror of https://github.com/meshtastic/python.git synced 2026-01-12 01:37:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Correct config

Browse Source
This commit is contained in:
Ben Meadors
2022-06-16 20:31:14 -05:00
parent 2a546f8899
commit b79b7ceb40
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pylintrc
View File

@@ -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

2
meshtastic/__init__.py
View File

@@ -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.

10
meshtastic/__main__.py
View File

@@ -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:

4
meshtastic/tests/test_main.py
View File

@@ -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

2
meshtastic/tests/test_mesh_interface.py
View File

@@ -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

2
meshtastic/tests/test_node.py
View File

@@ -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)