remove deviceState.ambientTempC (#31533)

old-commit-hash: 0b4d08fab8
chrysler-long2 v0.9.6
Adeeb Shihadeh 1 year ago committed by GitHub
parent f5beedfaec
commit 5e81beb77e
  1. 2
      cereal
  2. 2
      selfdrive/thermald/thermald.py
  3. 2
      system/hardware/base.py
  4. 2
      system/hardware/pc/hardware.py
  5. 1
      system/hardware/tici/hardware.py

@ -1 +1 @@
Subproject commit 7de3c7111e78d87f9c43e2861a3e18aa59fde956 Subproject commit 2fba1381f40df2654f42a2e4bed869f2b7d01a52

@ -83,7 +83,6 @@ def read_thermal(thermal_config):
dat.deviceState.cpuTempC = [read_tz(z) / thermal_config.cpu[1] for z in thermal_config.cpu[0]] dat.deviceState.cpuTempC = [read_tz(z) / thermal_config.cpu[1] for z in thermal_config.cpu[0]]
dat.deviceState.gpuTempC = [read_tz(z) / thermal_config.gpu[1] for z in thermal_config.gpu[0]] dat.deviceState.gpuTempC = [read_tz(z) / thermal_config.gpu[1] for z in thermal_config.gpu[0]]
dat.deviceState.memoryTempC = read_tz(thermal_config.mem[0]) / thermal_config.mem[1] dat.deviceState.memoryTempC = read_tz(thermal_config.mem[0]) / thermal_config.mem[1]
dat.deviceState.ambientTempC = read_tz(thermal_config.ambient[0]) / thermal_config.ambient[1]
dat.deviceState.pmicTempC = [read_tz(z) / thermal_config.pmic[1] for z in thermal_config.pmic[0]] dat.deviceState.pmicTempC = [read_tz(z) / thermal_config.pmic[1] for z in thermal_config.pmic[0]]
return dat return dat
@ -412,7 +411,6 @@ def thermald_thread(end_event, hw_queue) -> None:
for i, temp in enumerate(msg.deviceState.gpuTempC): for i, temp in enumerate(msg.deviceState.gpuTempC):
statlog.gauge(f"gpu{i}_temperature", temp) statlog.gauge(f"gpu{i}_temperature", temp)
statlog.gauge("memory_temperature", msg.deviceState.memoryTempC) statlog.gauge("memory_temperature", msg.deviceState.memoryTempC)
statlog.gauge("ambient_temperature", msg.deviceState.ambientTempC)
for i, temp in enumerate(msg.deviceState.pmicTempC): for i, temp in enumerate(msg.deviceState.pmicTempC):
statlog.gauge(f"pmic{i}_temperature", temp) statlog.gauge(f"pmic{i}_temperature", temp)
for i, temp in enumerate(last_hw_state.nvme_temps): for i, temp in enumerate(last_hw_state.nvme_temps):

@ -4,7 +4,7 @@ from typing import Dict
from cereal import log from cereal import log
ThermalConfig = namedtuple('ThermalConfig', ['cpu', 'gpu', 'mem', 'bat', 'ambient', 'pmic']) ThermalConfig = namedtuple('ThermalConfig', ['cpu', 'gpu', 'mem', 'bat', 'pmic'])
NetworkType = log.DeviceState.NetworkType NetworkType = log.DeviceState.NetworkType

@ -57,7 +57,7 @@ class Pc(HardwareBase):
print("SHUTDOWN!") print("SHUTDOWN!")
def get_thermal_config(self): def get_thermal_config(self):
return ThermalConfig(cpu=((None,), 1), gpu=((None,), 1), mem=(None, 1), bat=(None, 1), ambient=(None, 1), pmic=((None,), 1)) return ThermalConfig(cpu=((None,), 1), gpu=((None,), 1), mem=(None, 1), bat=(None, 1), pmic=((None,), 1))
def set_screen_brightness(self, percentage): def set_screen_brightness(self, percentage):
pass pass

@ -349,7 +349,6 @@ class Tici(HardwareBase):
gpu=(("gpu0-usr", "gpu1-usr"), 1000), gpu=(("gpu0-usr", "gpu1-usr"), 1000),
mem=("ddr-usr", 1000), mem=("ddr-usr", 1000),
bat=(None, 1), bat=(None, 1),
ambient=("xo-therm-adc", 1000),
pmic=(("pm8998_tz", "pm8005_tz"), 1000)) pmic=(("pm8998_tz", "pm8005_tz"), 1000))
def set_screen_brightness(self, percentage): def set_screen_brightness(self, percentage):

Loading…
Cancel
Save