Nissan: use cleaner Leaf brake pressed signal (#22890)

pull/22879/head
Adeeb Shihadeh 4 years ago committed by GitHub
parent 6bbcecb41c
commit c6ce88e231
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      panda
  2. 5
      selfdrive/car/nissan/carstate.py

@ -1 +1 @@
Subproject commit cc8e705d7c72fbba7a8d9f61e1d1895ee060afc5
Subproject commit 73bbf5856769a0b16c22a185635dafbe6a4aa152

@ -33,7 +33,7 @@ class CarState(CarStateBase):
if self.CP.carFingerprint in [CAR.ROGUE, CAR.XTRAIL, CAR.ALTIMA]:
ret.brakePressed = bool(cp.vl["DOORS_LIGHTS"]["USER_BRAKE_PRESSED"])
elif self.CP.carFingerprint in [CAR.LEAF, CAR.LEAF_IC]:
ret.brakePressed = bool(cp.vl["BRAKE_PEDAL"]["BRAKE_PEDAL"] > 3)
ret.brakePressed = bool(cp.vl["CRUISE_THROTTLE"]["USER_BRAKE_PRESSED"])
ret.wheelSpeeds.fl = cp.vl["WHEEL_SPEEDS_FRONT"]["WHEEL_SPEED_FL"] * CV.KPH_TO_MS
ret.wheelSpeeds.fr = cp.vl["WHEEL_SPEEDS_FRONT"]["WHEEL_SPEED_FR"] * CV.KPH_TO_MS
@ -184,8 +184,7 @@ class CarState(CarStateBase):
elif CP.carFingerprint in [CAR.LEAF, CAR.LEAF_IC]:
signals += [
("BRAKE_PEDAL", "BRAKE_PEDAL", 0),
("USER_BRAKE_PRESSED", "CRUISE_THROTTLE", 1),
("GAS_PEDAL", "CRUISE_THROTTLE", 0),
("CRUISE_AVAILABLE", "CRUISE_THROTTLE", 0),
("SPEED_MPH", "HUD_SETTINGS", 0),

Loading…
Cancel
Save