mawei
/
openpilot
mirror of https://github.com/1okko/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hyundai stock adas signals (#1775) 

* add stockAeb and stockFcw to carstate

* bump opendbc

* freq check

* bump opendbc
This commit is contained in:
Adeeb Shihadeh 2020-06-24 14:55:58 -07:00 committed by GitHub
parent fd29c69822
commit 28b2495597
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opendbc

@ -1 +1 @@
Subproject commit df1bb083440804c07d93f84d117d9e625b8fdb5a
Subproject commit 1dfdce9f696b4a93c9e5c66dda8d2d64a80a8fb9

7
selfdrive/car/hyundai/carstate.py
View File

@ -113,6 +113,9 @@ class CarState(CarStateBase):
else:
ret.gearShifter = GearShifter.unknown
ret.stockAeb = cp.vl["FCA11"]['FCA_CmdAct'] != 0
ret.stockFcw = cp.vl["FCA11"]['CF_VSM_Warn'] == 2
# save the entire LKAS11 and CLU11
self.lkas11 = cp_cam.vl["LKAS11"]
self.clu11 = cp.vl["CLU11"]
@ -178,6 +181,9 @@ class CarState(CarStateBase):
("SAS_Angle", "SAS11", 0),
("SAS_Speed", "SAS11", 0),
("FCA_CmdAct", "FCA11", 0),
("CF_VSM_Warn", "FCA11", 0),
("MainMode_ACC", "SCC11", 0),
("VSetDis", "SCC11", 0),
("SCCInfoDisplay", "SCC11", 0),
@ -198,6 +204,7 @@ class CarState(CarStateBase):
("SAS11", 100),
("SCC11", 50),
("SCC12", 50),
("FCA11", 50),
]
if CP.carFingerprint in EV_HYBRID: