From 5d097fa5deffc6b954f9a6666dd1fa533dc14546 Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Tue, 2 Jul 2024 10:57:40 -0400
Subject: [PATCH] rename to PCM Speed Override

---
 common/params.cc                        | 4 ++--
 selfdrive/controls/controlsd.py         | 8 ++++----
 selfdrive/controls/lib/drive_helpers.py | 2 +-
 system/manager/manager.py               | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/params.cc b/common/params.cc
index 66acd7c044..61e2ae8225 100644
--- a/common/params.cc
+++ b/common/params.cc
@@ -293,6 +293,8 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"OsmDownloadedDate", PERSISTENT},
     {"PathOffset", PERSISTENT | BACKUP},
     {"PauseLateralSpeed", PERSISTENT | BACKUP},
+    {"PCMVCruiseOverride", PERSISTENT | BACKUP},
+    {"PCMVCruiseOverrideSpeed", PERSISTENT | BACKUP},
     {"QuietDrive", PERSISTENT | BACKUP},
     {"RoadEdge", PERSISTENT | BACKUP},
     {"ReverseAccChange", PERSISTENT | BACKUP},
@@ -322,8 +324,6 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"ToyotaAutoHold", PERSISTENT | BACKUP},
     {"ToyotaAutoLockBySpeed", PERSISTENT | BACKUP},
     {"ToyotaAutoUnlockByShifter", PERSISTENT | BACKUP},
-    {"ToyotaCruiseOverride", PERSISTENT | BACKUP},
-    {"ToyotaCruiseOverrideSpeed", PERSISTENT | BACKUP},
     {"ToyotaEnhancedBsm", PERSISTENT | BACKUP},
     {"ToyotaSnG", PERSISTENT | BACKUP},
     {"ToyotaTSS2Long", PERSISTENT | BACKUP},
diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py
index 8cb3c9ea9d..ebb44660ed 100755
--- a/selfdrive/controls/controlsd.py
+++ b/selfdrive/controls/controlsd.py
@@ -181,8 +181,8 @@ class Controls:
     self.enable_mads = self.params.get_bool("EnableMads")
     self.mads_disengage_lateral_on_brake = self.params.get_bool("DisengageLateralOnBrake")
     self.mads_ndlob = self.enable_mads and not self.mads_disengage_lateral_on_brake
-    self.toyota_cruise_override = self.params.get_bool("ToyotaCruiseOverride")
-    self.toyota_cruise_override_speed = int(self.params.get("ToyotaCruiseOverrideSpeed", encoding="utf-8"))
+    self.pcm_v_cruise_override = self.params.get_bool("PCMVCruiseOverride")
+    self.pcm_v_cruise_override_speed = int(self.params.get("PCMVCruiseOverrideSpeed", encoding="utf-8"))
     self.process_not_running = False
 
     self.custom_model, self.model_gen = get_model_generation(self.params)
@@ -494,8 +494,8 @@ class Controls:
   def state_transition(self, CS):
     """Compute conditional state transitions and execute actions on state transitions"""
 
-    # sp - toyota low speed override
-    sp_override_speed = self.toyota_cruise_override_speed if self.toyota_cruise_override else False
+    # sp - PCM speed override
+    sp_override_speed = self.pcm_v_cruise_override_speed if self.pcm_v_cruise_override else False
     self.v_cruise_helper.update_v_cruise(CS, self.enabled_long, self.is_metric, self.reverse_acc_change, sp_override_speed, self.sm['longitudinalPlanSP'])
 
     # decrement the soft disable timer at every step, as it's reset on
diff --git a/selfdrive/controls/lib/drive_helpers.py b/selfdrive/controls/lib/drive_helpers.py
index 7c77f3013a..e9f78ef969 100644
--- a/selfdrive/controls/lib/drive_helpers.py
+++ b/selfdrive/controls/lib/drive_helpers.py
@@ -84,7 +84,7 @@ class VCruiseHelper:
     self.slc_state_prev = SpeedLimitControlState.inactive
     self.slc_speed_limit_offsetted = 0
 
-    # sp: toyota low speed override
+    # sp: PCM speed override
     self.sp_override_v_cruise_kph = V_CRUISE_UNSET
     self.sp_override_cruise_speed_last = V_CRUISE_UNSET
     self.sp_override_enabled_last = False
diff --git a/system/manager/manager.py b/system/manager/manager.py
index cfabbfd583..eb6e956a1c 100755
--- a/system/manager/manager.py
+++ b/system/manager/manager.py
@@ -84,6 +84,8 @@ def manager_init() -> None:
     ("OnroadSettings", "1"),
     ("PathOffset", "0"),
     ("PauseLateralSpeed", "0"),
+    ("PCMVCruiseOverride", "0"),
+    ("PCMVCruiseOverrideSpeed", "30"),
     ("ReverseAccChange", "0"),
     ("ScreenRecorder", "1"),
     ("ShowDebugUI", "1"),
@@ -102,8 +104,6 @@ def manager_init() -> None:
     ("ToyotaAutoHold", "0"),
     ("ToyotaAutoLockBySpeed", "0"),
     ("ToyotaAutoUnlockByShifter", "0"),
-    ("ToyotaCruiseOverride", "0"),
-    ("ToyotaCruiseOverrideSpeed", "30"),
     ("ToyotaEnhancedBsm", "0"),
     ("TrueVEgoUi", "0"),
     ("TurnSpeedControl", "0"),