diff --git a/opendbc_repo/opendbc/car/gm/interface.py b/opendbc_repo/opendbc/car/gm/interface.py index c30b6ea5f..72db19511 100755 --- a/opendbc_repo/opendbc/car/gm/interface.py +++ b/opendbc_repo/opendbc/car/gm/interface.py @@ -67,8 +67,8 @@ NON_LINEAR_TORQUE_PARAMS = { "right": [2.4, 0.95, 0.28, 0.0], }, CAR.CHEVROLET_VOLT: { - "left": [1.5, 1.0, 0.155, 0.0], - "right": [1.5, 1.0, 0.155, 0.0], + "left": [1.525, 1.05, 0.155, 0.0], + "right": [1.525, 0.95, 0.150, 0.0], }, } @@ -649,7 +649,7 @@ class CarInterface(CarInterfaceBase): # Exception for flashed cars, or cars whose camera was removed. missing_camera_msg = CAM_MSG not in fingerprint.get(CanBus.CAMERA, {}) - if (ret.networkLocation == NetworkLocation.fwdCamera or candidate in CC_ONLY_CAR) and missing_camera_msg and candidate not in SDGM_CAR: + if (ret.networkLocation == NetworkLocation.fwdCamera or candidate in CC_ONLY_CAR) and missing_camera_msg and candidate not in (ASCM_INT | SDGM_CAR): ret.flags |= GMFlags.NO_CAMERA.value ret.safetyConfigs[0].safetyParam |= GMSafetyFlags.FLAG_GM_NO_CAMERA.value diff --git a/selfdrive/controls/lib/latcontrol_torque.py b/selfdrive/controls/lib/latcontrol_torque.py index a7abe9a65..d915ebd6b 100644 --- a/selfdrive/controls/lib/latcontrol_torque.py +++ b/selfdrive/controls/lib/latcontrol_torque.py @@ -239,21 +239,21 @@ VOLT_STANDARD_FF_CUTOFF = 1.38 VOLT_STANDARD_FF_CUTOFF_WIDTH = 0.28 VOLT_STANDARD_TRANSITION_SPEED = 10.0 VOLT_STANDARD_PHASE_SCALE = 0.10 -VOLT_STANDARD_TURN_IN_BOOST_LEFT = 0.32 -VOLT_STANDARD_TURN_IN_BOOST_RIGHT = 0.34 -VOLT_STANDARD_UNWIND_TAPER_LEFT = 0.28 -VOLT_STANDARD_UNWIND_TAPER_RIGHT = 0.82 -VOLT_STANDARD_FRICTION_MULT = 1.04 +VOLT_STANDARD_TURN_IN_BOOST_LEFT = 0.20 +VOLT_STANDARD_TURN_IN_BOOST_RIGHT = 0.20 +VOLT_STANDARD_UNWIND_TAPER_LEFT = 0.20 +VOLT_STANDARD_UNWIND_TAPER_RIGHT = 0.20 +VOLT_STANDARD_FRICTION_MULT = 1.00 VOLT_STANDARD_FRICTION_LAT_RISE = 0.20 -VOLT_STANDARD_FRICTION_JERK_RISE = 0.24 -VOLT_STANDARD_TURN_IN_THRESHOLD_REDUCTION_LEFT = 0.18 -VOLT_STANDARD_TURN_IN_THRESHOLD_REDUCTION_RIGHT = 0.18 -VOLT_STANDARD_UNWIND_THRESHOLD_INCREASE_LEFT = 0.16 -VOLT_STANDARD_UNWIND_THRESHOLD_INCREASE_RIGHT = 0.68 -VOLT_STANDARD_TURN_IN_FRICTION_BOOST_LEFT = 0.09 -VOLT_STANDARD_TURN_IN_FRICTION_BOOST_RIGHT = 0.10 -VOLT_STANDARD_UNWIND_FRICTION_REDUCTION_LEFT = 0.18 -VOLT_STANDARD_UNWIND_FRICTION_REDUCTION_RIGHT = 0.62 +VOLT_STANDARD_FRICTION_JERK_RISE = 0.20 +VOLT_STANDARD_TURN_IN_THRESHOLD_REDUCTION_LEFT = 0.05 +VOLT_STANDARD_TURN_IN_THRESHOLD_REDUCTION_RIGHT = 0.05 +VOLT_STANDARD_UNWIND_THRESHOLD_INCREASE_LEFT = 0.05 +VOLT_STANDARD_UNWIND_THRESHOLD_INCREASE_RIGHT = 0.05 +VOLT_STANDARD_TURN_IN_FRICTION_BOOST_LEFT = 0.00 +VOLT_STANDARD_TURN_IN_FRICTION_BOOST_RIGHT = 0.00 +VOLT_STANDARD_UNWIND_FRICTION_REDUCTION_LEFT = 0.05 +VOLT_STANDARD_UNWIND_FRICTION_REDUCTION_RIGHT = 0.05 VOLT_STANDARD_CENTER_TAPER_MAX = 0.12 VOLT_STANDARD_CENTER_TAPER_LAT = 0.10 VOLT_STANDARD_CENTER_TAPER_LAT_WIDTH = 0.018