ui: Sidebar Temperature selector (commaai#183)

* ui: Sidebar Temperature selector

* don't update

* should be numerical

* update it!

* fix index

* fix

* correct wording

* use ListWidget-like method

* No lines, can shrink

* update description

* fix

* not needed

* Update CHANGELOGS.md

* cleanup

Author: sunnyhaibin

CHANGELOGS.md

@@ -5,8 +5,12 @@ sunnypilot - 0.9.3.1 (2023-XX-XX)
 * NEW❗: HKG CAN: Smoother Stopping Performance (Beta) toggle
   * Smoother stopping behind a stopped car or desired stopping event.
   * This is only applicable to HKG CAN platforms using openpilot longitudinal control
+* NEW❗: Display Temperature on Sidebar toggle
+  * Display Ambient temperature, memory temperature, CPU core with the highest temperature, GPU temperature, or max of Memory/CPU/GPU on the sidebar
+  * Replace "Display CPU Temperature on Sidebar" toggle
 * DISABLED: Screen Recorder
   * UI sometimes crashes on startup along with screen recorder, will reimplement in future updates
+* REMOVED: Display CPU Temperature on Sidebar
 
 sunnypilot - 0.9.2.3 (2023-06-18)
 ========================

selfdrive/ui/qt/offroad/sunnypilot_settings.cc

@@ -636,12 +636,6 @@ SPVisualsPanel::SPVisualsPanel(QWidget *parent) : ListWidget(parent) {
       tr("Enable this will display an icon that appears when the End-to-end model decides to start or stop."),
       "../assets/offroad/icon_road.png",
     },
-    {
-      "SidebarCpuTemp",
-      tr("Display CPU Temperature on Sidebar"),
-      tr("Enable this will display the CPU core with the highest temperature on the sidebar."),
-      "../assets/offroad/icon_calibration.png",
-    },
   };
 
   // Developer UI Info (Dev UI)
@@ -664,6 +658,9 @@ SPVisualsPanel::SPVisualsPanel(QWidget *parent) : ListWidget(parent) {
     }
   }
 
