Merge remote-tracking branch 'root/master' into pr-powermon

# Conflicts:
#	meshtastic/ble_interface.py
#	meshtastic/protobuf/mesh_pb2.py
#	meshtastic/protobuf/powermon_pb2.py
#	meshtastic/protobuf/powermon_pb2.pyi
This commit is contained in:
Kevin Hester
2024-07-03 09:22:45 -07:00
10 changed files with 155 additions and 86 deletions

View File

@@ -748,9 +748,8 @@ class MeshInterface: # pylint: disable=R0902
def callback():
self.heartbeatTimer = None
prefs = self.localNode.localConfig
i = prefs.power.ls_secs / 2
logging.debug(f"Sending heartbeat, interval {i}")
i = 300
logging.debug(f"Sending heartbeat, interval {i} seconds")
if i != 0:
self.heartbeatTimer = threading.Timer(i, callback)
self.heartbeatTimer.start()