diff --git a/docs/meshtastic/index.html b/docs/meshtastic/index.html index c77e70e..2a1632e 100644 --- a/docs/meshtastic/index.html +++ b/docs/meshtastic/index.html @@ -256,7 +256,8 @@ class MeshInterface: def showInfo(self, file=sys.stdout): """Show human readable summary about this object""" - print(f"Owner: {self.getLongName()} ({self.getShortName()})", file=file) + print( + f"Owner: {self.getLongName()} ({self.getShortName()})", file=file) print(f"\nMy info: {stripnl(MessageToJson(self.myInfo))}", file=file) print("\nNodes in mesh:", file=file) for n in self.nodes.values(): @@ -278,7 +279,7 @@ class MeshInterface: if not includeSelf and node['num'] == self.localNode.nodeNum: continue - row = { "N": 0 } + row = {"N": 0} user = node.get('user') if user: @@ -299,8 +300,8 @@ class MeshInterface: row.update({ "SNR": formatFloat(node.get("snr"), 2, " dB"), - "LastHeard": getLH( node.get("lastHeard")), - "Since": getTimeAgo( node.get("lastHeard")), + "LastHeard": getLH(node.get("lastHeard")), + "Since": getTimeAgo(node.get("lastHeard")), }) rows.append(row) @@ -311,7 +312,8 @@ class MeshInterface: for i, row in enumerate(rows): row['N'] = i+1 - print(tabulate(rows, headers='keys', missingval='N/A', tablefmt='fancy_grid'), file=file) + print(tabulate(rows, headers='keys', missingval='N/A', + tablefmt='fancy_grid'), file=file) def getNode(self, nodeId): """Return a node object which contains device settings and channel info""" @@ -537,8 +539,7 @@ class MeshInterface: p = mesh_pb2.ToRadio() self._sendToRadio(p) - callback() # run our periodic callback now, it will make another timer if necessary - + callback() # run our periodic callback now, it will make another timer if necessary def _connected(self): """Called by this class to tell clients we are now fully connected to a node @@ -847,7 +848,8 @@ class StreamInterface(MeshInterface): self._wantExit = False # FIXME, figure out why daemon=True causes reader thread to exit too early - self._rxThread = threading.Thread(target=self.__reader, args=(), daemon=True) + self._rxThread = threading.Thread( + target=self.__reader, args=(), daemon=True) MeshInterface.__init__(self, debugOut=debugOut, noProto=noProto) @@ -865,15 +867,15 @@ class StreamInterface(MeshInterface): """ # Send some bogus UART characters to force a sleeping device to wake, and if the reading statemachine was parsing a bad packet make sure - # we write enought start bytes to force it to resync - p = bytearray([START1] * 32) + # we write enought start bytes to force it to resync (we don't use START1 because we want to ensure it is looking for START1) + p = bytearray([START2] * 32) self._writeBytes(p) time.sleep(0.1) # wait 100ms to give device time to start running self._rxThread.start() self._startConfig() - + if not self.noProto: # Wait for the db download if using the protocol self._waitConnected() @@ -1383,7 +1385,8 @@ noProto – If True, don't try to run our protocol on the link - just be a d def showInfo(self, file=sys.stdout): """Show human readable summary about this object""" - print(f"Owner: {self.getLongName()} ({self.getShortName()})", file=file) + print( + f"Owner: {self.getLongName()} ({self.getShortName()})", file=file) print(f"\nMy info: {stripnl(MessageToJson(self.myInfo))}", file=file) print("\nNodes in mesh:", file=file) for n in self.nodes.values(): @@ -1405,7 +1408,7 @@ noProto – If True, don't try to run our protocol on the link - just be a d if not includeSelf and node['num'] == self.localNode.nodeNum: continue - row = { "N": 0 } + row = {"N": 0} user = node.get('user') if user: @@ -1426,8 +1429,8 @@ noProto – If True, don't try to run our protocol on the link - just be a d row.update({ "SNR": formatFloat(node.get("snr"), 2, " dB"), - "LastHeard": getLH( node.get("lastHeard")), - "Since": getTimeAgo( node.get("lastHeard")), + "LastHeard": getLH(node.get("lastHeard")), + "Since": getTimeAgo(node.get("lastHeard")), }) rows.append(row) @@ -1438,7 +1441,8 @@ noProto – If True, don't try to run our protocol on the link - just be a d for i, row in enumerate(rows): row['N'] = i+1 - print(tabulate(rows, headers='keys', missingval='N/A', tablefmt='fancy_grid'), file=file) + print(tabulate(rows, headers='keys', missingval='N/A', + tablefmt='fancy_grid'), file=file) def getNode(self, nodeId): """Return a node object which contains device settings and channel info""" @@ -1664,8 +1668,7 @@ noProto – If True, don't try to run our protocol on the link - just be a d p = mesh_pb2.ToRadio() self._sendToRadio(p) - callback() # run our periodic callback now, it will make another timer if necessary - + callback() # run our periodic callback now, it will make another timer if necessary def _connected(self): """Called by this class to tell clients we are now fully connected to a node @@ -2172,7 +2175,8 @@ wantResponse – True if you want the service on the other side to send an a 
def showInfo(self, file=sys.stdout):
     """Show human readable summary about this object"""
 
