Log SOM power draw (commaai#24975)

* log SOM power draw * bump cereal Co-authored-by: Comma Device <device@comma.ai> Co-authored-by: Willem Melching <willem.melching@gmail.com>
spektor56 · Jul 1, 2022 · ea6d0f7 · ea6d0f7
1 parent 7bed17d
commit ea6d0f7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/selfdrive/thermald/thermald.py b/selfdrive/thermald/thermald.py
@@ -359,12 +359,13 @@ def thermald_thread(end_event, hw_queue):
     power_monitor.calculate(peripheralState, onroad_conditions["ignition"])
     msg.deviceState.offroadPowerUsageUwh = power_monitor.get_power_used()
     msg.deviceState.carBatteryCapacityUwh = max(0, power_monitor.get_car_battery_capacity())
-    current_power_draw = HARDWARE.get_current_power_draw()  # pylint: disable=assignment-from-none
-    if current_power_draw is not None:
-      statlog.sample("power_draw", current_power_draw)
-      msg.deviceState.powerDrawW = current_power_draw
-    else:
-      msg.deviceState.powerDrawW = 0
+    current_power_draw = HARDWARE.get_current_power_draw()
+    statlog.sample("power_draw", current_power_draw)
+    msg.deviceState.powerDrawW = current_power_draw
+
+    som_power_draw = HARDWARE.get_som_power_draw()
+    statlog.sample("som_power_draw", som_power_draw)
+    msg.deviceState.somPowerDrawW = som_power_draw
 
     # Check if we need to disable charging (handled by boardd)
     msg.deviceState.chargingDisabled = power_monitor.should_disable_charging(onroad_conditions["ignition"], in_car, off_ts)

diff --git a/system/hardware/base.py b/system/hardware/base.py
@@ -110,6 +110,10 @@ def get_usb_present(self):
   def get_current_power_draw(self):
     pass
 
+  @abstractmethod
+  def get_som_power_draw(self):
+    pass
+
   @abstractmethod
   def shutdown(self):
     pass

diff --git a/system/hardware/pc/hardware.py b/system/hardware/pc/hardware.py
@@ -73,6 +73,9 @@ def get_usb_present(self):
 
   def get_current_power_draw(self):
     return 0
+
+  def get_som_power_draw(self):
+    return 0
 
   def shutdown(self):
     print("SHUTDOWN!")

diff --git a/system/hardware/tici/hardware.py b/system/hardware/tici/hardware.py
@@ -381,6 +381,9 @@ def get_usb_present(self):
   def get_current_power_draw(self):
     return (self.read_param_file("/sys/class/hwmon/hwmon1/power1_input", int) / 1e6)
 
+  def get_som_power_draw(self):
+    return (self.read_param_file("/sys/class/power_supply/bms/voltage_now", int) * self.read_param_file("/sys/class/power_supply/bms/current_now", int) / 1e12)
+
   def shutdown(self):
     # Note that for this to work and have the device stay powered off, the panda needs to be in UsbPowerMode::CLIENT!
     os.system("sudo poweroff")