meshtastic.blemeshtasticPrimary class: StreamInterface Install with pip: "pip3 install meshtastic" Source code on github
@@ -34,7 +34,7 @@ node in the mesh. This is a read-only datastructure.We use a publish-subscribe model to communicate asynchronous events. Available topics:
@@ -48,7 +48,7 @@ If you want to see all packets, simply subscribe to "meshtastic.receive".import meshtastic
from pubsub import pub
@@ -56,11 +56,13 @@ def onReceive(packet): # called when a packet arrives
print(f"Received: {packet}")
def onConnection(): # called when we (re)connect to the radio
- interface.sendText("hello mesh") # defaults to broadcast, specify a destination ID if you wish
+ # defaults to broadcast, specify a destination ID if you wish
+ interface.sendText("hello mesh")
pub.subscribe(onReceive, "meshtastic.receive")
pub.subscribe(onConnection, "meshtastic.connection.established")
-interface = meshtastic.StreamInterface() # By default will try to find a meshtastic device, otherwise provide a device path like /dev/ttyUSB0
+# By default will try to find a meshtastic device, otherwise provide a device path like /dev/ttyUSB0
+interface = meshtastic.StreamInterface()
"""
-## an API for Meshtastic devices
+# an API for Meshtastic devices
Primary class: StreamInterface
Install with pip: "[pip3 install meshtastic](https://pypi.org/project/meshtastic/)"
@@ -76,26 +78,26 @@ Source code on [github](https://github.com/meshtastic/Meshtastic-python)
properties of StreamInterface:
-- radioConfig - Current radio configuration and device settings, if you write to this the new settings will be applied to
+- radioConfig - Current radio configuration and device settings, if you write to this the new settings will be applied to
the device.
-- nodes - The database of received nodes. Includes always up-to-date location and username information for each
+- nodes - The database of received nodes. Includes always up-to-date location and username information for each
node in the mesh. This is a read-only datastructure.
- myNodeInfo - Contains read-only information about the local radio device (software version, hardware version, etc)
-## Published PubSub topics
+# Published PubSub topics
We use a [publish-subscribe](https://pypubsub.readthedocs.io/en/v4.0.3/) model to communicate asynchronous events. Available
topics:
- meshtastic.connection.established - published once we've successfully connected to the radio and downloaded the node DB
- meshtastic.connection.lost - published once we've lost our link to the radio
-- meshtastic.receive.position(packet) - delivers a received packet as a dictionary, if you only care about a particular
+- meshtastic.receive.position(packet) - delivers a received packet as a dictionary, if you only care about a particular
type of packet, you should subscribe to the full topic name. If you want to see all packets, simply subscribe to "meshtastic.receive".
- meshtastic.receive.user(packet)
- meshtastic.receive.data(packet)
- meshtastic.node.updated(node = NodeInfo) - published when a node in the DB changes (appears, location changed, username changed, etc...)
-## Example Usage
+# Example Usage
```
import meshtastic
from pubsub import pub
@@ -104,16 +106,19 @@ def onReceive(packet): # called when a packet arrives
print(f"Received: {packet}")
def onConnection(): # called when we (re)connect to the radio
- interface.sendText("hello mesh") # defaults to broadcast, specify a destination ID if you wish
+ # defaults to broadcast, specify a destination ID if you wish
+ interface.sendText("hello mesh")
pub.subscribe(onReceive, "meshtastic.receive")
pub.subscribe(onConnection, "meshtastic.connection.established")
-interface = meshtastic.StreamInterface() # By default will try to find a meshtastic device, otherwise provide a device path like /dev/ttyUSB0
+# By default will try to find a meshtastic device, otherwise provide a device path like /dev/ttyUSB0
+interface = meshtastic.StreamInterface()
```
"""
+import pygatt
import google.protobuf.json_format
import serial
import threading
@@ -153,7 +158,7 @@ class MeshInterface:
self.isConnected = False
self._startConfig()
- def sendText(self, text, destinationId=BROADCAST_ADDR):
+ def sendText(self, text, destinationId=BROADCAST_ADDR, wantAck=False):
"""Send a utf8 string to some other node, if the node has a display it will also be shown on the device.
Arguments:
@@ -163,30 +168,30 @@ class MeshInterface:
destinationId {nodeId or nodeNum} -- where to send this message (default: {BROADCAST_ADDR})
"""
self.sendData(text.encode("utf-8"), destinationId,
- dataType=mesh_pb2.Data.CLEAR_TEXT)
+ dataType=mesh_pb2.Data.CLEAR_TEXT, wantAck=wantAck)
- def sendData(self, byteData, destinationId=BROADCAST_ADDR, dataType=mesh_pb2.Data.OPAQUE):
+ def sendData(self, byteData, destinationId=BROADCAST_ADDR, dataType=mesh_pb2.Data.OPAQUE, wantAck=False):
"""Send a data packet to some other node"""
meshPacket = mesh_pb2.MeshPacket()
- meshPacket.payload.data.payload = byteData
- meshPacket.payload.data.typ = dataType
- self.sendPacket(meshPacket, destinationId)
+ meshPacket.decoded.data.payload = byteData
+ meshPacket.decoded.data.typ = dataType
+ self.sendPacket(meshPacket, destinationId, wantAck=wantAck)
- def sendPacket(self, meshPacket, destinationId=BROADCAST_ADDR):
- """Send a MeshPacket to the specified node (or if unspecified, broadcast).
+ def sendPacket(self, meshPacket, destinationId=BROADCAST_ADDR, wantAck=False):
+ """Send a MeshPacket to the specified node (or if unspecified, broadcast).
You probably don't want this - use sendData instead."""
toRadio = mesh_pb2.ToRadio()
# FIXME add support for non broadcast addresses
if isinstance(destinationId, int):
nodeNum = destinationId
- elif nodeNum == BROADCAST_ADDR:
+ elif destinationId == BROADCAST_ADDR:
nodeNum = 255
else:
- raise Exception(
- "invalid destination addr, we don't yet support nodeid lookup")
+ nodeNum = self.nodes[destinationId].num
meshPacket.to = nodeNum
+ meshPacket.want_ack = wantAck
toRadio.packet.CopyFrom(meshPacket)
self._sendToRadio(toRadio)
@@ -232,16 +237,17 @@ class MeshInterface:
Called by subclasses."""
fromRadio = mesh_pb2.FromRadio()
fromRadio.ParseFromString(fromRadioBytes)
- json = google.protobuf.json_format.MessageToJson(fromRadio)
- logging.debug(f"Received: {json}")
+ asDict = google.protobuf.json_format.MessageToDict(fromRadio)
+ logging.debug(f"Received: {asDict}")
if fromRadio.HasField("my_info"):
self.myInfo = fromRadio.my_info
elif fromRadio.HasField("radio"):
self.radioConfig = fromRadio.radio
elif fromRadio.HasField("node_info"):
- node = fromRadio.node_info
- self._nodesByNum[node.num] = node
- self.nodes[node.user.id] = node
+ node = asDict["nodeInfo"]
+ self._fixupPosition(node["position"])
+ self._nodesByNum[node["num"]] = node
+ self.nodes[node["user"]["id"]] = node
elif fromRadio.config_complete_id == MY_CONFIG_ID:
# we ignore the config_complete_id, it is unneeded for our stream API fromRadio.config_complete_id
self._connected()
@@ -253,12 +259,31 @@ class MeshInterface:
else:
logging.warn("Unexpected FromRadio payload")
+ def _fixupPosition(self, position):
+ """Convert integer lat/lon into floats
+
+ Arguments:
+ position {Position dictionary} -- object ot fix up
+ """
+ if "latitudeI" in position:
+ position["latitude"] = position["latitudeI"] * 1e-7
+ if "longitudeI" in position:
+ position["longitude"] = position["longitudeI"] * 1e-7
+
def _nodeNumToId(self, num):
+ """Map a node node number to a node ID
+
+ Arguments:
+ num {int} -- Node number
+
+ Returns:
+ string -- Node ID
+ """
if num == BROADCAST_NUM:
return BROADCAST_ADDR
try:
- return self._nodesByNum[num].user.id
+ return self._nodesByNum[num]["user"]["id"]
except:
logging.error("Node not found for fromId")
return None
@@ -278,29 +303,80 @@ class MeshInterface:
asDict["toId"] = self._nodeNumToId(asDict["to"])
# We could provide our objects as DotMaps - which work with . notation or as dictionaries
- #asObj = DotMap(asDict)
- topic = None
- if meshPacket.payload.HasField("position"):
+ # asObj = DotMap(asDict)
+ topic = "meshtastic.receive" # Generic unknown packet type
+ if meshPacket.decoded.HasField("position"):
topic = "meshtastic.receive.position"
- # FIXME, update node DB as needed
- if meshPacket.payload.HasField("user"):
+ p = asDict["decoded"]["position"]
+ self._fixupPosition(p)
+ # update node DB as needed
+ self._nodesByNum[asDict["from"]]["position"] = p
+
+ if meshPacket.decoded.HasField("user"):
topic = "meshtastic.receive.user"
- # FIXME, update node DB as needed
- if meshPacket.payload.HasField("data"):
+ u = asDict["decoded"]["user"]
+ # update node DB as needed
+ self._nodesByNum[asDict["from"]]["user"] = u
+
+ if meshPacket.decoded.HasField("data"):
topic = "meshtastic.receive.data"
# For text messages, we go ahead and decode the text to ascii for our users
- # if asObj.payload.data.typ == "CLEAR_TEXT":
- # asObj.payload.data.text = asObj.payload.data.payload.decode(
- # "utf-8")
+ if asDict["decoded"]["data"]["typ"] == "CLEAR_TEXT":
+ asDict["decoded"]["data"]["text"] = meshPacket.decoded.data.payload.decode(
+ "utf-8")
pub.sendMessage(topic, packet=asDict, interface=self)
+# Our standard BLE characteristics
+TORADIO_UUID = "f75c76d2-129e-4dad-a1dd-7866124401e7"
+FROMRADIO_UUID = "8ba2bcc2-ee02-4a55-a531-c525c5e454d5"
+FROMNUM_UUID = "ed9da18c-a800-4f66-a670-aa7547e34453"
+
+
+class BLEInterface(MeshInterface):
+ """A not quite ready - FIXME - BLE interface to devices"""
+
+ def __init__(self, address, debugOut=None):
+ self.address = address
+ self.adapter = pygatt.GATTToolBackend() # BGAPIBackend()
+ self.adapter.start()
+ logging.debug(f"Connecting to {self.address}")
+ self.device = self.adapter.connect(address)
+ logging.debug("Connected to device")
+ # fromradio = self.device.char_read(FROMRADIO_UUID)
+ MeshInterface.__init__(self, debugOut=debugOut)
+
+ self._readFromRadio() # read the initial responses
+
+ def handle_data(handle, data):
+ self._handleFromRadio(data)
+
+ self.device.subscribe(FROMNUM_UUID, callback=handle_data)
+
+ def _sendToRadio(self, toRadio):
+ """Send a ToRadio protobuf to the device"""
+ logging.debug(f"Sending: {toRadio}")
+ b = toRadio.SerializeToString()
+ self.device.char_write(TORADIO_UUID, b)
+
+ def close(self):
+ self.adapter.stop()
+
+ def _readFromRadio(self):
+ wasEmpty = False
+ while not wasEmpty:
+ b = self.device.char_read(FROMRADIO_UUID)
+ wasEmpty = len(b) == 0
+ if not wasEmpty:
+ self._handleFromRadio(b)
+
+
class StreamInterface(MeshInterface):
"""Interface class for meshtastic devices over a stream link (serial, TCP, etc)"""
def __init__(self, devPath=None, debugOut=None):
- """Constructor, opens a connection to a specified serial port, or if unspecified try to
+ """Constructor, opens a connection to a specified serial port, or if unspecified try to
find one Meshtastic device by probing
Keyword Arguments:
@@ -403,6 +479,10 @@ class StreamInterface(MeshInterface):
Sub-modules
+meshtastic.ble-
+
+
meshtastic.mesh_pb2-
@@ -424,6 +504,86 @@ class StreamInterface(MeshInterface):
Classes
+
+class BLEInterface
+(address, debugOut=None)
+-
+
A not quite ready - FIXME - BLE interface to devices
+Constructor
+
+
+Expand source code
+
+class BLEInterface(MeshInterface):
+ """A not quite ready - FIXME - BLE interface to devices"""
+
+ def __init__(self, address, debugOut=None):
+ self.address = address
+ self.adapter = pygatt.GATTToolBackend() # BGAPIBackend()
+ self.adapter.start()
+ logging.debug(f"Connecting to {self.address}")
+ self.device = self.adapter.connect(address)
+ logging.debug("Connected to device")
+ # fromradio = self.device.char_read(FROMRADIO_UUID)
+ MeshInterface.__init__(self, debugOut=debugOut)
+
+ self._readFromRadio() # read the initial responses
+
+ def handle_data(handle, data):
+ self._handleFromRadio(data)
+
+ self.device.subscribe(FROMNUM_UUID, callback=handle_data)
+
+ def _sendToRadio(self, toRadio):
+ """Send a ToRadio protobuf to the device"""
+ logging.debug(f"Sending: {toRadio}")
+ b = toRadio.SerializeToString()
+ self.device.char_write(TORADIO_UUID, b)
+
+ def close(self):
+ self.adapter.stop()
+
+ def _readFromRadio(self):
+ wasEmpty = False
+ while not wasEmpty:
+ b = self.device.char_read(FROMRADIO_UUID)
+ wasEmpty = len(b) == 0
+ if not wasEmpty:
+ self._handleFromRadio(b)
+
+Ancestors
+
+Methods
+
+
+def close(self)
+-
+
+
+
+Expand source code
+
+def close(self):
+ self.adapter.stop()
+
+
+
+Inherited members
+
+MeshInterface:
+
+
+
class MeshInterface
(debugOut=None)
@@ -456,7 +616,7 @@ debugOut
self.isConnected = False
self._startConfig()
- def sendText(self, text, destinationId=BROADCAST_ADDR):
+ def sendText(self, text, destinationId=BROADCAST_ADDR, wantAck=False):
"""Send a utf8 string to some other node, if the node has a display it will also be shown on the device.
Arguments:
@@ -466,30 +626,30 @@ debugOut
destinationId {nodeId or nodeNum} -- where to send this message (default: {BROADCAST_ADDR})
"""
self.sendData(text.encode("utf-8"), destinationId,
- dataType=mesh_pb2.Data.CLEAR_TEXT)
+ dataType=mesh_pb2.Data.CLEAR_TEXT, wantAck=wantAck)
- def sendData(self, byteData, destinationId=BROADCAST_ADDR, dataType=mesh_pb2.Data.OPAQUE):
+ def sendData(self, byteData, destinationId=BROADCAST_ADDR, dataType=mesh_pb2.Data.OPAQUE, wantAck=False):
"""Send a data packet to some other node"""
meshPacket = mesh_pb2.MeshPacket()
- meshPacket.payload.data.payload = byteData
- meshPacket.payload.data.typ = dataType
- self.sendPacket(meshPacket, destinationId)
+ meshPacket.decoded.data.payload = byteData
+ meshPacket.decoded.data.typ = dataType
+ self.sendPacket(meshPacket, destinationId, wantAck=wantAck)
- def sendPacket(self, meshPacket, destinationId=BROADCAST_ADDR):
- """Send a MeshPacket to the specified node (or if unspecified, broadcast).
+ def sendPacket(self, meshPacket, destinationId=BROADCAST_ADDR, wantAck=False):
+ """Send a MeshPacket to the specified node (or if unspecified, broadcast).
You probably don't want this - use sendData instead."""
toRadio = mesh_pb2.ToRadio()
# FIXME add support for non broadcast addresses
if isinstance(destinationId, int):
nodeNum = destinationId
- elif nodeNum == BROADCAST_ADDR:
+ elif destinationId == BROADCAST_ADDR:
nodeNum = 255
else:
- raise Exception(
- "invalid destination addr, we don't yet support nodeid lookup")
+ nodeNum = self.nodes[destinationId].num
meshPacket.to = nodeNum
+ meshPacket.want_ack = wantAck
toRadio.packet.CopyFrom(meshPacket)
self._sendToRadio(toRadio)
@@ -535,16 +695,17 @@ debugOut
Called by subclasses."""
fromRadio = mesh_pb2.FromRadio()
fromRadio.ParseFromString(fromRadioBytes)
- json = google.protobuf.json_format.MessageToJson(fromRadio)
- logging.debug(f"Received: {json}")
+ asDict = google.protobuf.json_format.MessageToDict(fromRadio)
+ logging.debug(f"Received: {asDict}")
if fromRadio.HasField("my_info"):
self.myInfo = fromRadio.my_info
elif fromRadio.HasField("radio"):
self.radioConfig = fromRadio.radio
elif fromRadio.HasField("node_info"):
- node = fromRadio.node_info
- self._nodesByNum[node.num] = node
- self.nodes[node.user.id] = node
+ node = asDict["nodeInfo"]
+ self._fixupPosition(node["position"])
+ self._nodesByNum[node["num"]] = node
+ self.nodes[node["user"]["id"]] = node
elif fromRadio.config_complete_id == MY_CONFIG_ID:
# we ignore the config_complete_id, it is unneeded for our stream API fromRadio.config_complete_id
self._connected()
@@ -556,12 +717,31 @@ debugOut
else:
logging.warn("Unexpected FromRadio payload")
+ def _fixupPosition(self, position):
+ """Convert integer lat/lon into floats
+
+ Arguments:
+ position {Position dictionary} -- object ot fix up
+ """
+ if "latitudeI" in position:
+ position["latitude"] = position["latitudeI"] * 1e-7
+ if "longitudeI" in position:
+ position["longitude"] = position["longitudeI"] * 1e-7
+
def _nodeNumToId(self, num):
+ """Map a node node number to a node ID
+
+ Arguments:
+ num {int} -- Node number
+
+ Returns:
+ string -- Node ID
+ """
if num == BROADCAST_NUM:
return BROADCAST_ADDR
try:
- return self._nodesByNum[num].user.id
+ return self._nodesByNum[num]["user"]["id"]
except:
logging.error("Node not found for fromId")
return None
@@ -581,31 +761,39 @@ debugOut
asDict["toId"] = self._nodeNumToId(asDict["to"])
# We could provide our objects as DotMaps - which work with . notation or as dictionaries
- #asObj = DotMap(asDict)
- topic = None
- if meshPacket.payload.HasField("position"):
+ # asObj = DotMap(asDict)
+ topic = "meshtastic.receive" # Generic unknown packet type
+ if meshPacket.decoded.HasField("position"):
topic = "meshtastic.receive.position"
- # FIXME, update node DB as needed
- if meshPacket.payload.HasField("user"):
+ p = asDict["decoded"]["position"]
+ self._fixupPosition(p)
+ # update node DB as needed
+ self._nodesByNum[asDict["from"]]["position"] = p
+
+ if meshPacket.decoded.HasField("user"):
topic = "meshtastic.receive.user"
- # FIXME, update node DB as needed
- if meshPacket.payload.HasField("data"):
+ u = asDict["decoded"]["user"]
+ # update node DB as needed
+ self._nodesByNum[asDict["from"]]["user"] = u
+
+ if meshPacket.decoded.HasField("data"):
topic = "meshtastic.receive.data"
# For text messages, we go ahead and decode the text to ascii for our users
- # if asObj.payload.data.typ == "CLEAR_TEXT":
- # asObj.payload.data.text = asObj.payload.data.payload.decode(
- # "utf-8")
+ if asDict["decoded"]["data"]["typ"] == "CLEAR_TEXT":
+ asDict["decoded"]["data"]["text"] = meshPacket.decoded.data.payload.decode(
+ "utf-8")
pub.sendMessage(topic, packet=asDict, interface=self)
-def sendData(self, byteData, destinationId='all', dataType=0)
+def sendData(self, byteData, destinationId='all', dataType=0, wantAck=False)
Send a data packet to some other node
def sendData(self, byteData, destinationId=BROADCAST_ADDR, dataType=mesh_pb2.Data.OPAQUE):
+def sendData(self, byteData, destinationId=BROADCAST_ADDR, dataType=mesh_pb2.Data.OPAQUE, wantAck=False):
"""Send a data packet to some other node"""
meshPacket = mesh_pb2.MeshPacket()
- meshPacket.payload.data.payload = byteData
- meshPacket.payload.data.typ = dataType
- self.sendPacket(meshPacket, destinationId)
+ meshPacket.decoded.data.payload = byteData
+ meshPacket.decoded.data.typ = dataType
+ self.sendPacket(meshPacket, destinationId, wantAck=wantAck)
-def sendPacket(self, meshPacket, destinationId='all')
+def sendPacket(self, meshPacket, destinationId='all', wantAck=False)
Send a MeshPacket to the specified node (or if unspecified, broadcast). @@ -631,27 +819,27 @@ You probably don't want this - use sendData instead.
def sendPacket(self, meshPacket, destinationId=BROADCAST_ADDR):
- """Send a MeshPacket to the specified node (or if unspecified, broadcast).
+def sendPacket(self, meshPacket, destinationId=BROADCAST_ADDR, wantAck=False):
+ """Send a MeshPacket to the specified node (or if unspecified, broadcast).
You probably don't want this - use sendData instead."""
toRadio = mesh_pb2.ToRadio()
# FIXME add support for non broadcast addresses
if isinstance(destinationId, int):
nodeNum = destinationId
- elif nodeNum == BROADCAST_ADDR:
+ elif destinationId == BROADCAST_ADDR:
nodeNum = 255
else:
- raise Exception(
- "invalid destination addr, we don't yet support nodeid lookup")
+ nodeNum = self.nodes[destinationId].num
meshPacket.to = nodeNum
+ meshPacket.want_ack = wantAck
toRadio.packet.CopyFrom(meshPacket)
self._sendToRadio(toRadio)
-def sendText(self, text, destinationId='all')
+def sendText(self, text, destinationId='all', wantAck=False)
Send a utf8 string to some other node, if the node has a display it will also be shown on the device.
@@ -663,7 +851,7 @@ destinationId {nodeId or nodeNum} – where to send this message (default: {def sendText(self, text, destinationId=BROADCAST_ADDR):
+def sendText(self, text, destinationId=BROADCAST_ADDR, wantAck=False):
"""Send a utf8 string to some other node, if the node has a display it will also be shown on the device.
Arguments:
@@ -673,7 +861,7 @@ destinationId {nodeId or nodeNum} – where to send this message (default: {
destinationId {nodeId or nodeNum} -- where to send this message (default: {BROADCAST_ADDR})
"""
self.sendData(text.encode("utf-8"), destinationId,
- dataType=mesh_pb2.Data.CLEAR_TEXT)
+ dataType=mesh_pb2.Data.CLEAR_TEXT, wantAck=wantAck)
@@ -723,7 +911,7 @@ debugOut {stream} – If a stream is provided, any debug serial output from
"""Interface class for meshtastic devices over a stream link (serial, TCP, etc)"""
def __init__(self, devPath=None, debugOut=None):
- """Constructor, opens a connection to a specified serial port, or if unspecified try to
+ """Constructor, opens a connection to a specified serial port, or if unspecified try to
find one Meshtastic device by probing
Keyword Arguments:
@@ -874,6 +1062,7 @@ debugOut {stream} – If a stream is provided, any debug serial output from
Sub-modules
+meshtastic.blemeshtastic.mesh_pb2meshtastic.testmeshtastic.utilClasses
-
+
BLEInterface
+
+close
+
+-
MeshInterface
sendData
@@ -1428,6 +1603,41 @@ DESCRIPTOR._options = None
+
+class ManufacturingData
+(...)
+A ProtocolMessage
var DESCRIPTORvar FRADIOFREQ_FIELD_NUMBERvar HW_MODEL_FIELD_NUMBERvar HW_VERSION_FIELD_NUMBERvar SELFTEST_RESULT_FIELD_NUMBER
class MeshPacket
(...)
@@ -1441,19 +1651,27 @@ DESCRIPTOR._options = None
Class variables
+var DECODED_FIELD_NUMBER-
+
+
var DESCRIPTOR-
+var ENCRYPTED_FIELD_NUMBER-
+
+
var FROM_FIELD_NUMBER-
-var ID_FIELD_NUMBERvar HOP_LIMIT_FIELD_NUMBER-
-var PAYLOAD_FIELD_NUMBERvar ID_FIELD_NUMBER-
@@ -1469,6 +1687,10 @@ DESCRIPTOR._options = None
-
+var WANT_ACK_FIELD_NUMBER-
+
+
@@ -1543,6 +1765,10 @@ DESCRIPTOR._options = None
-
+var NEXT_HOP_FIELD_NUMBER-
+
+
var NUM_FIELD_NUMBER-
@@ -1586,11 +1812,19 @@ DESCRIPTOR._options = None
-
- var LATITUDE_FIELD_NUMBERvar LATITUDE_D_FIELD_NUMBER-
-var LONGITUDE_FIELD_NUMBERvar LATITUDE_I_FIELD_NUMBER-
+
+
+var LONGITUDE_D_FIELD_NUMBER-
+
+
+var LONGITUDE_I_FIELD_NUMBER-
@@ -1675,10 +1909,30 @@ DESCRIPTOR._options = None
-
+var DEST_FIELD_NUMBER-
+
+
+var FAIL_ID_FIELD_NUMBER-
+
+
var POSITION_FIELD_NUMBER-
+var REPLY_FIELD_NUMBER-
+
+
+var REQUEST_FIELD_NUMBER-
+
+
+var SUCCESS_ID_FIELD_NUMBER-
+
+
var USER_FIELD_NUMBER-
@@ -1837,15 +2091,28 @@ DESCRIPTOR._options = None
-
+
ManufacturingData
+
+
+-
MeshPacket
-
@@ -1867,6 +2134,7 @@ DESCRIPTOR._options = None
NodeInfo
DESCRIPTORNEXT_HOP_FIELD_NUMBERNUM_FIELD_NUMBERPOSITION_FIELD_NUMBERSNR_FIELD_NUMBERALTITUDE_FIELD_NUMBERBATTERY_LEVEL_FIELD_NUMBERDESCRIPTORLATITUDE_FIELD_NUMBERLONGITUDE_FIELD_NUMBERLATITUDE_D_FIELD_NUMBERLATITUDE_I_FIELD_NUMBERLONGITUDE_D_FIELD_NUMBERLONGITUDE_I_FIELD_NUMBERTIME_FIELD_NUMBER
@@ -1905,7 +2175,12 @@ DESCRIPTOR._options = None
diff --git a/docs/meshtastic/test.html b/docs/meshtastic/test.html
index 1f28d9e..1a06436 100644
--- a/docs/meshtastic/test.html
+++ b/docs/meshtastic/test.html
@@ -49,7 +49,7 @@ def onReceive(packet, interface):
print(f"From {interface.devPath}: {packet}")
p = DotMap(packet)
- if p.payload.data.typ == "CLEAR_TEXT":
+ if p.decoded.data.typ == "CLEAR_TEXT":
# We only care a about clear text packets
receivedPackets.append(p)
@@ -82,11 +82,11 @@ def testSend(fromInterface, toInterface):
toNode = toInterface.myInfo.my_node_num
# FIXME, hack to test broadcast
- toNode = 255
+ # toNode = 255
logging.info(f"Sending test packet from {fromNode} to {toNode}")
- fromInterface.sendText(f"Test {testNumber}", toNode)
- time.sleep(40)
+ fromInterface.sendText(f"Test {testNumber}", toNode, wantAck=True)
+ time.sleep(30)
return (len(receivedPackets) >= 1)
@@ -212,7 +212,7 @@ def testAll():
print(f"From {interface.devPath}: {packet}")
p = DotMap(packet)
- if p.payload.data.typ == "CLEAR_TEXT":
+ if p.decoded.data.typ == "CLEAR_TEXT":
# We only care a about clear text packets
receivedPackets.append(p)
@@ -314,11 +314,11 @@ toInterface {[type]} – [description]
toNode = toInterface.myInfo.my_node_num
# FIXME, hack to test broadcast
- toNode = 255
+ # toNode = 255
logging.info(f"Sending test packet from {fromNode} to {toNode}")
- fromInterface.sendText(f"Test {testNumber}", toNode)
- time.sleep(40)
+ fromInterface.sendText(f"Test {testNumber}", toNode, wantAck=True)
+ time.sleep(30)
return (len(receivedPackets) >= 1)
diff --git a/setup.py b/setup.py
index 2896e29..17e08a0 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ with open("README.md", "r") as fh:
# This call to setup() does all the work
setup(
name="meshtastic",
- version="0.5.2",
+ version="0.5.3",
description="Python API & client shell for talking to Meshtastic devices",
long_description=long_description,
long_description_content_type="text/markdown",
@@ -26,7 +26,7 @@ setup(
packages=["meshtastic"],
include_package_data=True,
install_requires=["pyserial>=3.4", "protobuf>=3.6.1",
- "pypubsub>=4.0.3", "dotmap>=1.3.14" ],
+ "pypubsub>=4.0.3", "dotmap>=1.3.14"],
python_requires='>=3.4',
entry_points={
"console_scripts": [