From df79d31a6bd056c166248880c8b655ca46ce9cf6 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Sat, 24 Feb 2024 09:41:01 -0500 Subject: [PATCH] ui: Remove device ambient temperature from Sidebar Temperature selector --- CHANGELOGS.md | 1 + selfdrive/ui/qt/offroad/sunnypilot/visuals_settings.cc | 2 +- selfdrive/ui/qt/sidebar.cc | 9 +++------ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CHANGELOGS.md b/CHANGELOGS.md index 336500c446..40e834024f 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -54,6 +54,7 @@ sunnypilot - 0.9.6.1 (2024-02-22) * Display the statuses of certain features on the driving screen * NEW❗: Visuals: Enable Onroad Settings toggle * Display the Onroad Settings button on the driving screen to adjust feature options on the driving screen, without navigating into the settings menu + * REMOVED: "Device ambient" temperature option on the sidebar * FIXED: New comma 3X support * FIXED: New comma eSIM support * Bug fixes and performance improvements diff --git a/selfdrive/ui/qt/offroad/sunnypilot/visuals_settings.cc b/selfdrive/ui/qt/offroad/sunnypilot/visuals_settings.cc index e1061f29bf..1d812444cb 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/visuals_settings.cc +++ b/selfdrive/ui/qt/offroad/sunnypilot/visuals_settings.cc @@ -106,7 +106,7 @@ VisualsPanel::VisualsPanel(QWidget *parent) : ListWidget(parent) { } } - std::vector sidebar_temp_texts{tr("Off"), tr("Ambient"), tr("RAM"), tr("CPU"), tr("GPU"), tr("Max")}; + std::vector sidebar_temp_texts{tr("Off"), tr("RAM"), tr("CPU"), tr("GPU"), tr("Max")}; sidebar_temp_setting = new ButtonParamControl( "SidebarTemperatureOptions", "Display Temperature on Sidebar", "", "../assets/offroad/icon_blank.png", diff --git a/selfdrive/ui/qt/sidebar.cc b/selfdrive/ui/qt/sidebar.cc index f79745dca9..6b0ef8c7f7 100644 --- a/selfdrive/ui/qt/sidebar.cc +++ b/selfdrive/ui/qt/sidebar.cc @@ -97,12 +97,9 @@ void Sidebar::updateState(const UIState &s) { case 0: break; case 1: - sidebar_temp = QString::number((int)deviceState.getAmbientTempC()); - break; - case 2: sidebar_temp = QString::number((int)deviceState.getMemoryTempC()); break; - case 3: { + case 2: { const auto& cpu_temp_list = deviceState.getCpuTempC(); float max_cpu_temp = std::numeric_limits::lowest(); @@ -115,7 +112,7 @@ void Sidebar::updateState(const UIState &s) { } break; } - case 4: { + case 3: { const auto& gpu_temp_list = deviceState.getGpuTempC(); float max_gpu_temp = std::numeric_limits::lowest(); @@ -128,7 +125,7 @@ void Sidebar::updateState(const UIState &s) { } break; } - case 5: + case 4: sidebar_temp = QString::number((int)deviceState.getMaxTempC()); break; default: