mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-02-19 06:33:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Toyota: rename ACC_HUD to PCS_HUD (#29150)

Browse Source 
* Toyota: rename ACC_HUD to PCS_HUD

* bump opendbc

---------

Co-authored-by: Shane Smiskol <shane@smiskol.com>
This commit is contained in:
Irene
2023-08-09 08:24:57 +10:00
committed by GitHub
parent a91764954b
commit 2bceb2425f
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opendbc

Submodule opendbc updated: 7d61776e2b...3ef5cc8e79

10
selfdrive/car/toyota/carstate.py
View File

@@ -132,7 +132,7 @@ class CarState(CarStateBase):
if self.CP.carFingerprint in (TSS2_CAR | RADAR_ACC_CAR):
if not (self.CP.flags & ToyotaFlags.SMART_DSU.value):
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
# these cars are identified by an ACC_TYPE value of 2.
@@ -263,10 +263,10 @@ class CarState(CarStateBase):
("ACC_CONTROL", 33),
]
signals += [
("FCW", "ACC_HUD"),
("FCW", "PCS_HUD"),
]
checks += [
("ACC_HUD", 1),
("PCS_HUD", 1),
]
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"),
("FORCE", "PRE_COLLISION"),
("ACC_TYPE", "ACC_CONTROL"),
("FCW", "ACC_HUD"),
("FCW", "PCS_HUD"),
]
checks += [
("PRE_COLLISION", 33),
("ACC_CONTROL", 33),
("ACC_HUD", 1),
("PCS_HUD", 1),
]
return CANParser(DBC[CP.carFingerprint]["pt"], signals, checks, 2)

2
selfdrive/car/toyota/toyotacan.py
View File

@@ -63,7 +63,7 @@ def create_fcw_command(packer, fcw):
"PCS_OFF": 1,
"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):