Update on fixed location telemetry settings change

This commit is contained in:
Mark Qvist 2023-10-25 18:49:30 +02:00
parent ea6ed3407a
commit e6be975e6e

View File

@ -207,6 +207,7 @@ class SidebandApp(MDApp):
self.telemetry_init() self.telemetry_init()
self.settings_init() self.settings_init()
self.connectivity_init() self.connectivity_init()
self.object_details_screen = ObjectDetails(self)
# Wait a little extra for user to react to permissions prompt # Wait a little extra for user to react to permissions prompt
# if RNS.vendor.platformutils.get_platform() == "android": # if RNS.vendor.platformutils.get_platform() == "android":
@ -3048,10 +3049,13 @@ class SidebandApp(MDApp):
self.sideband.config["telemetry_s_acceleration"] = self.telemetry_screen.ids.telemetry_s_accelerometer.active self.sideband.config["telemetry_s_acceleration"] = self.telemetry_screen.ids.telemetry_s_accelerometer.active
self.sideband.config["telemetry_s_proximity"] = self.telemetry_screen.ids.telemetry_s_proximity.active self.sideband.config["telemetry_s_proximity"] = self.telemetry_screen.ids.telemetry_s_proximity.active
run_telemetry_update = False
try: try:
alt = float(self.telemetry_screen.ids.telemetry_s_fixed_altitude.text.strip().replace(" ", "")) alt = float(self.telemetry_screen.ids.telemetry_s_fixed_altitude.text.strip().replace(" ", ""))
self.telemetry_screen.ids.telemetry_s_fixed_altitude.text = str(alt) self.telemetry_screen.ids.telemetry_s_fixed_altitude.text = str(alt)
if self.sideband.config["telemetry_s_fixed_altitude"] != alt:
self.sideband.config["telemetry_s_fixed_altitude"] = alt self.sideband.config["telemetry_s_fixed_altitude"] = alt
run_telemetry_update = True
except: except:
self.telemetry_screen.ids.telemetry_s_fixed_altitude.text = str(self.sideband.config["telemetry_s_fixed_altitude"]) self.telemetry_screen.ids.telemetry_s_fixed_altitude.text = str(self.sideband.config["telemetry_s_fixed_altitude"])
@ -3059,6 +3063,8 @@ class SidebandApp(MDApp):
s = self.telemetry_screen.ids.telemetry_s_fixed_latlon.text s = self.telemetry_screen.ids.telemetry_s_fixed_latlon.text
l = s.strip().replace(" ","").split(",") l = s.strip().replace(" ","").split(",")
lat = float(l[0]); lon = float(l[1]) lat = float(l[0]); lon = float(l[1])
if self.sideband.config["telemetry_s_fixed_latlon"] != [lat, lon]:
run_telemetry_update = True
self.sideband.config["telemetry_s_fixed_latlon"] = [lat, lon] self.sideband.config["telemetry_s_fixed_latlon"] = [lat, lon]
self.telemetry_screen.ids.telemetry_s_fixed_latlon.text = f"{lat}, {lon}" self.telemetry_screen.ids.telemetry_s_fixed_latlon.text = f"{lat}, {lon}"
except: except:
@ -3071,6 +3077,9 @@ class SidebandApp(MDApp):
self.telemetry_screen.ids.telemetry_s_fixed_latlon.text = "0.0, 0.0" self.telemetry_screen.ids.telemetry_s_fixed_latlon.text = "0.0, 0.0"
self.sideband.save_configuration() self.sideband.save_configuration()
if run_telemetry_update:
self.sideband.update_telemetry()
else:
self.sideband.setstate("app.flags.last_telemetry", time.time()) self.sideband.setstate("app.flags.last_telemetry", time.time())
def telemetry_action(self, sender=None, direction="left"): def telemetry_action(self, sender=None, direction="left"):
@ -3266,10 +3275,12 @@ class SidebandApp(MDApp):
if self.object_details_screen == None: if self.object_details_screen == None:
self.object_details_screen = ObjectDetails(self) self.object_details_screen = ObjectDetails(self)
self.object_details_screen.set_source(sender.source_dest, from_conv=from_conv) Clock.schedule_once(lambda dt: self.object_details_screen.set_source(sender.source_dest, from_conv=from_conv), 0.0)
def vj(dt):
self.root.ids.screen_manager.current = "object_details_screen" self.root.ids.screen_manager.current = "object_details_screen"
self.sideband.setstate("app.displaying", self.root.ids.screen_manager.current) self.sideband.setstate("app.displaying", self.root.ids.screen_manager.current)
Clock.schedule_once(vj, 0.15)
def map_create_marker(self, source, telemetry, appearance): def map_create_marker(self, source, telemetry, appearance):
try: try: