diff --git a/opendbc/car/gm/interface.py b/opendbc/car/gm/interface.py index ba276502..1cdb04fa 100755 --- a/opendbc/car/gm/interface.py +++ b/opendbc/car/gm/interface.py @@ -16,7 +16,7 @@ NetworkLocation = structs.CarParams.NetworkLocation NON_LINEAR_TORQUE_PARAMS = { CAR.CHEVROLET_BOLT_EUV: [2.6531724862969748, 1.0, 0.1919764879840985, 0.009054123646805178], CAR.GMC_ACADIA: [4.78003305, 1.0, 0.3122, 0.05591772], - CAR.CHEVROLET_SILVERADO: [3.8, 0.81, 0.24, 0.0465122] + CAR.CHEVROLET_SILVERADO: [3.29974374, 1.0, 0.25571356, 0.0465122] } @@ -53,10 +53,10 @@ class CarInterface(CarInterfaceBase): # This has big effect on the stability about 0 (noise when going straight) non_linear_torque_params = NON_LINEAR_TORQUE_PARAMS.get(self.CP.carFingerprint) assert non_linear_torque_params, "The params are not defined" - a, b, c, d = non_linear_torque_params + a, b, c, _ = non_linear_torque_params sig_input = a * lateral_acceleration sig = np.sign(sig_input) * (1 / (1 + exp(-fabs(sig_input))) - 0.5) - steer_torque = (sig * b) + (lateral_acceleration * c) + d + steer_torque = (sig * b) + (lateral_acceleration * c) return float(steer_torque) lataccel_values = np.arange(-5.0, 5.0, 0.01) diff --git a/opendbc/car/torque_data/override.toml b/opendbc/car/torque_data/override.toml index 5d4bc357..d2a6ece9 100644 --- a/opendbc/car/torque_data/override.toml +++ b/opendbc/car/torque_data/override.toml @@ -48,7 +48,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "CADILLAC_ESCALADE_ESV_2019" = [1.15, 1.3, 0.2] "CADILLAC_XT4" = [1.45, 1.6, 0.2] "CHEVROLET_BOLT_EUV" = [1.0, 2.0, 0.175] -"CHEVROLET_SILVERADO" = [2.014, 1.9, 0.125] +"CHEVROLET_SILVERADO" = [1.9, 1.9, 0.112] "CHEVROLET_TRAILBLAZER" = [1.33, 1.9, 0.16] "CHEVROLET_TRAVERSE" = [1.33, 1.33, 0.18] "CHEVROLET_EQUINOX" = [2.5, 2.5, 0.05]