meshtastic python as submodule

meshtastic

@@ -1 +0,0 @@
-meshtastic-python/meshtastic/protobuf/

meshview/decode_payload.py

@@ -1,5 +1,5 @@
-from meshtastic.portnums_pb2 import PortNum
-from meshtastic.mesh_pb2 import (
+from meshtastic.protobuf.portnums_pb2 import PortNum
+from meshtastic.protobuf.mesh_pb2 import (
     Position,
     NeighborInfo,
     NodeInfo,
@@ -8,7 +8,7 @@ from meshtastic.mesh_pb2 import (
     Routing,
     MeshPacket,
 )
-from meshtastic.telemetry_pb2 import Telemetry
+from meshtastic.protobuf.telemetry_pb2 import Telemetry
 from google.protobuf.message import DecodeError
 
 

meshview/mqtt_reader.py

@@ -6,7 +6,7 @@ import aiomqtt
 from google.protobuf.message import DecodeError
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 
-from meshtastic.mqtt_pb2 import ServiceEnvelope
+from meshtastic.protobuf.mqtt_pb2 import ServiceEnvelope
 
 KEY = base64.b64decode("1PG7OiApB1nwvP+rz05pAQ==")
 

meshview/store.py

@@ -3,9 +3,9 @@ import datetime
 from sqlalchemy import select, func
 from sqlalchemy.orm import lazyload
 
-from meshtastic.config_pb2 import Config
-from meshtastic.portnums_pb2 import PortNum
-from meshtastic.mesh_pb2 import User, HardwareModel
+from meshtastic.protobuf.config_pb2 import Config
+from meshtastic.protobuf.portnums_pb2 import PortNum
+from meshtastic.protobuf.mesh_pb2 import User, HardwareModel
 from meshview import database
 from meshview import decode_payload
 from meshview.models import Packet, PacketSeen, Node, Traceroute

meshview/web.py

@@ -20,7 +20,7 @@ from jinja2 import Environment, PackageLoader, select_autoescape
 from google.protobuf import text_format
 from google.protobuf.message import Message
 
-from meshtastic.portnums_pb2 import PortNum
+from meshtastic.protobuf.portnums_pb2 import PortNum
 from meshview import store
 from meshview import models
 from meshview import decode_payload