acidvegas/meshtastic-mqtt-json
acidvegas/meshtastic-mqtt-json
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Compare commits

base: acidvegas:main
Branches Tags
acidvegas:main
acidvegas:v1.0.9
acidvegas:v1.0.8
acidvegas:v1.0.7
acidvegas:v1.0.6
acidvegas:v1.0.5
acidvegas:v1.0.4
acidvegas:v1.0.3
acidvegas:v0.1.2
acidvegas:v0.1.1
acidvegas:v0.1.0
..
compare: acidvegas:v1.0.9
Branches Tags
acidvegas:main
acidvegas:v1.0.9
acidvegas:v1.0.8
acidvegas:v1.0.7
acidvegas:v1.0.6
acidvegas:v1.0.5
acidvegas:v1.0.4
acidvegas:v1.0.3
acidvegas:v0.1.2
acidvegas:v0.1.1
acidvegas:v0.1.0

No commits in common. "main" and "v1.0.9" have entirely different histories.
main ... v1.0.9

3 changed files with 26 additions and 48 deletions
Show Stats Expand all files Collapse all files

2
setup.py
View File

@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup(
name="meshtastic-mqtt-json",
version='1.0.10',
version='1.0.9',
author='acidvegas',
author_email='acid.vegas@acid.vegas',
description='A lightweight Python library for parsing Meshtastic MQTT messages',

2
src/meshtastic_mqtt_json/__init__.py
View File

@ -4,6 +4,6 @@ Meshtastic MQTT Interface - A lightweight Python library for parsing Meshtastic
from .client import MeshtasticMQTT
__version__ = '1.0.10'
__version__ = '1.0.9'
__author__ = 'acidvegas'
__license__ = 'ISC'

70
src/meshtastic_mqtt_json/client.py
View File

@ -212,38 +212,32 @@ class MeshtasticMQTT(object):
if mp.decoded.portnum == portnums_pb2.ADMIN_APP:
data = mesh_pb2.Admin()
data.ParseFromString(mp.decoded.payload)
msg = json.dumps(clean_json(data))
print(f'{msg}')
print(f'{clean_json(data)}')
elif mp.decoded.portnum == portnums_pb2.ATAK_FORWARDER:
data = mesh_pb2.AtakForwarder()
data.ParseFromString(mp.decoded.payload)
msg = json.dumps(clean_json(data))
print(f'{msg}')
print(f'{clean_json(data)}')
elif mp.decoded.portnum == portnums_pb2.ATAK_PLUGIN:
data = mesh_pb2.AtakPlugin()
data.ParseFromString(mp.decoded.payload)
msg = json.dumps(clean_json(data))
print(f'{msg}')
print(f'{clean_json(data)}')
elif mp.decoded.portnum == portnums_pb2.AUDIO_APP:
data = mesh_pb2.Audio()
data.ParseFromString(mp.decoded.payload)
msg = json.dumps(clean_json(data))
print(f'{msg}')
print(f'{clean_json(data)}')
elif mp.decoded.portnum == portnums_pb2.DETECTION_SENSOR_APP:
data = mesh_pb2.DetectionSensor()
data.ParseFromString(mp.decoded.payload)
msg = json.dumps(clean_json(data))
print(f'{msg}')
print(f'{clean_json(data)}')
elif mp.decoded.portnum == portnums_pb2.IP_TUNNEL_APP:
data = mesh_pb2.IPTunnel()
data.ParseFromString(mp.decoded.payload)
msg = json.dumps(clean_json(data))
print(f'{msg}')
print(f'{clean_json(data)}')
elif mp.decoded.portnum == portnums_pb2.MAP_REPORT_APP:
map_report = mesh_pb2.MapReport()
@ -268,8 +262,7 @@ class MeshtasticMQTT(object):
elif mp.decoded.portnum == portnums_pb2.PAXCOUNTER_APP:
data = mesh_pb2.Paxcounter()
data.ParseFromString(mp.decoded.payload)
msg = json.dumps(clean_json(data))
print(f'{msg}')
print(f'{clean_json(data)}')
elif mp.decoded.portnum == portnums_pb2.POSITION_APP:
position = mesh_pb2.Position()
@ -280,8 +273,7 @@ class MeshtasticMQTT(object):
elif mp.decoded.portnum == portnums_pb2.PRIVATE_APP:
data = mesh_pb2.Private()
data.ParseFromString(mp.decoded.payload)
msg = json.dumps(clean_json(data))
print(f'{msg}')
print(f'{clean_json(data)}')
elif mp.decoded.portnum == portnums_pb2.RANGE_TEST_APP:
data = mesh_pb2.RangeTest()
@ -292,14 +284,12 @@ class MeshtasticMQTT(object):
elif mp.decoded.portnum == portnums_pb2.REMOTE_HARDWARE_APP:
data = mesh_pb2.RemoteHardware()
data.ParseFromString(mp.decoded.payload)
msg = json.dumps(clean_json(data))
print(f'{msg}')
print(f'{clean_json(data)}')
elif mp.decoded.portnum == portnums_pb2.REPLY_APP:
data = mesh_pb2.Reply()
data.ParseFromString(mp.decoded.payload)
msg = json.dumps(clean_json(data))
print(f'{msg}')
print(f'{clean_json(data)}')
elif mp.decoded.portnum == portnums_pb2.ROUTING_APP:
routing = mesh_pb2.Routing()
@ -310,14 +300,12 @@ class MeshtasticMQTT(object):
elif mp.decoded.portnum == portnums_pb2.SERIAL_APP:
data = mesh_pb2.Serial()
data.ParseFromString(mp.decoded.payload)
msg = json.dumps(clean_json(data))
print(f'{msg}')
print(f'{clean_json(data)}')
elif mp.decoded.portnum == portnums_pb2.SIMULATOR_APP:
data = mesh_pb2.Simulator()
data.ParseFromString(mp.decoded.payload)
msg = json.dumps(clean_json(data))
print(f'{msg}')
print(f'{clean_json(data)}')
elif mp.decoded.portnum == portnums_pb2.STORE_FORWARD_APP:
print(f'{clean_json(mp)}')
@ -337,14 +325,13 @@ class MeshtasticMQTT(object):
elif mp.decoded.portnum == portnums_pb2.TEXT_MESSAGE_COMPRESSED_APP:
data = mesh_pb2.TextMessageCompressed()
data.ParseFromString(mp.decoded.payload)
msg = json.dumps(clean_json(data))
print(f'{msg}')
print(f'{clean_json(data)}')
elif mp.decoded.portnum == portnums_pb2.TRACEROUTE_APP:
routeDiscovery = mesh_pb2.RouteDiscovery()
routeDiscovery.ParseFromString(mp.decoded.payload)
json_packet['decoded']['payload'] = clean_json(routeDiscovery)
print(f'{json.dumps(json_packet)}')
routeDiscovery = mesh_pb2.RouteDiscovery()
routeDiscovery.ParseFromString(mp.decoded.payload)
json_packet['decoded']['payload'] = clean_json(routeDiscovery)
print(f'{json.dumps(json_packet)}')
elif mp.decoded.portnum == portnums_pb2.UNKNOWN_APP:
print(f'{clean_json(mp)}')
@ -352,19 +339,16 @@ class MeshtasticMQTT(object):
elif mp.decoded.portnum == portnums_pb2.WAYPOINT_APP:
data = mesh_pb2.Waypoint()
data.ParseFromString(mp.decoded.payload)
msg = json.dumps(clean_json(data))
print(f'{msg}')
print(f'{clean_json(data)}')
elif mp.decoded.portnum == portnums_pb2.ZPS_APP:
data = mesh_pb2.Zps()
data.ParseFromString(mp.decoded.payload)
msg = json.dumps(clean_json(data))
print(f'{msg}')
print(f'{clean_json(data)}')
else:
print(f'UNKNOWN: Received Portnum name: {portnum_name}')
msg = json.dumps(clean_json(mp))
print(f'UNKNOWN: {msg}')
print(f'UNKNOWN: {clean_json(mp)}')
except Exception as e:
print(f'Error processing message: {e}')
@ -375,16 +359,10 @@ class MeshtasticMQTT(object):
def event_mqtt_disconnect(self, client, userdata, rc, packet_from_broker=None, properties=None, reason_code=None):
'''Callback for when the client disconnects from the server.'''
print(f'Disconnected with result code: {rc}')
while True:
print('Attempting to reconnect...')
try:
client.reconnect()
except Exception as e:
print(f'Error reconnecting to MQTT broker: {e}')
time.sleep(5)
else:
print('Reconnected to MQTT broker')
break
time.sleep(5)
print('Attempting to reconnect...')
client.reconnect()
def main():