This commit is contained in:
pdxlocations
2025-06-23 22:11:50 -07:00
parent db21942244
commit 0bb3389b3b
2 changed files with 10 additions and 0 deletions

View File

@@ -1097,6 +1097,7 @@ def export_config(interface) -> str:
owner_short = interface.getShortName()
channel_url = interface.localNode.getURL()
myinfo = interface.getMyNodeInfo()
canned_messages = interface.getCannedMessage()
pos = myinfo.get("position")
lat = None
lon = None
@@ -1115,6 +1116,8 @@ def export_config(interface) -> str:
configObj["channelUrl"] = channel_url
else:
configObj["channel_url"] = channel_url
# if canned_messages:
# configObj["cannedMessages"] = canned_messages
# lat and lon don't make much sense without the other (so fill with 0s), and alt isn't meaningful without both
if lat or lon:
configObj["location"] = {"lat": lat or float(0), "lon": lon or float(0)}

View File

@@ -1076,6 +1076,13 @@ class MeshInterface: # pylint: disable=R0902
if user is not None:
return user.get("publicKey", None)
return None
def getCannedMessage(self):
"""Fetch and return the canned message from the local node."""
if hasattr(self, "localNode") and self.localNode:
return self.localNode.get_canned_message()
else:
raise RuntimeError("No local node available.")
def _waitConnected(self, timeout=30.0):
"""Block until the initial node db download is complete, or timeout