remove unused last_actuators arg from lateral controllers (#30595)

old-commit-hash: ce4bac8218
chrysler-long2
Adeeb Shihadeh 1 year ago committed by GitHub
parent 3a3a41741e
commit f408eb207a
  1. 2
      selfdrive/controls/controlsd.py
  2. 2
      selfdrive/controls/lib/latcontrol.py
  3. 2
      selfdrive/controls/lib/latcontrol_angle.py
  4. 2
      selfdrive/controls/lib/latcontrol_pid.py
  5. 2
      selfdrive/controls/lib/latcontrol_torque.py
  6. 4
      selfdrive/controls/lib/tests/test_latcontrol.py

@ -614,7 +614,7 @@ class Controls:
lat_plan.curvatures, lat_plan.curvatures,
lat_plan.curvatureRates) lat_plan.curvatureRates)
actuators.steer, actuators.steeringAngleDeg, lac_log = self.LaC.update(CC.latActive, CS, self.VM, lp, actuators.steer, actuators.steeringAngleDeg, lac_log = self.LaC.update(CC.latActive, CS, self.VM, lp,
self.last_actuators, self.steer_limited, self.desired_curvature, self.steer_limited, self.desired_curvature,
self.desired_curvature_rate, self.sm['liveLocationKalman']) self.desired_curvature_rate, self.sm['liveLocationKalman'])
actuators.curvature = self.desired_curvature actuators.curvature = self.desired_curvature
else: else:

@ -17,7 +17,7 @@ class LatControl(ABC):
self.steer_max = 1.0 self.steer_max = 1.0
@abstractmethod @abstractmethod
def update(self, active, CS, VM, params, last_actuators, steer_limited, desired_curvature, desired_curvature_rate, llk): def update(self, active, CS, VM, params, steer_limited, desired_curvature, desired_curvature_rate, llk):
pass pass
def reset(self): def reset(self):

@ -11,7 +11,7 @@ class LatControlAngle(LatControl):
super().__init__(CP, CI) super().__init__(CP, CI)
self.sat_check_min_speed = 5. self.sat_check_min_speed = 5.
def update(self, active, CS, VM, params, last_actuators, steer_limited, desired_curvature, desired_curvature_rate, llk): def update(self, active, CS, VM, params, steer_limited, desired_curvature, desired_curvature_rate, llk):
angle_log = log.ControlsState.LateralAngleState.new_message() angle_log = log.ControlsState.LateralAngleState.new_message()
if not active: if not active:

@ -17,7 +17,7 @@ class LatControlPID(LatControl):
super().reset() super().reset()
self.pid.reset() self.pid.reset()
def update(self, active, CS, VM, params, last_actuators, steer_limited, desired_curvature, desired_curvature_rate, llk): def update(self, active, CS, VM, params, steer_limited, desired_curvature, desired_curvature_rate, llk):
pid_log = log.ControlsState.LateralPIDState.new_message() pid_log = log.ControlsState.LateralPIDState.new_message()
pid_log.steeringAngleDeg = float(CS.steeringAngleDeg) pid_log.steeringAngleDeg = float(CS.steeringAngleDeg)
pid_log.steeringRateDeg = float(CS.steeringRateDeg) pid_log.steeringRateDeg = float(CS.steeringRateDeg)

@ -36,7 +36,7 @@ class LatControlTorque(LatControl):
self.torque_params.latAccelOffset = latAccelOffset self.torque_params.latAccelOffset = latAccelOffset
self.torque_params.friction = friction self.torque_params.friction = friction
def update(self, active, CS, VM, params, last_actuators, steer_limited, desired_curvature, desired_curvature_rate, llk): def update(self, active, CS, VM, params, steer_limited, desired_curvature, desired_curvature_rate, llk):
pid_log = log.ControlsState.LateralTorqueState.new_message() pid_log = log.ControlsState.LateralTorqueState.new_message()
if not active: if not active:

@ -30,13 +30,11 @@ class TestLatControl(unittest.TestCase):
CS.vEgo = 30 CS.vEgo = 30
CS.steeringPressed = False CS.steeringPressed = False
last_actuators = car.CarControl.Actuators.new_message()
params = log.LiveParametersData.new_message() params = log.LiveParametersData.new_message()
llk = gen_llk() llk = gen_llk()
for _ in range(1000): for _ in range(1000):
_, _, lac_log = controller.update(True, CS, VM, params, last_actuators, False, 1, 0, llk) _, _, lac_log = controller.update(True, CS, VM, params, False, 1, 0, llk)
self.assertTrue(lac_log.saturated) self.assertTrue(lac_log.saturated)

Loading…
Cancel
Save