Merge pull request #338 from mkinney/bump_nanopb

Bump nanopb

Author: mkinney

.gitignore

@@ -5,8 +5,7 @@ dist
 *.egg-info
 log_*
 .eggs
-nanopb-0.4.4
-nanopb-0.4.5
+nanopb-*
 .*swp
 .coverage
 *.py-E

.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,module_config_pb2.py,localonly_pb2.py,node.py
 
 
 
@@ -25,7 +25,6 @@ ignore-patterns=mqtt_pb2.py,channel_pb2.py,telemetry_pb2.py,admin_pb2.py,radioco
 #
 disable=invalid-name,fixme,logging-fstring-interpolation,too-many-statements,too-many-branches,too-many-locals,no-member,f-string-without-interpolation,protected-access,no-self-use,pointless-string-statement,too-few-public-methods,broad-except,no-else-return,no-else-raise,bare-except,too-many-public-methods
 
-
 [BASIC]
 
 # Good variable names which should always be accepted, separated by a comma
@@ -41,7 +40,7 @@ bad-names=foo,bar,baz,toto,tutu,tata
 max-line-length=150
 
 # Maximum number of lines in a module
-max-module-lines=1400
+max-module-lines=1600
 
 
 

bin/regen-protos.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-./nanopb-0.4.5/generator-bin/protoc -I=proto --python_out meshtastic `ls proto/*.proto`
+./nanopb-0.4.6/generator-bin/protoc -I=proto --python_out meshtastic `ls proto/*.proto`
 
 # workaround for import bug in protoc https://github.com/protocolbuffers/protobuf/issues/1491#issuecomment-690618628
 

meshtastic/__init__.py

@@ -80,7 +80,7 @@ def onConnection(interface, topic=pub.AUTO_TOPIC): # called when we (re)connect
 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.

meshtastic/__main__.py

@@ -16,7 +16,7 @@
 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: