From f3a4c0c6a5dd3a0a306e5920d37b2da6e29a7005 Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Tue, 11 Oct 2022 22:55:21 -0700
Subject: [PATCH] GM camera ACC: log stock aeb/fcw (#26017)

* GM camera ACC: log aeb/fcw

* order

* fix stockAeb
old-commit-hash: 5ad89425a7b4a888ae43228af92b8839f79ec9ec
---
 selfdrive/car/gm/carstate.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/selfdrive/car/gm/carstate.py b/selfdrive/car/gm/carstate.py
index 6d1e2b9d44..11c521e863 100644
--- a/selfdrive/car/gm/carstate.py
+++ b/selfdrive/car/gm/carstate.py
@@ -92,6 +92,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
+      ret.stockFcw = cam_cp.vl["ASCMActiveCruiseControlStatus"]["FCWAlert"] != 0
+
     return ret
 
   @staticmethod
@@ -100,10 +103,13 @@ class CarState(CarStateBase):
     checks = []
     if CP.networkLocation == NetworkLocation.fwdCamera:
       signals += [
+        ("AEBCmdActive", "AEBCmd"),
         ("RollingCounter", "ASCMLKASteeringCmd"),
+        ("FCWAlert", "ASCMActiveCruiseControlStatus"),
         ("ACCSpeedSetpoint", "ASCMActiveCruiseControlStatus"),
       ]
       checks += [
+        ("AEBCmd", 10),
         ("ASCMLKASteeringCmd", 10),
         ("ASCMActiveCruiseControlStatus", 25),
       ]