Nissan: cleanup set speed (#25233)

* Nissan: cleanup set speed

* update ref
old-commit-hash: f0d494b752
taco
Willem Melching 3 years ago committed by GitHub
parent 862e3a8300
commit 46b28bc680
  1. 2
      selfdrive/car/nissan/carstate.py
  2. 2
      selfdrive/test/process_replay/ref_commit

@ -74,8 +74,8 @@ class CarState(CarStateBase):
conversion = CV.MPH_TO_MS if cp.vl["HUD_SETTINGS"]["SPEED_MPH"] else CV.KPH_TO_MS conversion = CV.MPH_TO_MS if cp.vl["HUD_SETTINGS"]["SPEED_MPH"] else CV.KPH_TO_MS
else: else:
conversion = CV.MPH_TO_MS if cp.vl["HUD"]["SPEED_MPH"] else CV.KPH_TO_MS conversion = CV.MPH_TO_MS if cp.vl["HUD"]["SPEED_MPH"] else CV.KPH_TO_MS
speed -= 1 # Speed on HUD is always 1 lower than actually sent on can bus
ret.cruiseState.speed = speed * conversion ret.cruiseState.speed = speed * conversion
ret.cruiseState.speedCluster = (speed - 1) * conversion # Speed on HUD is always 1 lower than actually sent on can bus
if self.CP.carFingerprint == CAR.ALTIMA: if self.CP.carFingerprint == CAR.ALTIMA:
ret.steeringTorque = cp_cam.vl["STEER_TORQUE_SENSOR"]["STEER_TORQUE_DRIVER"] ret.steeringTorque = cp_cam.vl["STEER_TORQUE_SENSOR"]["STEER_TORQUE_DRIVER"]

@ -1 +1 @@
658b1097663a8deea2c4d77c4c00a514739980bb 2bfa96aad8b951988cf9d0dd95d3c9d9019a1c0e
Loading…
Cancel
Save