From f189147ab56ffd70aae0819d2334d548a4aa9579 Mon Sep 17 00:00:00 2001
From: madeofstown <madeofstown@rndmm.us>
Date: Mon, 20 Jan 2025 13:41:48 -0800
Subject: [PATCH] meshtastic python as submodule

---
 meshtastic                                       |   1 -
 meshview/__pycache__/mqtt_reader.cpython-310.pyc | Bin 0 -> 1670 bytes
 meshview/decode_payload.py                       |   6 +++---
 meshview/mqtt_reader.py                          |   2 +-
 meshview/store.py                                |   6 +++---
 meshview/web.py                                  |   2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 120000 meshtastic
 create mode 100644 meshview/__pycache__/mqtt_reader.cpython-310.pyc

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 0000000000000000000000000000000000000000..7ef6c7b2272b631ae8ec47bb4c5823b51fa04fee
GIT binary patch
literal 1670
zcmYjR&2Jk;6rY*>wjIY!D}qXa6DS6eG;Ih-P#~m9OA#U9il~;5S?^5jHT&h6i7i{}
zDk!~zICHX({1^NkbLEs9M+ArPW;dak)xMec_I=F0_j@m0TB;ye!#{rMQ5&H@HFJF#
zz<dU;7yzM&;s~|N9k+48lQt=Kqiw)WA~Uwy7S=jOWXDe1iQTpvdu^|fnNcOKwyPL1
zG_O%>f!j;erp^o0u2YwKurE{GLe0uK#6t&7tf~)LkW#kCdCHrHvUkI*&$z1iQ7`48
z?8ib`F(?SoU2ZWx3In#6j98RrZ2Icv;iC_}4tKK8H<R(`@LfK=`+m0b&4UL4*8VS-
z1G@|FF1+GbAUT@DuP!imC~5&Wz;i+gH5O!srI90Qo{|40B*!^fMKeR1(wf`SSzzhT
zz1&#fGcq%Cb6#1XnU!1fDtM|bFr1ba2rTTW2a@`HIky)Wqa#RK3z<kZCXX=E&$B`@
zMosHLIkd<FJ=Zr?b`(k(F=Za}G;ZEd?qgr<hb*FsgjBgQ?Q|!S3FY*d^rhrn7m}OW
z)Y#c;DdWq%XWS~--KXCw51jK!CR48LlZ^V3DUT(Eh=IG~F!7^s%DB#yT0Zo-VEYib
zC3%?iI00$XQFi7BKQgJja__)JYWjMe1j?g1D@l`pDLW`i$XB#8kNe|J##5R8j`-^!
z`RBcjej2ll0TY4^Hex3FqmYfS9fneNIP)pv>)E8pi@tgtY{hLL6>Q=<UcoMYg}C?@
zCUCA{8<PwECVUR`ZLgNjrEY*-5Q-XL;wK`J)YXRSpWzwt(DVms3{0rGLCu^{>t}Nd
zeF1fOjDFjn899E4zOO))jk%SZ3tWD|Xm~p}2KGHPZQd_*j{pHvS2}Yyw+7w<&+H?V
zcu?!g<kPEK57)*>R&#q$I|DT6eXt~+4A;P-J^+jylkWf%!?o=KDJCH0%(#k|R5veg
zC4w<nm*~-$N?wB~#-K5IfziytXj+#y<|`BscV&B2;B4kRcM^+&&U0ss$7tv^orCiR
zB<HDebQLHYsY>MY9@`3hDWDhK6Tx`m$4t4IFT^<IR8>OC5*Z$cjGyZsYu;3bkN_+0
zCp3*!6#%J^-B1EL{V<K8oY2)#2xiI?CtVTnunR6Brto`AaF|O-RbJvvIhj9+QlA#U
zD~ifjL8nBgCDSYnlr{3B6F~7-;J%n05KK&xAWW4dBF3_&tExJ72mWCM1H~@v1b<6M
zvxDM3{H|t<SoD<3E@z6utiWkW-p~p+;h#E%dFM(?=nvvUAmp?T5F`Lf7uPQcKyn2h
zf*Sxz6F^x3iRR3|*Zwt68}&QbJtY_9Fa8l2Hyg_C`hsn5@%zB?HBH_DqE>rp+KbqF
z(K_9e<MqpQ6**CFm)+dse%7C?_x)+?OHd8tP=+HW*2@kQFQ-B|3-0JTOJB$^xaL?V
zDeK-V>)>^_x5`PxH8#rZ>#JT%if&_GWXAm%M)OI;KG9GRw}80Fg+#cd2Ax?W@bgBk
F@gJ&<xG?|#

literal 0
HcmV?d00001

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