-    print(f"Owner: {self.getLongName()} ({self.getShortName()})", file=file)
+    print(
+        f"Owner: {self.getLongName()} ({self.getShortName()})", file=file)
     print(f"\nMy info: {stripnl(MessageToJson(self.myInfo))}", file=file)
     print("\nNodes in mesh:", file=file)
     for n in self.nodes.values():
@@ -2204,7 +2208,7 @@ wantResponse – True if you want the service on the other side to send an a
         if not includeSelf and node['num'] == self.localNode.nodeNum:
             continue
 
-        row = { "N": 0 }
+        row = {"N": 0}
 
         user = node.get('user')
         if user:
@@ -2225,8 +2229,8 @@ wantResponse – True if you want the service on the other side to send an a
 
         row.update({
             "SNR":       formatFloat(node.get("snr"), 2, " dB"),
-            "LastHeard": getLH(      node.get("lastHeard")),
-            "Since":     getTimeAgo( node.get("lastHeard")),
+            "LastHeard": getLH(node.get("lastHeard")),
+            "Since":     getTimeAgo(node.get("lastHeard")),
         })
 
         rows.append(row)
@@ -2237,7 +2241,8 @@ wantResponse – True if you want the service on the other side to send an a
     for i, row in enumerate(rows):
         row['N'] = i+1
 
-    print(tabulate(rows, headers='keys', missingval='N/A', tablefmt='fancy_grid'), file=file)
+ print(tabulate(rows, headers='keys', missingval='N/A', + tablefmt='fancy_grid'), file=file)
@@ -2408,7 +2413,8 @@ debugOut {stream} – If a stream is provided, any debug serial output from self._wantExit = False # FIXME, figure out why daemon=True causes reader thread to exit too early - self._rxThread = threading.Thread(target=self.__reader, args=(), daemon=True) + self._rxThread = threading.Thread( + target=self.__reader, args=(), daemon=True) MeshInterface.__init__(self, debugOut=debugOut, noProto=noProto) @@ -2426,15 +2432,15 @@ debugOut {stream} – If a stream is provided, any debug serial output from """ # Send some bogus UART characters to force a sleeping device to wake, and if the reading statemachine was parsing a bad packet make sure - # we write enought start bytes to force it to resync - p = bytearray([START1] * 32) + # we write enought start bytes to force it to resync (we don't use START1 because we want to ensure it is looking for START1) + p = bytearray([START2] * 32) self._writeBytes(p) time.sleep(0.1) # wait 100ms to give device time to start running self._rxThread.start() self._startConfig() - + if not self.noProto: # Wait for the db download if using the protocol self._waitConnected() @@ -2587,15 +2593,15 @@ start the reading thread later.

""" # Send some bogus UART characters to force a sleeping device to wake, and if the reading statemachine was parsing a bad packet make sure - # we write enought start bytes to force it to resync - p = bytearray([START1] * 32) + # we write enought start bytes to force it to resync (we don't use START1 because we want to ensure it is looking for START1) + p = bytearray([START2] * 32) self._writeBytes(p) time.sleep(0.1) # wait 100ms to give device time to start running self._rxThread.start() self._startConfig() - + if not self.noProto: # Wait for the db download if using the protocol self._waitConnected() diff --git a/meshtastic/__init__.py b/meshtastic/__init__.py index 0b5b358..e68fdb4 100644 --- a/meshtastic/__init__.py +++ b/meshtastic/__init__.py @@ -780,8 +780,8 @@ class StreamInterface(MeshInterface): """ # Send some bogus UART characters to force a sleeping device to wake, and if the reading statemachine was parsing a bad packet make sure - # we write enought start bytes to force it to resync - p = bytearray([START1] * 32) + # we write enought start bytes to force it to resync (we don't use START1 because we want to ensure it is looking for START1) + p = bytearray([START2] * 32) self._writeBytes(p) time.sleep(0.1) # wait 100ms to give device time to start running diff --git a/setup.py b/setup.py index bdd261d..fb06b6c 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ with open("README.md", "r") as fh: # This call to setup() does all the work setup( name="meshtastic", - version="1.2.32", + version="1.2.33", description="Python API & client shell for talking to Meshtastic devices", long_description=long_description, long_description_content_type="text/markdown",