fix

selfdrive/controls/lib/latcontrol_torque.py

@@ -1,18 +1,10 @@
 import math
 
 from cereal import log
-<<<<<<< HEAD
 from openpilot.common.numpy_fast import interp
 from openpilot.selfdrive.controls.lib.latcontrol import LatControl
 from openpilot.selfdrive.controls.lib.pid import PIDController
 from openpilot.selfdrive.controls.lib.vehicle_model import ACCELERATION_DUE_TO_GRAVITY
-=======
-from common.numpy_fast import interp
-from selfdrive.controls.lib.latcontrol import LatControl
-from selfdrive.controls.lib.pid import PIDController
-from selfdrive.controls.lib.vehicle_model import ACCELERATION_DUE_TO_GRAVITY
-from selfdrive.controls.behaviord import LiveBehavior
->>>>>>> 26d90863f... WIP sliders
 
 # At higher speeds (25+mph) we can assume:
 # Lateral acceleration achieved by a specific car correlates to
@@ -27,7 +19,6 @@ from selfdrive.controls.behaviord import LiveBehavior
 
 LOW_SPEED_X = [0, 10, 20, 30]
 LOW_SPEED_Y = [15, 13, 10, 5]
-lb = LiveBehavior()
 
 class LatControlTorque(LatControl):
   def __init__(self, CP, CI):
@@ -47,10 +38,6 @@ class LatControlTorque(LatControl):
 
   def update(self, active, CS, VM, params, last_actuators, steer_limited, desired_curvature, desired_curvature_rate, llk):
     pid_log = log.ControlsState.LateralTorqueState.new_message()
-    #self.torque_params.latAngleFactor = lb.get_live_param("LatAngleFactor")
-    #self.torque_params.latAccelFactor = lb.get_live_param("LatAccelFactor")
-    #self.torque_params.latAccelOffset = lb.get_live_param("LatAccelOffset")
-    #self.torque_params.friction = lb.get_live_param("Friction")
     
     if not active:
       output_torque = 0.0