From 9fdbe9f397b79f33c0653f4e9dd3b1cbb2e92273 Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Tue, 22 Nov 2022 15:18:10 -0800
Subject: [PATCH] GM Cam: log when cruise not adaptive (#26581)

* bump opendbc

* log when nonAdaptive

* Update ref_commit
---
 opendbc                                  | 2 +-
 selfdrive/car/gm/carstate.py             | 4 ++++
 selfdrive/test/process_replay/ref_commit | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/opendbc b/opendbc
index 296f190000..871e054d9a 160000
--- a/opendbc
+++ b/opendbc
@@ -1 +1 @@
-Subproject commit 296f190000a2e71408e207ba21a2257cc853ec15
+Subproject commit 871e054d9a94629d92c22fe89cae71af5b0d3823
diff --git a/selfdrive/car/gm/carstate.py b/selfdrive/car/gm/carstate.py
index df1b4b2866..de0fd2eed6 100644
--- a/selfdrive/car/gm/carstate.py
+++ b/selfdrive/car/gm/carstate.py
@@ -100,6 +100,9 @@ class CarState(CarStateBase):
     if self.CP.networkLocation == NetworkLocation.fwdCamera:
       ret.cruiseState.speed = cam_cp.vl["ASCMActiveCruiseControlStatus"]["ACCSpeedSetpoint"] * CV.KPH_TO_MS
       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
 
@@ -112,6 +115,7 @@ class CarState(CarStateBase):
         ("AEBCmdActive", "AEBCmd"),
         ("RollingCounter", "ASCMLKASteeringCmd"),
         ("ACCSpeedSetpoint", "ASCMActiveCruiseControlStatus"),
+        ("ACCCruiseState", "ASCMActiveCruiseControlStatus"),
       ]
       checks += [
         ("AEBCmd", 10),
diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit
index 4aa9d60ab5..770b4e40f7 100644
--- a/selfdrive/test/process_replay/ref_commit
+++ b/selfdrive/test/process_replay/ref_commit
@@ -1 +1 @@
-959e63af52d9efdb62156cab4b773f88b154fd75
+ff508a46616a1a3d66e8d1154d123ffd11025003