Hyundai: CAN-FD Hybrid gas pressed signal (#26086)

* Hyundai: Gate 0x105 behind hybrid CAN-FD only

* Update values.py

* bump panda

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
pull/26092/head
Jason Wen 3 years ago committed by GitHub
parent df6c135cfa
commit 553068f8c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      panda
  2. 4
      selfdrive/car/hyundai/carstate.py
  3. 2
      selfdrive/car/hyundai/values.py

@ -1 +1 @@
Subproject commit 5962bcd08ae4e7c5193535efb45cc9c39da52f54 Subproject commit 62868c36a80d1f44064da7b47423f0ef331f64e9

@ -156,7 +156,7 @@ class CarState(CarStateBase):
if self.CP.carFingerprint in EV_CAR: if self.CP.carFingerprint in EV_CAR:
ret.gas = cp.vl["ACCELERATOR"]["ACCELERATOR_PEDAL"] / 255. ret.gas = cp.vl["ACCELERATOR"]["ACCELERATOR_PEDAL"] / 255.
else: elif self.CP.carFingerprint in HYBRID_CAR:
ret.gas = cp.vl["ACCELERATOR_ALT"]["ACCELERATOR_PEDAL"] / 1023. ret.gas = cp.vl["ACCELERATOR_ALT"]["ACCELERATOR_PEDAL"] / 1023.
ret.gasPressed = ret.gas > 1e-5 ret.gasPressed = ret.gas > 1e-5
ret.brakePressed = cp.vl["BRAKE"]["BRAKE_PRESSED"] == 1 ret.brakePressed = cp.vl["BRAKE"]["BRAKE_PRESSED"] == 1
@ -466,7 +466,7 @@ class CarState(CarStateBase):
checks += [ checks += [
("ACCELERATOR", 100), ("ACCELERATOR", 100),
] ]
else: elif CP.carFingerprint in HYBRID_CAR:
signals += [ signals += [
("ACCELERATOR_PEDAL", "ACCELERATOR_ALT"), ("ACCELERATOR_PEDAL", "ACCELERATOR_ALT"),
] ]

@ -1397,7 +1397,7 @@ CANFD_CAR = {CAR.KIA_EV6, CAR.IONIQ_5, CAR.TUCSON_HYBRID_4TH_GEN}
# The camera does SCC on these cars, rather than the radar # The camera does SCC on these cars, rather than the radar
CAMERA_SCC_CAR = {CAR.KONA_EV_2022, } CAMERA_SCC_CAR = {CAR.KONA_EV_2022, }
HYBRID_CAR = {CAR.IONIQ_PHEV, CAR.ELANTRA_HEV_2021, CAR.KIA_NIRO_PHEV, CAR.KIA_NIRO_HEV_2021, CAR.SONATA_HYBRID, CAR.KONA_HEV, CAR.IONIQ, CAR.IONIQ_HEV_2022, CAR.SANTA_FE_HEV_2022, CAR.SANTA_FE_PHEV_2022, CAR.IONIQ_PHEV_2019} # these cars use a different gas signal HYBRID_CAR = {CAR.IONIQ_PHEV, CAR.ELANTRA_HEV_2021, CAR.KIA_NIRO_PHEV, CAR.KIA_NIRO_HEV_2021, CAR.SONATA_HYBRID, CAR.KONA_HEV, CAR.IONIQ, CAR.IONIQ_HEV_2022, CAR.SANTA_FE_HEV_2022, CAR.SANTA_FE_PHEV_2022, CAR.IONIQ_PHEV_2019, CAR.TUCSON_HYBRID_4TH_GEN} # these cars use a different gas signal
EV_CAR = {CAR.IONIQ_EV_2020, CAR.IONIQ_EV_LTD, CAR.KONA_EV, CAR.KIA_NIRO_EV, CAR.KONA_EV_2022, CAR.KIA_EV6, CAR.IONIQ_5} EV_CAR = {CAR.IONIQ_EV_2020, CAR.IONIQ_EV_LTD, CAR.KONA_EV, CAR.KIA_NIRO_EV, CAR.KONA_EV_2022, CAR.KIA_EV6, CAR.IONIQ_5}
# these cars require a special panda safety mode due to missing counters and checksums in the messages # these cars require a special panda safety mode due to missing counters and checksums in the messages

Loading…
Cancel
Save