Hyundai: common CAN-FD gear signal (#25498)

* Hyundai: common CAN-FD gear signal

* bump opendbc
pull/25429/head
Adeeb Shihadeh 3 years ago committed by GitHub
parent fb19e24d60
commit 090e92bb69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      opendbc
  2. 7
      selfdrive/car/hyundai/carstate.py

@ -1 +1 @@
Subproject commit 7e095a90af3d36e6db9128a80f6f3b0cca01efa2
Subproject commit 3270c931c07bd3a47839a1a84c109eb2a7d295a6

@ -20,7 +20,7 @@ class CarState(CarStateBase):
self.main_buttons = deque([Buttons.NONE] * PREV_BUTTON_SAMPLES, maxlen=PREV_BUTTON_SAMPLES)
if CP.carFingerprint in CANFD_CAR:
self.shifter_values = can_define.dv["ACCELERATOR"]["GEAR"]
self.shifter_values = can_define.dv["GEAR_SHIFTER"]["GEAR"]
elif self.CP.carFingerprint in FEATURES["use_cluster_gears"]:
self.shifter_values = can_define.dv["CLU15"]["CF_Clu_Gear"]
elif self.CP.carFingerprint in FEATURES["use_tcu_gears"]:
@ -143,7 +143,7 @@ class CarState(CarStateBase):
ret.doorOpen = cp.vl["DOORS_SEATBELTS"]["DRIVER_DOOR_OPEN"] == 1
ret.seatbeltUnlatched = cp.vl["DOORS_SEATBELTS"]["DRIVER_SEATBELT_LATCHED"] == 0
gear = cp.vl["ACCELERATOR"]["GEAR"]
gear = cp.vl["GEAR_SHIFTER"]["GEAR"]
ret.gearShifter = self.parse_gear_shifter(self.shifter_values.get(gear))
# TODO: figure out positions
@ -381,7 +381,7 @@ class CarState(CarStateBase):
("WHEEL_SPEED_4", "WHEEL_SPEEDS"),
("ACCELERATOR_PEDAL", "ACCELERATOR"),
("GEAR", "ACCELERATOR"),
("GEAR", "GEAR_SHIFTER"),
("BRAKE_PRESSED", "BRAKE"),
("STEERING_RATE", "STEERING_SENSORS"),
@ -408,6 +408,7 @@ class CarState(CarStateBase):
checks = [
("WHEEL_SPEEDS", 100),
("ACCELERATOR", 100),
("GEAR_SHIFTER", 100),
("BRAKE", 100),
("STEERING_SENSORS", 100),
("MDPS", 100),

Loading…
Cancel
Save