diff --git a/selfdrive/controls/lib/latcontrol_torque.py b/selfdrive/controls/lib/latcontrol_torque.py index efda97bb40..7fdf50b1b1 100644 --- a/selfdrive/controls/lib/latcontrol_torque.py +++ b/selfdrive/controls/lib/latcontrol_torque.py @@ -34,7 +34,7 @@ class LatControlTorque(LatControl): self.use_steering_angle = self.torque_params.useSteeringAngle self.steering_angle_deadzone_deg = self.torque_params.steeringAngleDeadzoneDeg - self.nnlc = NeuralNetworkLateralControl(self) + self.nnlc = NeuralNetworkLateralControl(self, CP, CI) def update_live_torque_params(self, latAccelFactor, latAccelOffset, friction): self.torque_params.latAccelFactor = latAccelFactor diff --git a/sunnypilot/selfdrive/controls/lib/nnlc/nnlc.py b/sunnypilot/selfdrive/controls/lib/nnlc/nnlc.py index 3ca1dfd752..b3031f7f46 100644 --- a/sunnypilot/selfdrive/controls/lib/nnlc/nnlc.py +++ b/sunnypilot/selfdrive/controls/lib/nnlc/nnlc.py @@ -76,11 +76,11 @@ def roll_pitch_adjust(roll, pitch): class NeuralNetworkLateralControl: - def __init__(self, lac_torque): + def __init__(self, lac_torque, CI, CP): self.lac_torque = lac_torque - self.CI = lac_torque.CI - self.CP = lac_torque.CP - self.CP_SP = lac_torque.CI.CP_SP + self.CI = CI + self.CP = CP + self.CP_SP = CI.CP_SP self.params = Params() # NN model takes current v_ego, lateral_accel, lat accel/jerk error, roll, and past/future/planned data