Merge branch 'master' into hyundai-radar-toggle

Adds logic to set the RADAR_OFF flag in CP_SP.flags when the Hyundai radar type is set to OFF. This ensures the correct flag is applied for vehicles with radar disabled.

common/params_keys.h

@@ -205,6 +205,7 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
 
     // sunnypilot car specific params
     {"HyundaiLongitudinalTuning", {PERSISTENT | BACKUP, INT, "0"}},
+    {"HyundaiRadar", {PERSISTENT | BACKUP, INT, "0"}},
 
     {"DynamicExperimentalControl", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"BlindSpot", {PERSISTENT | BACKUP, BOOL, "0"}},

selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle/hyundai_settings.cc

@@ -20,6 +20,19 @@ HyundaiSettings::HyundaiSettings(QWidget *parent) : BrandSettingsInterface(paren
   QObject::connect(longitudinalTuningToggle, &ButtonParamControlSP::buttonClicked, this, &HyundaiSettings::updateSettings);
   list->addItem(longitudinalTuningToggle);
   longitudinalTuningToggle->showDescription();
+
+  std::vector<QString> radar_tuning_texts{ tr("Off"), tr("Lead Only"), tr("Full Radar") };
+  radarToggle = new ButtonParamControl(
+    "HyundaiRadar",
+    tr("Radar Tracks"),
+    "",
+    "",
+    radar_tuning_texts,
+    500
+  );
+  QObject::connect(radarToggle, &ButtonParamControlSP::buttonClicked, this, &HyundaiSettings::updateSettings);
+  list->addItem(radarToggle);
+  radarToggle->showDescription();
 }
 
 void HyundaiSettings::updateSettings() {
@@ -54,4 +67,25 @@ void HyundaiSettings::updateSettings() {
   longitudinalTuningToggle->setEnabled(!longitudinal_tuning_disabled);
   longitudinalTuningToggle->setDescription(longitudinal_tuning_description);
   longitudinalTuningToggle->showDescription();
+
+  auto radar_param = std::atoi(params.get("HyundaiRadar").c_str());
+
+  RadarOption radar_option;
+  if (radar_param == int(RadarOption::LEAD_ONLY)) {
+    radar_option = RadarOption::LEAD_ONLY;
+  } else if (radar_param == int(RadarOption::FULL_RADAR)) {
+    radar_option = RadarOption::FULL_RADAR;
+  } else {
+    radar_option = RadarOption::OFF;
+  }
+
+  bool radar_disabled = !offroad || !has_longitudinal_control;
+  QString radar_description = radarDescription(radar_option);
+  if (radar_disabled) {
+    radar_description = toggleDisableMsg(offroad, has_longitudinal_control);
+  }
+
+  radarToggle->setEnabled(!radar_disabled);
+  radarToggle->setDescription(radar_description);
+  radarToggle->showDescription();
 }

selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle/hyundai_settings.h

@@ -20,6 +20,12 @@ enum class LongitudinalTuningOption {
   PREDICTIVE,
 };
 
+enum class RadarOption {
+  OFF,
+  LEAD_ONLY,
+  FULL_RADAR,
+};
+
 class HyundaiSettings : public BrandSettingsInterface {
   Q_OBJECT
 
@@ -30,6 +36,7 @@ public:
 private:
   bool has_longitudinal_control = false;
   ButtonParamControl *longitudinalTuningToggle = nullptr;
+  ButtonParamControl *radarToggle = nullptr;
 
   static QString toggleDisableMsg(bool _offroad, bool _has_longitudinal_control) {
     if (!_has_longitudinal_control) {
@@ -62,4 +69,24 @@ private:
              .arg(dynamic_str)
              .arg(predictive_str);
   }
+
+  static QString radarDescription(RadarOption option = RadarOption::OFF) {
+    QString off_str = tr("Off: Disables radar tracking. Vision-only vehicle detection.");
+    QString lead_only_str = tr("Lead Only: Tracks only the closest vehicle ahead.");
+    QString full_radar_str = tr("Full Radar: Tracks all nearby vehicles using radar.");
+
+    if (option == RadarOption::LEAD_ONLY) {
+      lead_only_str = "<font color='white'><b>" + lead_only_str + "</b></font>";
+    } else if (option == RadarOption::FULL_RADAR) {
+      full_radar_str = "<font color='white'><b>" + full_radar_str + "</b></font>";
+    } else {
+      off_str = "<font color='white'><b>" + off_str + "</b></font>";
+    }
+
+    return QString("%1<br><br>%2<br>%3<br>%4<br>")
+             .arg(tr("Configure how radar tracks surrounding vehicles — turn it off, track only the lead, or track all."))
+             .arg(off_str)
+             .arg(lead_only_str)
+             .arg(full_radar_str);
+  }
 };

sunnypilot/selfdrive/car/interfaces.py

@@ -81,7 +81,8 @@ def initialize_params(params) -> list[dict[str, Any]]:
 
   # hyundai
   keys.extend([
-    "HyundaiLongitudinalTuning"
+    "HyundaiLongitudinalTuning",
+    "HyundaiRadar"
   ])
 
   return [{k: params.get(k, return_default=True)} for k in keys]