Toyota: rename ACC_HUD to PCS_HUD (#29150)

* Toyota: rename ACC_HUD to PCS_HUD

* bump opendbc

---------

Co-authored-by: Shane Smiskol <shane@smiskol.com>
pull/29148/head
Irene 2 years ago committed by GitHub
parent a91764954b
commit 2bceb2425f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      opendbc
  2. 10
      selfdrive/car/toyota/carstate.py
  3. 2
      selfdrive/car/toyota/toyotacan.py

@ -1 +1 @@
Subproject commit 7d61776e2b258a028b19d81852a20bc234ec6a37 Subproject commit 3ef5cc8e794e826d2267afe9cc76cbae1501dc82

@ -132,7 +132,7 @@ class CarState(CarStateBase):
if self.CP.carFingerprint in (TSS2_CAR | RADAR_ACC_CAR): if self.CP.carFingerprint in (TSS2_CAR | RADAR_ACC_CAR):
if not (self.CP.flags & ToyotaFlags.SMART_DSU.value): if not (self.CP.flags & ToyotaFlags.SMART_DSU.value):
self.acc_type = cp_acc.vl["ACC_CONTROL"]["ACC_TYPE"] self.acc_type = cp_acc.vl["ACC_CONTROL"]["ACC_TYPE"]
ret.stockFcw = bool(cp_acc.vl["ACC_HUD"]["FCW"]) ret.stockFcw = bool(cp_acc.vl["PCS_HUD"]["FCW"])
# some TSS2 cars have low speed lockout permanently set, so ignore on those cars # some TSS2 cars have low speed lockout permanently set, so ignore on those cars
# these cars are identified by an ACC_TYPE value of 2. # these cars are identified by an ACC_TYPE value of 2.
@ -263,10 +263,10 @@ class CarState(CarStateBase):
("ACC_CONTROL", 33), ("ACC_CONTROL", 33),
] ]
signals += [ signals += [
("FCW", "ACC_HUD"), ("FCW", "PCS_HUD"),
] ]
checks += [ checks += [
("ACC_HUD", 1), ("PCS_HUD", 1),
] ]
if CP.carFingerprint not in (TSS2_CAR - RADAR_ACC_CAR) and not CP.enableDsu: if CP.carFingerprint not in (TSS2_CAR - RADAR_ACC_CAR) and not CP.enableDsu:
@ -302,12 +302,12 @@ class CarState(CarStateBase):
("PRECOLLISION_ACTIVE", "PRE_COLLISION"), ("PRECOLLISION_ACTIVE", "PRE_COLLISION"),
("FORCE", "PRE_COLLISION"), ("FORCE", "PRE_COLLISION"),
("ACC_TYPE", "ACC_CONTROL"), ("ACC_TYPE", "ACC_CONTROL"),
("FCW", "ACC_HUD"), ("FCW", "PCS_HUD"),
] ]
checks += [ checks += [
("PRE_COLLISION", 33), ("PRE_COLLISION", 33),
("ACC_CONTROL", 33), ("ACC_CONTROL", 33),
("ACC_HUD", 1), ("PCS_HUD", 1),
] ]
return CANParser(DBC[CP.carFingerprint]["pt"], signals, checks, 2) return CANParser(DBC[CP.carFingerprint]["pt"], signals, checks, 2)

@ -63,7 +63,7 @@ def create_fcw_command(packer, fcw):
"PCS_OFF": 1, "PCS_OFF": 1,
"PCS_SENSITIVITY": 0, "PCS_SENSITIVITY": 0,
} }
return packer.make_can_msg("ACC_HUD", 0, values) return packer.make_can_msg("PCS_HUD", 0, values)
def create_ui_command(packer, steer, chime, left_line, right_line, left_lane_depart, right_lane_depart, enabled, stock_lkas_hud): def create_ui_command(packer, steer, chime, left_line, right_line, left_lane_depart, right_lane_depart, enabled, stock_lkas_hud):

Loading…
Cancel
Save