Revert "CarControlSP: live params (#943)" (#1345)

* Revert "`CarControlSP`: live params (#943)"

This reverts commit b5104377

* bump

* bump

selfdrive/car/helpers.py

@@ -57,7 +57,7 @@ def convert_carControlSP(struct: capnp.lib.capnp._DynamicStructReader) -> struct
   struct_dataclass = structs.CarControlSP(**remove_deprecated({k: v for k, v in struct_dict.items() if not isinstance(k, dict)}))
 
   struct_dataclass.mads = structs.ModularAssistiveDrivingSystem(**remove_deprecated(struct_dict.get('mads', {})))
-  struct_dataclass.params = [structs.CarControlSP.Param(**remove_deprecated(p)) for p in struct_dict.get('params', [])]
+  # struct_dataclass.params = [structs.CarControlSP.Param(**remove_deprecated(p)) for p in struct_dict.get('params', [])]
   struct_dataclass.leadOne = structs.LeadData(**remove_deprecated(struct_dict.get('leadOne', {})))
   struct_dataclass.leadTwo = structs.LeadData(**remove_deprecated(struct_dict.get('leadTwo', {})))
   struct_dataclass.intelligentCruiseButtonManagement = structs.IntelligentCruiseButtonManagement(

sunnypilot/selfdrive/controls/controlsd_ext.py

@@ -10,7 +10,6 @@ from cereal import log, custom
 from opendbc.car import structs
 from openpilot.common.params import Params
 from openpilot.common.swaglog import cloudlog
-from openpilot.sunnypilot.selfdrive.controls.lib.param_store import ParamStore
 from openpilot.sunnypilot.selfdrive.controls.lib.blinker_pause_lateral import BlinkerPauseLateral
 
 
@@ -19,7 +18,6 @@ class ControlsExt:
     self.CP = CP
     self.params = params
     self.blinker_pause_lateral = BlinkerPauseLateral()
-    self.param_store = ParamStore(self.CP)
     self.get_params_sp()
 
     cloudlog.info("controlsd_ext is waiting for CarParamsSP")
@@ -30,7 +28,6 @@ class ControlsExt:
     self.pm_services_ext = ['carControlSP']
 
   def get_params_sp(self) -> None:
-    self.param_store.update(self.params)
     self.blinker_pause_lateral.get_params()
 
   def get_lat_active(self, sm: messaging.SubMaster) -> bool:
@@ -73,8 +70,6 @@ class ControlsExt:
     # MADS state
     CC_SP.mads = sm['selfdriveStateSP'].mads
 
-    CC_SP.params = self.param_store.param_list
-
     CC_SP.intelligentCruiseButtonManagement = sm['selfdriveStateSP'].intelligentCruiseButtonManagement
 
     return CC_SP

sunnypilot/selfdrive/controls/lib/param_store.py

@@ -1,44 +0,0 @@
-"""
-Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
-
-This file is part of sunnypilot and is licensed under the MIT License.
-See the LICENSE.md file in the root directory for more details.
-"""
-from cereal import custom
-from opendbc.car import structs
-from openpilot.common.params import Params
-
-from sunnypilot.sunnylink.utils import get_param_as_byte
-
-
-class ParamStore:
-  keys: list[str]
-  _params: dict[str, custom.CarControlSP.Param]
-
-  def __init__(self, CP: structs.CarParams):
-    universal_params: list[str] = []
-    brand_params: list[str] = []
-
-    self.keys = universal_params + brand_params
-    self._params = {}
-
-    self.frame = -1
-
-  def update(self, params: Params) -> None:
-    self.frame += 1
-    if self.frame % 300 != 0:
-      return
-
-    for key in self.keys:
-      param_type = params.get_type(key).name.lower()  # Using string instead of number because its "loose" dependency, and could change by OP at anytime.
-
-      # Over engineering opportunity: It's possible this conversion is slow, we may check the value as params returns it for cache purposes. Not today.
-      param_value = get_param_as_byte(key, params)
-      if (existing_param := self._params.get(key)) is not None and existing_param.value == param_value:
-        continue
-
-      self._params[key] = custom.CarControlSP.Param(key=key, value=param_value, type=param_type)
-
-  @property
-  def param_list(self) -> list[custom.CarControlSP.Param]:
-    return [v for k,v in self._params.items()]