GM Cam: log when cruise not adaptive (#26581)

* bump opendbc

* log when nonAdaptive

* Update ref_commit
old-commit-hash: 9fdbe9f397
taco
Shane Smiskol 2 years ago committed by GitHub
parent 4a67971c61
commit cf287d796b
  1. 2
      opendbc
  2. 4
      selfdrive/car/gm/carstate.py
  3. 2
      selfdrive/test/process_replay/ref_commit

@ -1 +1 @@
Subproject commit 296f190000a2e71408e207ba21a2257cc853ec15 Subproject commit 871e054d9a94629d92c22fe89cae71af5b0d3823

@ -100,6 +100,9 @@ class CarState(CarStateBase):
if self.CP.networkLocation == NetworkLocation.fwdCamera: if self.CP.networkLocation == NetworkLocation.fwdCamera:
ret.cruiseState.speed = cam_cp.vl["ASCMActiveCruiseControlStatus"]["ACCSpeedSetpoint"] * CV.KPH_TO_MS ret.cruiseState.speed = cam_cp.vl["ASCMActiveCruiseControlStatus"]["ACCSpeedSetpoint"] * CV.KPH_TO_MS
ret.stockAeb = cam_cp.vl["AEBCmd"]["AEBCmdActive"] != 0 ret.stockAeb = cam_cp.vl["AEBCmd"]["AEBCmdActive"] != 0
# openpilot controls nonAdaptive when not pcmCruise
if self.CP.pcmCruise:
ret.cruiseState.nonAdaptive = cam_cp.vl["ASCMActiveCruiseControlStatus"]["ACCCruiseState"] not in (2, 3)
return ret return ret
@ -112,6 +115,7 @@ class CarState(CarStateBase):
("AEBCmdActive", "AEBCmd"), ("AEBCmdActive", "AEBCmd"),
("RollingCounter", "ASCMLKASteeringCmd"), ("RollingCounter", "ASCMLKASteeringCmd"),
("ACCSpeedSetpoint", "ASCMActiveCruiseControlStatus"), ("ACCSpeedSetpoint", "ASCMActiveCruiseControlStatus"),
("ACCCruiseState", "ASCMActiveCruiseControlStatus"),
] ]
checks += [ checks += [
("AEBCmd", 10), ("AEBCmd", 10),

@ -1 +1 @@
959e63af52d9efdb62156cab4b773f88b154fd75 ff508a46616a1a3d66e8d1154d123ffd11025003

Loading…
Cancel
Save