Hyundai: split alt gas pressed signals by EV and ICE (#26061)

old-commit-hash: 82bd082dcd
taco
Adeeb Shihadeh 3 years ago committed by GitHub
parent ecfef77606
commit 76da219352
  1. 2
      panda
  2. 22
      selfdrive/car/hyundai/carstate.py

@ -1 +1 @@
Subproject commit 622ce923e901c634aab4c29be68638e38b0fcc16 Subproject commit de380961fcfece68137ea0c4f5dc07f2763a4aaf

@ -154,7 +154,7 @@ class CarState(CarStateBase):
def update_canfd(self, cp, cp_cam): def update_canfd(self, cp, cp_cam):
ret = car.CarState.new_message() ret = car.CarState.new_message()
if self.CP.flags & HyundaiFlags.CANFD_HDA2: if self.CP.carFingerprint in EV_CAR:
ret.gas = cp.vl["ACCELERATOR"]["ACCELERATOR_PEDAL"] / 255. ret.gas = cp.vl["ACCELERATOR"]["ACCELERATOR_PEDAL"] / 255.
else: else:
ret.gas = cp.vl["ACCELERATOR_ALT"]["ACCELERATOR_PEDAL"] / 1023. ret.gas = cp.vl["ACCELERATOR_ALT"]["ACCELERATOR_PEDAL"] / 1023.
@ -450,22 +450,22 @@ class CarState(CarStateBase):
("DOORS_SEATBELTS", 4), ("DOORS_SEATBELTS", 4),
] ]
if CP.flags & HyundaiFlags.CANFD_HDA2: if CP.flags & HyundaiFlags.CANFD_HDA2 and not CP.openpilotLongitudinalControl:
signals += [
("SET_SPEED", "CRUISE_INFO"),
("CRUISE_STANDSTILL", "CRUISE_INFO"),
]
checks += [
("CRUISE_INFO", 50),
]
if CP.carFingerprint in EV_CAR:
signals += [ signals += [
("ACCELERATOR_PEDAL", "ACCELERATOR"), ("ACCELERATOR_PEDAL", "ACCELERATOR"),
("GEAR", "ACCELERATOR"),
] ]
checks += [ checks += [
("ACCELERATOR", 100), ("ACCELERATOR", 100),
] ]
if not CP.openpilotLongitudinalControl:
signals += [
("SET_SPEED", "CRUISE_INFO"),
("CRUISE_STANDSTILL", "CRUISE_INFO"),
]
checks += [
("CRUISE_INFO", 50),
]
else: else:
signals += [ signals += [
("ACCELERATOR_PEDAL", "ACCELERATOR_ALT"), ("ACCELERATOR_PEDAL", "ACCELERATOR_ALT"),

Loading…
Cancel
Save