mirror/python
1
0
Fork 0
mirror of https://github.com/meshtastic/python.git synced 2026-02-25 11:10:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

A quick fix #44 mostly by @timgunter. thanks!

Browse Source
This commit is contained in:
Kevin Hester
2020-12-15 16:58:01 +08:00
parent 57e526e675
commit 862f660600
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
meshtastic/__init__.py
View File

@@ -469,13 +469,10 @@ class MeshInterface:
portnum = asDict["decoded"]["data"]["portnum"]
if isinstance(portnum, str):
portnum = portnums_pb2.PortNum.Value(portnum)
topic = f"meshtastic.receive.data.{portnum}"
# For text messages, we go ahead and decode the text to ascii for our users
if portnum == portnums_pb2.PortNum.TEXT_MESSAGE_APP:
if portnum == portnums_pb2.PortNum.Name(portnums_pb2.PortNum.TEXT_MESSAGE_APP):
topic = "meshtastic.receive.text"
# We don't throw if the utf8 is invalid in the text message. Instead we just don't populate
@@ -490,7 +487,7 @@ class MeshInterface:
logging.error(f"Malformatted utf8 in text message: {ex}")
# decode position protobufs and update nodedb, provide decoded version as "position" in the published msg
if portnum == portnums_pb2.PortNum.POSITION_APP:
if portnum == portnums_pb2.PortNum.Name(portnums_pb2.PortNum.POSITION_APP):
topic = "meshtastic.receive.position"
pb = mesh_pb2.Position()
pb.ParseFromString(meshPacket.decoded.data.payload)
@@ -501,7 +498,7 @@ class MeshInterface:
self._getOrCreateByNum(asDict["from"])["position"] = p
# decode user protobufs and update nodedb, provide decoded version as "position" in the published msg
if portnum == portnums_pb2.PortNum.NODEINFO_APP:
if portnum == portnums_pb2.PortNum.Name(portnums_pb2.PortNum.NODEINFO_APP):
topic = "meshtastic.receive.user"
pb = mesh_pb2.User()
pb.ParseFromString(meshPacket.decoded.data.payload)