From 41afd0f89a05a9a36431fe5b4704053f1468ee03 Mon Sep 17 00:00:00 2001 From: FrogAi <91348155+FrogAi@users.noreply.github.com> Date: Sat, 11 May 2024 14:37:55 -0700 Subject: [PATCH] Visuals - Developer UI - Use International System of Units Display relevant metrics in the SI format. --- selfdrive/ui/qt/onroad.cc | 6 +++--- selfdrive/ui/ui.cc | 1 + selfdrive/ui/ui.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index c521a67..45d6bb1 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -1314,14 +1314,14 @@ void AnnotatedCameraWidget::initializeFrogPilotWidgets() { } void AnnotatedCameraWidget::updateFrogPilotWidgets() { - if (is_metric) { + if (is_metric || scene.use_si) { accelerationUnit = tr(" m/s²"); leadDistanceUnit = tr(mapOpen ? "m" : "meters"); - leadSpeedUnit = tr("kph"); + leadSpeedUnit = scene.use_si ? tr("m/s") : tr("kph"); accelerationConversion = 1.0f; distanceConversion = 1.0f; - speedConversion = MS_TO_KPH; + speedConversion = scene.use_si ? 1.0f : MS_TO_KPH; } else { accelerationUnit = tr(" ft/s²"); leadDistanceUnit = tr(mapOpen ? "ft" : "feet"); diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index 9d0fc70..d25755f 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -354,6 +354,7 @@ void ui_update_frogpilot_params(UIState *s) { scene.is_memory = scene.sidebar_metrics && params.getBool("ShowMemoryUsage"); scene.is_storage_left = scene.sidebar_metrics && params.getBool("ShowStorageLeft"); scene.is_storage_used = scene.sidebar_metrics && params.getBool("ShowStorageUsed"); + scene.use_si = developer_ui && params.getBool("UseSI"); scene.disable_smoothing_mtsc = params.getBool("MTSCEnabled") && params.getBool("DisableMTSCSmoothing"); scene.disable_smoothing_vtsc = params.getBool("VisionTurnControl") && params.getBool("DisableVTSCSmoothing"); diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h index 4d66573..e7fe0f2 100644 --- a/selfdrive/ui/ui.h +++ b/selfdrive/ui/ui.h @@ -247,6 +247,7 @@ typedef struct UIScene { bool turn_signal_left; bool turn_signal_right; bool use_kaofui_icons; + bool use_si; bool use_vienna_slc_sign; bool vtsc_controlling_curve;