diff --git a/selfdrive/car/card.py b/selfdrive/car/card.py index cfadadef39..f4df3c5e19 100755 --- a/selfdrive/car/card.py +++ b/selfdrive/car/card.py @@ -118,7 +118,7 @@ class Car: # mads data_services = list(self.sm.data.keys()) + ['selfdriveStateSP'] self.sm = messaging.SubMaster(data_services, poll='selfdriveStateSP') - MadsParams().set_alternative_experience(self.CP, self.params) + MadsParams().set_alternative_experience(self.CP) openpilot_enabled_toggle = self.params.get_bool("OpenpilotEnabledToggle") diff --git a/sunnypilot/mads/helpers.py b/sunnypilot/mads/helpers.py index dbbdbaab06..ff0c334924 100644 --- a/sunnypilot/mads/helpers.py +++ b/sunnypilot/mads/helpers.py @@ -4,16 +4,15 @@ from openpilot.common.params import Params class MadsParams: - @staticmethod - def read_param(key: str, params=None): - if params is None: - params = Params() + def __init__(self): + self.params = Params() - return params.get_bool(key) + def read_param(self, key: str): + return self.params.get_bool(key) - def set_alternative_experience(self, CP, params): - enabled = self.read_param("Mads", params) - disengage_lateral_on_brake = self.read_param("MadsDisengageLateralOnBrake", params) + def set_alternative_experience(self, CP): + enabled = self.read_param("Mads") + disengage_lateral_on_brake = self.read_param("MadsDisengageLateralOnBrake") if enabled: CP.alternativeExperience |= ALTERNATIVE_EXPERIENCE.ENABLE_MADS diff --git a/sunnypilot/mads/mads.py b/sunnypilot/mads/mads.py index 1b303b435f..6fdf32a61a 100644 --- a/sunnypilot/mads/mads.py +++ b/sunnypilot/mads/mads.py @@ -23,11 +23,10 @@ class ModularAssistiveDrivingSystem: if self.selfdrive.CP.carName == "hyundai": self.allow_always = True - # TODO-SP: do we need to pass the params object from SelfdriveD? - self.enabled_toggle = mads_params.read_param("Mads", self.selfdrive.params) - self.main_enabled_toggle = mads_params.read_param("MadsCruiseMain", self.selfdrive.params) - self.disengage_lateral_on_brake_toggle = mads_params.read_param("MadsDisengageLateralOnBrake", self.selfdrive.params) - self.unified_engagement_mode = mads_params.read_param("MadsUnifiedEngagementMode", self.selfdrive.params) + self.enabled_toggle = mads_params.read_param("Mads") + self.main_enabled_toggle = mads_params.read_param("MadsCruiseMain") + self.disengage_lateral_on_brake_toggle = mads_params.read_param("MadsDisengageLateralOnBrake") + self.unified_engagement_mode = mads_params.read_param("MadsUnifiedEngagementMode") def update_events(self, CS: car.CarState): def update_unified_engagement_mode():