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

Don't export null altitude, but support importing null lat/lon/alt as 0s. Fixes #548

Browse Source
This commit is contained in:
Ian McEwen
2024-04-18 12:14:16 -07:00
parent bdf3a24be1
commit 4226201423
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
meshtastic/__main__.py
View File

@@ -564,15 +564,15 @@ def onConnected(interface):
localConfig = interface.localNode.localConfig
if "alt" in configuration["location"]:
alt = int(configuration["location"]["alt"])
alt = int(configuration["location"]["alt"] or 0)
localConfig.position.fixed_position = True
print(f"Fixing altitude at {alt} meters")
if "lat" in configuration["location"]:
lat = float(configuration["location"]["lat"])
lat = float(configuration["location"]["lat"] or 0)
localConfig.position.fixed_position = True
print(f"Fixing latitude at {lat} degrees")
if "lon" in configuration["location"]:
lon = float(configuration["location"]["lon"])
lon = float(configuration["location"]["lon"] or 0)
localConfig.position.fixed_position = True
print(f"Fixing longitude at {lon} degrees")
print("Setting device position")
@@ -901,8 +901,11 @@ def export_config(interface):
configObj["channelUrl"] = channel_url
else:
configObj["channel_url"] = channel_url
if lat or lon or alt:
configObj["location"] = {"lat": lat, "lon": lon, "alt": alt}
# 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)}
if alt:
configObj["location"]["alt"] = alt
config = MessageToDict(interface.localNode.localConfig)
if config: