diff --git a/selfdrive/hardware/tici/power_monitor.py b/selfdrive/hardware/tici/power_monitor.py index e9d769087a..65f58876de 100755 --- a/selfdrive/hardware/tici/power_monitor.py +++ b/selfdrive/hardware/tici/power_monitor.py @@ -17,21 +17,30 @@ if __name__ == '__main__': voltage_average = (0, 0) # average, count current_average = (0, 0) power_average = (0, 0) + power_total_average = (0, 0) while sample_time is None or time.monotonic() - start_time < sample_time: with open("/sys/bus/i2c/devices/0-0040/hwmon/hwmon1/in1_input") as f: - voltage = int(f.read()) / 1000. + voltage_total = int(f.read()) / 1000. with open("/sys/bus/i2c/devices/0-0040/hwmon/hwmon1/curr1_input") as f: - current = int(f.read()) + current_total = int(f.read()) + + with open("/sys/class/power_supply/bms/voltage_now") as f: + voltage = int(f.read()) / 1e6 # volts + + with open("/sys/class/power_supply/bms/current_now") as f: + current = int(f.read()) / 1e3 # ma power = voltage*current + power_total = voltage_total*current_total # compute averages voltage_average = average(voltage_average, voltage) current_average = average(current_average, current) power_average = average(power_average, power) + power_total_average = average(power_total_average, power_total) - print("%.2f volts %12.2f ma %12.2f mW" % (voltage, current, power)) + print("%12.2f mW %12.2f mW %12.2f mW" % (power, power_total, power_total-power)) time.sleep(0.25) finally: stop_time = time.monotonic() @@ -39,6 +48,6 @@ if __name__ == '__main__': voltage = voltage_average[0] current = current_average[0] power = power_average[0] - print("%.2f volts %12.2f ma %12.2f mW" % (voltage, current, power)) + print("%.2f volts %12.2f ma %12.2f mW %12.2f mW" % (voltage, current, power, power_total)) print(" {:.2f} Seconds {} samples".format(stop_time - start_time, voltage_average[1])) print("----------------------------------------------------------------") diff --git a/selfdrive/ui/qt/home.cc b/selfdrive/ui/qt/home.cc index d71d2b3196..27b4e7bcc9 100644 --- a/selfdrive/ui/qt/home.cc +++ b/selfdrive/ui/qt/home.cc @@ -300,7 +300,9 @@ void GLWindow::timerUpdate() { Hardware::MIN_VOLUME, Hardware::MAX_VOLUME); ui_update(&ui_state); - repaint(); + if(GLWindow::ui_state.awake){ + repaint(); + } watchdog_kick(); } @@ -309,17 +311,15 @@ void GLWindow::resizeGL(int w, int h) { } void GLWindow::paintGL() { - if(GLWindow::ui_state.awake){ - ui_draw(&ui_state); + ui_draw(&ui_state); - double cur_draw_t = millis_since_boot(); - double dt = cur_draw_t - prev_draw_t; - if (dt > 66 && onroad && !ui_state.scene.driver_view) { - // warn on sub 15fps - LOGW("slow frame(%llu) time: %.2f", ui_state.sm->frame, dt); - } - prev_draw_t = cur_draw_t; + double cur_draw_t = millis_since_boot(); + double dt = cur_draw_t - prev_draw_t; + if (dt > 66 && onroad && !ui_state.scene.driver_view) { + // warn on sub 15fps + LOGW("slow frame(%llu) time: %.2f", ui_state.sm->frame, dt); } + prev_draw_t = cur_draw_t; } void GLWindow::wake() {