thermald: log screen brightness (#22570)

* thermald: log screen brightness

* bump cereal
old-commit-hash: d708b5b546
commatwo_master
Adeeb Shihadeh 4 years ago committed by GitHub
parent 50cf6fd948
commit 18b2d1fee0
  1. 2
      cereal
  2. 4
      selfdrive/hardware/base.py
  3. 7
      selfdrive/hardware/eon/hardware.py
  4. 3
      selfdrive/hardware/pc/hardware.py
  5. 7
      selfdrive/hardware/tici/hardware.py
  6. 1
      selfdrive/thermald/thermald.py

@ -1 +1 @@
Subproject commit d054cbc70423036a09a9449f7b7b19c058921578 Subproject commit a0850ebef69c5a3c43c875fb730528b049bad2e1

@ -110,6 +110,10 @@ class HardwareBase:
def set_screen_brightness(self, percentage): def set_screen_brightness(self, percentage):
pass pass
@abstractmethod
def get_screen_brightness(self):
pass
@abstractmethod @abstractmethod
def set_power_save(self, powersave_enabled): def set_power_save(self, powersave_enabled):
pass pass

@ -375,6 +375,13 @@ class Android(HardwareBase):
with open("/sys/class/leds/lcd-backlight/brightness", "w") as f: with open("/sys/class/leds/lcd-backlight/brightness", "w") as f:
f.write(str(int(percentage * 2.55))) f.write(str(int(percentage * 2.55)))
def get_screen_brightness(self):
try:
with open("/sys/class/leds/lcd-backlight/brightness") as f:
return int(float(f.read()) / 2.55)
except Exception:
return 0
def set_power_save(self, powersave_enabled): def set_power_save(self, powersave_enabled):
pass pass

@ -83,6 +83,9 @@ class Pc(HardwareBase):
def set_screen_brightness(self, percentage): def set_screen_brightness(self, percentage):
pass pass
def get_screen_brightness(self):
return 0
def set_power_save(self, powersave_enabled): def set_power_save(self, powersave_enabled):
pass pass

@ -283,6 +283,13 @@ class Tici(HardwareBase):
except Exception: except Exception:
pass pass
def get_screen_brightness(self):
try:
with open("/sys/class/backlight/panel0-backlight/brightness") as f:
return int(float(f.read()) / 10.23)
except Exception:
return 0
def set_power_save(self, powersave_enabled): def set_power_save(self, powersave_enabled):
# amplifier, 100mW at idle # amplifier, 100mW at idle
self.amplifier.set_global_shutdown(amp_disabled=powersave_enabled) self.amplifier.set_global_shutdown(amp_disabled=powersave_enabled)

@ -290,6 +290,7 @@ def thermald_thread():
if modem_temps is not None: if modem_temps is not None:
msg.deviceState.modemTempC = modem_temps msg.deviceState.modemTempC = modem_temps
msg.deviceState.screenBrightnessPercent = HARDWARE.get_screen_brightness()
msg.deviceState.batteryPercent = HARDWARE.get_battery_capacity() msg.deviceState.batteryPercent = HARDWARE.get_battery_capacity()
msg.deviceState.batteryCurrent = HARDWARE.get_battery_current() msg.deviceState.batteryCurrent = HARDWARE.get_battery_current()
msg.deviceState.usbOnline = HARDWARE.get_usb_present() msg.deviceState.usbOnline = HARDWARE.get_usb_present()

Loading…
Cancel
Save