+  auto sidebar_temp = new SidebarTemp(this);
+  addItem(sidebar_temp);
+
   // trigger updateToggles() when toggleFlipped
   connect(toggles["DevUI"], &ToggleControl::toggleFlipped, [=](bool state) {
     updateToggles();
@@ -1779,3 +1776,41 @@ void ChevronInfo::refresh() {
   btnminus.setText("-");
   btnplus.setText("+");
 }
+
+SidebarTemp::SidebarTemp(QWidget *parent) : QWidget(parent), outer_layout(this) {
+  outer_layout.setMargin(0);
+  outer_layout.setSpacing(0);
+  outer_layout.addLayout(&inner_layout);
+  inner_layout.setMargin(0);
+  //inner_layout.setSpacing(25); // default spacing is 25
+  outer_layout.addStretch();
+
+  sidebarTemperature = new ParamControl(
+    "SidebarTemperature",
+    tr("Display Temperature on Sidebar"),
+    tr("Display Ambient temperature, memory temperature, CPU core with the highest temperature, GPU temperature, or max of Memory/CPU/GPU on the sidebar."),
+    "../assets/offroad/icon_calibration.png"
+  );
+
+  std::vector<QString> sidebar_temp_texts{tr("Ambient"), tr("Memory"), tr("CPU"), tr("GPU"), tr("Max")};
+  sidebar_temp_setting = new ButtonParamControl(
+    "SidebarTemperatureOptions", "", "",
+    "../assets/offroad/icon_blank.png",
+    sidebar_temp_texts
+  );
+
+  connect(sidebarTemperature, &ToggleControl::toggleFlipped, [=](bool state) {
+    updateToggles();
+  });
+
+  addItem(sidebarTemperature);
+  addItem(sidebar_temp_setting);
+}
+
+void SidebarTemp::showEvent(QShowEvent *event) {
+  updateToggles();
+}
+
+void SidebarTemp::updateToggles() {
+  sidebar_temp_setting->setVisible(params.getBool("SidebarTemperature"));
+}

selfdrive/ui/qt/offroad/sunnypilot_settings.h

@@ -242,6 +242,28 @@ class ChevronInfo : public AbstractControl {
   void refresh();
 };
 
+class SidebarTemp : public QWidget {
+  Q_OBJECT
+
+public:
+  explicit SidebarTemp(QWidget *parent = nullptr);
+  void showEvent(QShowEvent *event) override;
+
+public slots:
+  void updateToggles();
+
+private:
+  inline void addItem(QWidget *w) { inner_layout.addWidget(w); }
+  inline void addItem(QLayout *layout) { inner_layout.addLayout(layout); }
+  inline void setSpacing(int spacing) { inner_layout.setSpacing(spacing); }
+  QVBoxLayout outer_layout;
+  QVBoxLayout inner_layout;
+  Params params;
+
+  ParamControl *sidebarTemperature;
+  ButtonParamControl *sidebar_temp_setting;
+};
+
 class SPGeneralPanel : public ListWidget {
   Q_OBJECT
 

selfdrive/ui/qt/sidebar.cc

@@ -98,30 +98,60 @@ void Sidebar::updateState(const UIState &s) {
   }
   setProperty("connectStatus", QVariant::fromValue(connectStatus));
 
-  if (millis_since_boot() - last_max_cpu_temp_count > 1000 * 1) {
-    last_max_cpu_temp_count = millis_since_boot();
-
-    QString max_cpu_temp_str = "0°C";
-    const auto& cpu_temp_list = deviceState.getCpuTempC();
-    float max_cpu_temp = std::numeric_limits<float>::lowest();
-
-    for (const float& temp : cpu_temp_list) {
-      max_cpu_temp = std::max(max_cpu_temp, temp);
+  if (millis_since_boot() - last_temp_count > 1000 * 1) {
+    last_temp_count = millis_since_boot();
+
+    switch (s.scene.sidebar_temp_options) {
+      case 0:
+        sidebar_temp = QString::number((int)deviceState.getAmbientTempC());
+        break;
+      case 1:
+        sidebar_temp = QString::number((int)deviceState.getMemoryTempC());
+        break;
+      case 2: {
+        const auto& cpu_temp_list = deviceState.getCpuTempC();
+        float max_cpu_temp = std::numeric_limits<float>::lowest();
+
+        for (const float& temp : cpu_temp_list) {
+          max_cpu_temp = std::max(max_cpu_temp, temp);
+        }
+
+        if (max_cpu_temp >= 0) {
+          sidebar_temp = QString::number(std::nearbyint(max_cpu_temp));
+        }
+        break;
+      }
+      case 3: {
+        const auto& gpu_temp_list = deviceState.getGpuTempC();
+        float max_gpu_temp = std::numeric_limits<float>::lowest();
+
+        for (const float& temp : gpu_temp_list) {
+          max_gpu_temp = std::max(max_gpu_temp, temp);
+        }
+
+        if (max_gpu_temp >= 0) {
+          sidebar_temp = QString::number(std::nearbyint(max_gpu_temp));
+        }
+        break;
+      }
+      case 4:
+        sidebar_temp = QString::number((int)deviceState.getMaxTempC());
+        break;
+      default:
+        break;
     }
 
-    if (max_cpu_temp >= 0) {
-      max_cpu_temp_str = QString::number(std::nearbyint(max_cpu_temp)) + "°C";
-    }
+    setProperty("sidebarTemp", sidebar_temp + "°C");
+  }
 
-    ItemStatus tempStatus = {{tr("TEMP"), s.scene.sidebar_cpu_temp ? max_cpu_temp_str : tr("HIGH")}, danger_color};
-    auto ts = deviceState.getThermalStatus();
-    if (ts == cereal::DeviceState::ThermalStatus::GREEN) {
-      tempStatus = {{tr("TEMP"), s.scene.sidebar_cpu_temp ? max_cpu_temp_str : tr("GOOD")}, good_color};
-    } else if (ts == cereal::DeviceState::ThermalStatus::YELLOW) {
-      tempStatus = {{tr("TEMP"), s.scene.sidebar_cpu_temp ? max_cpu_temp_str : tr("OK")}, warning_color};
-    }
-    setProperty("tempStatus", QVariant::fromValue(tempStatus));
+  ItemStatus tempStatus = {{tr("TEMP"), s.scene.sidebar_temp ? sidebar_temp_str : tr("HIGH")}, danger_color};
+  auto ts = deviceState.getThermalStatus();
+  if (ts == cereal::DeviceState::ThermalStatus::GREEN) {
+    tempStatus = {{tr("TEMP"), s.scene.sidebar_temp ? sidebar_temp_str : tr("GOOD")}, good_color};
+  } else if (ts == cereal::DeviceState::ThermalStatus::YELLOW) {
+    tempStatus = {{tr("TEMP"), s.scene.sidebar_temp ? sidebar_temp_str : tr("OK")}, warning_color};
   }
+  setProperty("tempStatus", QVariant::fromValue(tempStatus));
 
   ItemStatus pandaStatus = {{tr("VEHICLE"), tr("ONLINE")}, good_color};
   if (s.scene.pandaType == cereal::PandaState::PandaType::UNKNOWN) {

selfdrive/ui/qt/sidebar.h

@@ -15,6 +15,7 @@ class Sidebar : public QFrame {
   Q_PROPERTY(ItemStatus tempStatus MEMBER temp_status NOTIFY valueChanged);
   Q_PROPERTY(QString netType MEMBER net_type NOTIFY valueChanged);
   Q_PROPERTY(int netStrength MEMBER net_strength NOTIFY valueChanged);
+  Q_PROPERTY(QString sidebarTemp MEMBER sidebar_temp_str NOTIFY valueChanged);
 
 public:
   explicit Sidebar(QWidget* parent = 0);
@@ -58,5 +59,7 @@ public slots:
 private:
   std::unique_ptr<PubMaster> pm;
 
-  uint64_t last_max_cpu_temp_count;
+  uint64_t last_temp_count;
+  QString sidebar_temp = "0";
+  QString sidebar_temp_str = "0";
 };

selfdrive/ui/ui.cc

@@ -350,7 +350,8 @@ void UIState::updateStatus() {
 
   if (millis_since_boot() - last_update_params_sidebar > 1000 * 1) {
     last_update_params_sidebar = millis_since_boot();
-    scene.sidebar_cpu_temp = params.getBool("SidebarCpuTemp");
+    scene.sidebar_temp = params.getBool("SidebarTemperature");
+    scene.sidebar_temp_options = std::atoi(params.get("SidebarTemperatureOptions").c_str());
   }
 }
 

selfdrive/ui/ui.h

@@ -190,7 +190,8 @@ typedef struct UIScene {
   bool e2e_long_alert_light, e2e_long_alert_lead, e2e_long_alert_ui;
   float e2eX[13] = {0};
 
-  bool sidebar_cpu_temp;
+  bool sidebar_temp;
+  int sidebar_temp_options;
 } UIScene;
 
 class UIState : public QObject {