diff --git a/meshtastic b/meshtastic deleted file mode 120000 index dc6100a..0000000 --- a/meshtastic +++ /dev/null @@ -1 +0,0 @@ -meshtastic-python/meshtastic/protobuf/ \ No newline at end of file diff --git a/meshview/__pycache__/mqtt_reader.cpython-310.pyc b/meshview/__pycache__/mqtt_reader.cpython-310.pyc new file mode 100644 index 0000000..7ef6c7b Binary files /dev/null and b/meshview/__pycache__/mqtt_reader.cpython-310.pyc differ diff --git a/meshview/decode_payload.py b/meshview/decode_payload.py index 7c03b49..99fe696 100644 --- a/meshview/decode_payload.py +++ b/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 diff --git a/meshview/mqtt_reader.py b/meshview/mqtt_reader.py index 91d2490..1bac492 100644 --- a/meshview/mqtt_reader.py +++ b/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==") diff --git a/meshview/store.py b/meshview/store.py index 0b01ccc..66a05e6 100644 --- a/meshview/store.py +++ b/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 diff --git a/meshview/web.py b/meshview/web.py index 3daccd1..10d9862 100644 --- a/meshview/web.py +++ b/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