Hyundai CAN: log nonAdaptive cruise state (#29880)

* log nonAdaptive

* bump opendbc

* test labeler

* test labeler 2

* revert
pull/29888/head
Shane Smiskol 2 years ago committed by GitHub
parent a87d62ffa6
commit 3d60e8a2a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      opendbc
  2. 2
      selfdrive/car/hyundai/carstate.py

@ -1 +1 @@
Subproject commit 966e16c31e5d7e2a08f8a365024424ee28efc240
Subproject commit 8d2f614ce3f323c65de802b2d5f29143de9c427b

@ -105,10 +105,12 @@ class CarState(CarStateBase):
ret.cruiseState.available = cp.vl["TCS13"]["ACCEnable"] == 0
ret.cruiseState.enabled = cp.vl["TCS13"]["ACC_REQ"] == 1
ret.cruiseState.standstill = False
ret.cruiseState.nonAdaptive = False
else:
ret.cruiseState.available = cp_cruise.vl["SCC11"]["MainMode_ACC"] == 1
ret.cruiseState.enabled = cp_cruise.vl["SCC12"]["ACCMode"] != 0
ret.cruiseState.standstill = cp_cruise.vl["SCC11"]["SCCInfoDisplay"] == 4.
ret.cruiseState.nonAdaptive = cp_cruise.vl["SCC11"]["SCCInfoDisplay"] == 2. # Shows 'Cruise Control' on dash
ret.cruiseState.speed = cp_cruise.vl["SCC11"]["VSetDis"] * speed_conv
# TODO: Find brake pressure

Loading…
Cancel
Save