diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 5eb690b098..8cb3c9ea9d 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -494,7 +494,7 @@ class Controls: def state_transition(self, CS): """Compute conditional state transitions and execute actions on state transitions""" - #sp - toyota low speed override + # sp - toyota low speed override sp_override_speed = self.toyota_cruise_override_speed if self.toyota_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']) diff --git a/selfdrive/controls/lib/drive_helpers.py b/selfdrive/controls/lib/drive_helpers.py index 05e6777eb2..7c77f3013a 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: toyota low 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 434f4cb851..cfabbfd583 100755 --- a/system/manager/manager.py +++ b/system/manager/manager.py @@ -102,6 +102,8 @@ def manager_init() -> None: ("ToyotaAutoHold", "0"), ("ToyotaAutoLockBySpeed", "0"), ("ToyotaAutoUnlockByShifter", "0"), + ("ToyotaCruiseOverride", "0"), + ("ToyotaCruiseOverrideSpeed", "30"), ("ToyotaEnhancedBsm", "0"), ("TrueVEgoUi", "0"), ("TurnSpeedControl", "0"), @@ -117,8 +119,6 @@ def manager_init() -> None: ("CustomDrivingModel", "0"), ("DrivingModelGeneration", "4"), ("LastSunnylinkPingTime", "0"), - ("ToyotaCruiseOverride", "0"), - ("ToyotaCruiseOverrideSpeed", "30"), ] if not PC: default_params.append(("LastUpdateTime", datetime.datetime.now(datetime.UTC).replace(tzinfo=None).isoformat().encode('utf8')))