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

old-commit-hash: 82bd082dcd3e9f38a0f7a766242b6979a611a567
This commit is contained in:
Adeeb Shihadeh
2022-10-12 22:12:24 -07:00
committed by GitHub
parent ecfef77606
commit 76da219352
2 changed files with 12 additions and 12 deletions

2
panda

Submodule panda updated: 622ce923e9...de380961fc

View File

@@ -154,7 +154,7 @@ class CarState(CarStateBase):
def update_canfd(self, cp, cp_cam):
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.
else:
ret.gas = cp.vl["ACCELERATOR_ALT"]["ACCELERATOR_PEDAL"] / 1023.
@@ -450,22 +450,22 @@ class CarState(CarStateBase):
("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 += [
("ACCELERATOR_PEDAL", "ACCELERATOR"),
("GEAR", "ACCELERATOR"),
]
checks += [
("ACCELERATOR", 100),
]
if not CP.openpilotLongitudinalControl:
signals += [
("SET_SPEED", "CRUISE_INFO"),
("CRUISE_STANDSTILL", "CRUISE_INFO"),
]
checks += [
("CRUISE_INFO", 50),
]
else:
signals += [
("ACCELERATOR_PEDAL", "ACCELERATOR_ALT"),