Cleanup
This commit is contained in:
parent
9f0d776e3f
commit
cba08b6999
2 changed files with 11 additions and 24 deletions
|
|
@ -3279,42 +3279,31 @@ class SidebandCore():
|
||||||
|
|
||||||
def update_telemetry(self):
|
def update_telemetry(self):
|
||||||
try:
|
try:
|
||||||
try:
|
try: latest_telemetry = deepcopy(self.latest_telemetry)
|
||||||
latest_telemetry = deepcopy(self.latest_telemetry)
|
except: latest_telemetry = None
|
||||||
except:
|
|
||||||
latest_telemetry = None
|
|
||||||
|
|
||||||
telemetry = self.get_telemetry()
|
telemetry = self.get_telemetry()
|
||||||
packed_telemetry = self.get_packed_telemetry()
|
packed_telemetry = self.get_packed_telemetry()
|
||||||
telemetry_changed = False
|
telemetry_changed = False
|
||||||
|
|
||||||
if telemetry != None and packed_telemetry != None:
|
if telemetry != None and packed_telemetry != None:
|
||||||
if latest_telemetry == None or len(telemetry) != len(latest_telemetry):
|
if latest_telemetry == None or len(telemetry) != len(latest_telemetry): telemetry_changed = True
|
||||||
telemetry_changed = True
|
|
||||||
|
|
||||||
if latest_telemetry != None:
|
if latest_telemetry != None:
|
||||||
|
|
||||||
if not telemetry_changed:
|
if not telemetry_changed:
|
||||||
for sn in telemetry:
|
for sn in telemetry:
|
||||||
if telemetry_changed:
|
if telemetry_changed: break
|
||||||
break
|
|
||||||
|
|
||||||
if sn != "time":
|
if sn != "time":
|
||||||
if sn in latest_telemetry:
|
if sn in latest_telemetry:
|
||||||
if telemetry[sn] != latest_telemetry[sn]:
|
if telemetry[sn] != latest_telemetry[sn]: telemetry_changed = True
|
||||||
telemetry_changed = True
|
else: telemetry_changed = True
|
||||||
else:
|
|
||||||
telemetry_changed = True
|
|
||||||
|
|
||||||
if not telemetry_changed:
|
if not telemetry_changed:
|
||||||
for sn in latest_telemetry:
|
for sn in latest_telemetry:
|
||||||
|
if telemetry_changed: break
|
||||||
if telemetry_changed:
|
|
||||||
break
|
|
||||||
|
|
||||||
if sn != "time":
|
if sn != "time":
|
||||||
if not sn in telemetry:
|
if not sn in telemetry: telemetry_changed = True
|
||||||
telemetry_changed = True
|
|
||||||
|
|
||||||
if telemetry_changed:
|
if telemetry_changed:
|
||||||
self.telemetry_changes += 1
|
self.telemetry_changes += 1
|
||||||
|
|
@ -3323,10 +3312,8 @@ class SidebandCore():
|
||||||
self.setstate("app.flags.last_telemetry", time.time())
|
self.setstate("app.flags.last_telemetry", time.time())
|
||||||
|
|
||||||
if self.is_client:
|
if self.is_client:
|
||||||
try:
|
try: self.service_set_latest_telemetry(self.latest_telemetry, self.latest_packed_telemetry)
|
||||||
self.service_set_latest_telemetry(self.latest_telemetry, self.latest_packed_telemetry)
|
except Exception as e: RNS.log("Error while sending latest telemetry to service: "+str(e), RNS.LOG_ERROR)
|
||||||
except Exception as e:
|
|
||||||
RNS.log("Error while sending latest telemetry to service: "+str(e), RNS.LOG_ERROR)
|
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
import traceback
|
import traceback
|
||||||
|
|
|
||||||
2
setup.py
2
setup.py
|
|
@ -114,7 +114,7 @@ setuptools.setup(
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
install_requires=[
|
install_requires=[
|
||||||
"rns>=1.1.9",
|
"rns>=1.2.0",
|
||||||
"lxmf>=0.9.6",
|
"lxmf>=0.9.6",
|
||||||
"lxst>=0.4.6",
|
"lxst>=0.4.6",
|
||||||
"kivy>=2.3.0",
|
"kivy>=2.3.0",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue