Model Manager

frogpilot/common/frogpilot_utilities.py

@@ -126,6 +126,10 @@ def calculate_road_curvature(modelData):
   return float(predicted_lateral_acc / max(velocity[index], 1)**2), max(time_to_curve, 1)
 
 
+def clean_model_name(name):
+  return name.replace("(Default)", "").strip()
+
+
 def contains_event_type(events, frogpilot_events, *event_types):
   return any(events.contains(event_type) or frogpilot_events.contains(event_type) for event_type in event_types)
 

frogpilot/common/frogpilot_variables.py

@@ -590,6 +590,10 @@ class FrogPilotVariables:
     toggle.lead_detection_probability = self.get_value("LeadDetectionThreshold", cast=float, condition=longitudinal_tuning, conversion=0.01, min=0.25, max=0.5)
     toggle.taco_tune = self.get_value("TacoTune", condition=longitudinal_tuning)
 
+    toggle.model = self.default_values["DrivingModel"]
+    toggle.model_name = self.default_values["DrivingModelName"]
+    toggle.model_version = self.default_values["DrivingModelVersion"]
+
     toggle.model_ui = self.get_value("ModelUI")
     toggle.dynamic_path_width = self.get_value("DynamicPathWidth", condition=toggle.model_ui and not toggle.debug_mode)
     toggle.lane_line_width = self.get_value("LaneLinesWidth", cast=float, condition=toggle.model_ui and not toggle.debug_mode, conversion=small_distance_conversion / 200)

frogpilot/ui/qt/widgets/frogpilot_controls.cc

@@ -127,3 +127,7 @@ void updateFrogPilotToggles() {
   static Params params_memory{"", true};
   params_memory.putBool("FrogPilotTogglesUpdated", true);
 }
+
+QString cleanModelName(QString modelName) {
+  return modelName.remove("_default").remove("(Default)");
+}

frogpilot/ui/qt/widgets/frogpilot_controls.h

@@ -23,6 +23,8 @@ void loadImage(const QString &basePath, QPixmap &pixmap, QSharedPointer<QMovie>
 void openDescriptions(bool forceOpenDescriptions, std::map<QString, AbstractControl*> toggles);
 void updateFrogPilotToggles();
 
+QString cleanModelName(QString modelName);
+
 const QString buttonStyle = R"(
   QPushButton {
     padding: 0px 25px 0px 25px;

selfdrive/ui/qt/home.cc

@@ -302,5 +302,5 @@ void OffroadHome::refresh() {
   date->setText(QLocale(uiState()->language.mid(5)).toString(QDateTime::currentDateTime(), "dddd, MMMM d"));
   date->setVisible(util::system_time_valid());
 
-  version->setText(getBrand() + " v" + getVersion().left(14).trimmed());
+  version->setText(getBrand() + " v" + getVersion().left(14).trimmed() + " - " + cleanModelName(frogpilot_toggles.value("model_name").toString()));
 }