Mirrors
/
Sideband
mirror of https://github.com/markqvist/Sideband.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed telemeter rendering

This commit is contained in:
Mark Qvist 2023-10-30 20:04:43 +01:00
parent 66243b3bfb
commit 45822e5aec
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sbapp/sideband/sense.py
View File

@ -30,6 +30,7 @@ class Telemeter():
if name != None: if name != None:
s.data = s.unpack(p[sid]) s.data = s.unpack(p[sid])
s.synthesized = True
s.active = True s.active = True
t.sensors[name] = s t.sensors[name] = s
@ -182,11 +183,12 @@ class Sensor():
@property @property
def data(self): def data(self):
if self._data == None or (self._stale_time != None and time.time() > self.last_update+self._stale_time): if not self.synthesized:
try: if self._data == None or (self._stale_time != None and time.time() > self.last_update+self._stale_time):
self.update_data() try:
except: self.update_data()
pass except:
pass
self.last_read = time.time() self.last_read = time.time()
return self._data return self._data
@ -270,11 +272,14 @@ class Time(Sensor):
return None return None
def render(self, relative_to=None): def render(self, relative_to=None):
rendered = { if self.data != None:
"icon": "clock-time-ten-outline", rendered = {
"name": "Timestamp", "icon": "clock-time-ten-outline",
"values": { "UTC": self.data["utc"] }, "name": "Timestamp",
} "values": { "UTC": self.data["utc"] },
}
else:
rendered = None
return rendered return rendered
@ -558,10 +563,6 @@ class Pressure(Sensor):
if "mbar" in rs.data and rs.data["mbar"] != None: if "mbar" in rs.data and rs.data["mbar"] != None:
if self.data["mbar"] != None: if self.data["mbar"] != None:
delta = round(rs.data["mbar"] - self.data["mbar"], 1) delta = round(rs.data["mbar"] - self.data["mbar"], 1)
# TODO: Remove
# RNS.log("OVERRIDING DELTA", RNS.LOG_WARNING)
# delta = round(740.1 - self.data["mbar"], 1)
rendered = { rendered = {
"icon": "weather-cloudy", "icon": "weather-cloudy",
@ -1075,10 +1076,6 @@ class AmbientLight(Sensor):
if self.data["lux"] != None: if self.data["lux"] != None:
delta = round(rs.data["lux"] - self.data["lux"], 2) delta = round(rs.data["lux"] - self.data["lux"], 2)
# TODO: Remove
# RNS.log("OVERRIDING DELTA", RNS.LOG_WARNING)
# delta = round(2500 - self.data["lux"], 2)
rendered = { rendered = {
"icon": "white-balance-sunny", "icon": "white-balance-sunny",
"name": "Ambient Light", "name": "Ambient Light",