From 72339dc05e74e7561759322e69fa3c9aa699a642 Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Tue, 16 Aug 2022 21:17:23 -0700
Subject: [PATCH] debubuggier param name

---
 common/params.cc                                | 2 +-
 selfdrive/controls/controlsd.py                 | 2 +-
 selfdrive/test/process_replay/process_replay.py | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/params.cc b/common/params.cc
index b95a28158d..f89e7ff002 100644
--- a/common/params.cc
+++ b/common/params.cc
@@ -93,7 +93,6 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"CarVin", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_ON},
     {"CompletedTrainingVersion", PERSISTENT},
     {"ControlsReady", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_ON},
-    {"ControlsState", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_ON},
     {"CurrentRoute", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_ON},
     {"DashcamOverride", PERSISTENT},
     {"DisableLogging", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_ON},
@@ -152,6 +151,7 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"RecordFront", PERSISTENT},
     {"RecordFrontLock", PERSISTENT},  // for the internal fleet
     {"ReleaseNotes", PERSISTENT},
+    {"ReplayControlsState", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_ON},
     {"ShouldDoUpdate", CLEAR_ON_MANAGER_START},
     {"SnoozeUpdate", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_OFF},
     {"SshEnabled", PERSISTENT},
diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py
index 1d2349bdc1..80d9bccb05 100755
--- a/selfdrive/controls/controlsd.py
+++ b/selfdrive/controls/controlsd.py
@@ -205,7 +205,7 @@ class Controls:
 
   def set_initial_state(self):
     if REPLAY:
-      controls_state = Params().get("ControlsState")
+      controls_state = Params().get("ReplayControlsState")
       if controls_state is not None:
         controls_state = log.ControlsState.from_bytes(controls_state)
         self.v_cruise_kph = controls_state.vCruise
diff --git a/selfdrive/test/process_replay/process_replay.py b/selfdrive/test/process_replay/process_replay.py
index f73f6fb617..42b884e240 100755
--- a/selfdrive/test/process_replay/process_replay.py
+++ b/selfdrive/test/process_replay/process_replay.py
@@ -416,9 +416,9 @@ def setup_env(simulation=False, CP=None, cfg=None, controlsState=None):
 
   # Initialize controlsd with a controlsState packet
   if controlsState is not None:
-    params.put("ControlsState", controlsState.as_builder().to_bytes())
+    params.put("ReplayControlsState", controlsState.as_builder().to_bytes())
   else:
-    params.delete("ControlsState")
+    params.delete("ReplayControlsState")
 
   # Regen or python process
   if CP is not None: