mirror/python
1
0
Fork 0
mirror of https://github.com/meshtastic/python.git synced 2025-12-28 18:37:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

add (untested for now) new position/user message handling

Browse Source
This commit is contained in:
Kevin Hester
2020-12-06 09:54:58 +08:00
parent 2cdf38511f
commit fa2f0bdc60
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
meshtastic/__init__.py
View File

@@ -430,21 +430,11 @@ class MeshInterface:
# We could provide our objects as DotMaps - which work with . notation or as dictionaries
# asObj = DotMap(asDict)
topic = "meshtastic.receive" # Generic unknown packet type
if meshPacket.decoded.HasField("position"):
topic = "meshtastic.receive.position"
p = asDict["decoded"]["position"]
self._fixupPosition(p)
# update node DB as needed
self._getOrCreateByNum(asDict["from"])["position"] = p
if meshPacket.decoded.HasField("user"):
topic = "meshtastic.receive.user"
u = asDict["decoded"]["user"]
# update node DB as needed
n = self._getOrCreateByNum(asDict["from"])
n["user"] = u
# We now have a node ID, make sure it is uptodate in that table
self.nodes[u["id"]] = u
# Warn users if firmware doesn't use new portnum based data encodings
# But do not crash, because the lib will still basically work and ignore those packet types
if meshPacket.decoded.HasField("user") or meshPacket.decoded.HasField("position"):
logging.error("The device firmware is too old to work with this version of the python library. Please update firmware to 1.20 or later")
if meshPacket.decoded.HasField("data"):
topic = "meshtastic.receive.data"
@@ -469,6 +459,30 @@ class MeshInterface:
except Exception as ex:
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 asDict["decoded"]["data"]["portnum"] == portnums_pb2.PortNum.POSITION_APP:
topic = "meshtastic.receive.position"
pb = mesh_pb2.Position()
pb.ParseFromString(meshPacket.decoded.data.payload)
p = google.protobuf.json_format.MessageToDict(pb)
self._fixupPosition(p)
asDict["decoded"]["data"]["position"] = p
# update node DB as needed
self._getOrCreateByNum(asDict["from"])["position"] = p
# decode user protobufs and update nodedb, provide decoded version as "position" in the published msg
if asDict["decoded"]["data"]["user"] == portnums_pb2.PortNum.NODEINFO_APP:
topic = "meshtastic.receive.user"
pb = mesh_pb2.User()
pb.ParseFromString(meshPacket.decoded.data.payload)
u = google.protobuf.json_format.MessageToDict(pb)
asDict["decoded"]["data"]["user"] = u
# update node DB as needed
n = self._getOrCreateByNum(asDict["from"])
n["user"] = u
# We now have a node ID, make sure it is uptodate in that table
self.nodes[u["id"]] = u
pub.sendMessage(topic, packet=asDict, interface=self)