From 661b02de876418bb7acf2d9c528d8d58fc4b9a2f Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Tue, 2 Jul 2024 00:05:23 -0400
Subject: [PATCH] ui: Driving Personality: Updated mode names

---
 CHANGELOGS.md                       | 2 ++
 selfdrive/ui/qt/offroad/settings.cc | 4 ++--
 selfdrive/ui/qt/onroad_settings.cc  | 8 ++++----
 selfdrive/ui/ui.h                   | 6 +++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index b64eaf2c99..223088fe5f 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -4,6 +4,8 @@ sunnypilot - 0.9.8.0 (2024-xx-xx)
 ************************
 * UPDATED: Synced with commaai's openpilot
   * master commit b45caf4 (June 14, 2024)
+* UPDATED: Driving Personality: Updated mode names
+  * Aggressive, Moderate, Standard, Relaxed
 * NEW❗: Toyota - Enhanced Blind Spot Monitor (BSM) thanks to arne182, rav4kumar, and eFiniLan!
   * Enables Blind Spot Monitor (BSM) signals parsing in sunnypilot using the factory Blind Spot Monitor (BSM)
   * sunnypilot will use debugging CAN messages to receive unfiltered BSM signals, allowing detection of more objects
diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc
index 4c9a2e9085..7e065d7223 100644
--- a/selfdrive/ui/qt/offroad/settings.cc
+++ b/selfdrive/ui/qt/offroad/settings.cc
@@ -108,9 +108,9 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) {
   };
 
 
-  std::vector<QString> longi_button_texts{tr("Maniac"), tr("Aggressive"), tr("Stock"), tr("Relaxed")};
+  std::vector<QString> longi_button_texts{tr("Aggressive"), tr("Moderate"), tr("Standard"), tr("Relaxed")};
   long_personality_setting = new ButtonParamControl("LongitudinalPersonality", tr("Driving Personality"),
-                                          tr("Stock is recommended. In aggressive/maniac mode, openpilot will follow lead cars closer and be more aggressive with the gas and brake. "
+                                          tr("Standard is recommended. In moderate/aggressive mode, openpilot will follow lead cars closer and be more aggressive with the gas and brake. "
                                              "In relaxed mode openpilot will stay further away from lead cars. On supported cars, you can cycle through these personalities with "
                                              "your steering wheel distance button."),
                                           "../assets/offroad/icon_blank.png",
diff --git a/selfdrive/ui/qt/onroad_settings.cc b/selfdrive/ui/qt/onroad_settings.cc
index 3605bbfa76..94a152af65 100644
--- a/selfdrive/ui/qt/onroad_settings.cc
+++ b/selfdrive/ui/qt/onroad_settings.cc
@@ -287,16 +287,16 @@ void OptionWidget::updateGapAdjustCruise(QString param) {
   auto lp = atoi(params.get(param.toStdString()).c_str());
 
   if (lp == 0) {
-    title_text = "Maniac Gap";
+    title_text = "Aggressive";
     icon_color = "#ff4b4b";
   } else if (lp == 1) {
-    title_text = "Aggressive Gap";
+    title_text = "Moderate";
     icon_color = "#fcff4b";
   } else if (lp == 2) {
-    title_text = "Stock Gap";
+    title_text = "Standard";
     icon_color = "#4bff66";
   } else if (lp == 3) {
-    title_text = "Relax Gap";
+    title_text = "Relaxed";
     icon_color = "#6a0ac9";
   }
 
diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h
index ed9996f54d..dfca8e2cb2 100644
--- a/selfdrive/ui/ui.h
+++ b/selfdrive/ui/ui.h
@@ -26,9 +26,9 @@ const int UI_HEADER_HEIGHT = 420;
 const int UI_ROAD_NAME_MARGIN_X = 14;
 
 struct FeatureStatusText {
-  const QStringList dlp_list_text = {  "Laneful",     "Laneless",     "Auto"            };
-  const QStringList gac_list_text = {   "Maniac",   "Aggressive", "Standard", "Relaxed" };
-  const QStringList slc_list_text = { "Inactive",     "Temp Off", "Adapting",  "Active", "Pre Active" };
+  const QStringList dlp_list_text = { "Laneful",    "Laneless", "Auto"};
+  const QStringList gac_list_text = { "Aggressive", "Moderate", "Standard", "Relaxed"};
+  const QStringList slc_list_text = { "Inactive",   "Temp Off", "Adapting", "Active", "Pre Active"};
 };
 
 struct FeatureStatusColor {