spacecruft
/
nopenpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update Hyundai DBC (#1968) 

* update for new DBC update

* update to new DBC

* Ioniq uses SCC12. Ioniq EV lim uses FCA11

* update elect gear to EV_PC5 signal

* remove 'alt' from label

* revert

* update name to ev_pc5_gears

* update name to use_ev_pc5_gears

* Update values.py

* Update carstate.py

* bump opendbc

Co-authored-by: xps-genesis <65239463+xps-genesis@users.noreply.github.com>
pull/1949/head
Adeeb Shihadeh 2020-08-02 15:19:27 -07:00 committed by GitHub
parent 3eafa8d860
commit 059a27d126
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opendbc

@ -1 +1 @@
Subproject commit a59f03c179587573924edc03bacfc5aa3f77d83d
Subproject commit b7cf1a67bc71b674e6793ba1f2fff5d29fee1e6b

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

@ -281,7 +281,7 @@ class CarState(CarStateBase):
signals = [
# sig_name, sig_address, default
("CF_Lkas_Bca_R", "LKAS11", 0),
("CF_Lkas_LdwsActivemode", "LKAS11", 0),
("CF_Lkas_LdwsSysState", "LKAS11", 0),
("CF_Lkas_SysWarning", "LKAS11", 0),
("CF_Lkas_LdwsLHWarning", "LKAS11", 0),

6
selfdrive/car/hyundai/hyundaican.py
View File

@ -20,7 +20,7 @@ def create_lkas11(packer, frame, car_fingerprint, apply_steer, steer_req,
values["CF_Lkas_Chksum"] = 0
if car_fingerprint in [CAR.SONATA, CAR.PALISADE]:
values["CF_Lkas_Bca_R"] = int(left_lane) + (int(right_lane) << 1)
values["CF_Lkas_LdwsActivemode"] = int(left_lane) + (int(right_lane) << 1)
values["CF_Lkas_LdwsOpt_USM"] = 2
# FcwOpt_USM 5 = Orange blinking car + lanes
@ -40,9 +40,9 @@ def create_lkas11(packer, frame, car_fingerprint, apply_steer, steer_req,
elif car_fingerprint == CAR.HYUNDAI_GENESIS:
# This field is actually LdwsActivemode
# Genesis and Optima fault when forwarding while engaged
values["CF_Lkas_Bca_R"] = 2
values["CF_Lkas_LdwsActivemode"] = 2
elif car_fingerprint == CAR.KIA_OPTIMA:
values["CF_Lkas_Bca_R"] = 0
values["CF_Lkas_LdwsActivemode"] = 0
dat = packer.make_can_msg("LKAS11", 0, values)[2]