From 70a6e036920618f1c0b3fa52c4e11d4c234f5520 Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Sat, 11 Feb 2023 00:12:33 -0800
Subject: [PATCH] GM: add permanent ACC fault signal (#27306)

* bump opendbc

* check signal

* bump opendbc
old-commit-hash: 6474e16a720e88181f03652dcfe91306ddbdc06e
---
 opendbc                      | 2 +-
 selfdrive/car/gm/carstate.py | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/opendbc b/opendbc
index 6eab6cf6ad..510bfc0695 160000
--- a/opendbc
+++ b/opendbc
@@ -1 +1 @@
-Subproject commit 6eab6cf6ad5ac69539037f4508582fbfaf239eab
+Subproject commit 510bfc06954e31257f8d8de17adf92f9a68a1b71
diff --git a/selfdrive/car/gm/carstate.py b/selfdrive/car/gm/carstate.py
index 90705d871e..3c7d35f2dc 100644
--- a/selfdrive/car/gm/carstate.py
+++ b/selfdrive/car/gm/carstate.py
@@ -100,7 +100,8 @@ class CarState(CarStateBase):
     ret.parkingBrake = pt_cp.vl["VehicleIgnitionAlt"]["ParkBrake"] == 1
     ret.cruiseState.available = pt_cp.vl["ECMEngineStatus"]["CruiseMainOn"] != 0
     ret.espDisabled = pt_cp.vl["ESPStatus"]["TractionControlOn"] != 1
-    ret.accFaulted = pt_cp.vl["AcceleratorPedal2"]["CruiseState"] == AccState.FAULTED
+    ret.accFaulted = (pt_cp.vl["AcceleratorPedal2"]["CruiseState"] == AccState.FAULTED or
+                      pt_cp.vl["EBCMFrictionBrakeStatus"]["FrictionBrakeUnavailable"] == 1)
 
     ret.cruiseState.enabled = pt_cp.vl["AcceleratorPedal2"]["CruiseState"] != AccState.OFF
     ret.cruiseState.standstill = pt_cp.vl["AcceleratorPedal2"]["CruiseState"] == AccState.STANDSTILL
@@ -155,6 +156,7 @@ class CarState(CarStateBase):
       ("RLWheelSpd", "EBCMWheelSpdRear"),
       ("RRWheelSpd", "EBCMWheelSpdRear"),
       ("MovingBackward", "EBCMWheelSpdRear"),
+      ("FrictionBrakeUnavailable", "EBCMFrictionBrakeStatus"),
       ("PRNDL2", "ECMPRDNL2"),
       ("ManualMode", "ECMPRDNL2"),
       ("LKADriverAppldTrq", "PSCMStatus"),
@@ -180,6 +182,7 @@ class CarState(CarStateBase):
       ("VehicleIgnitionAlt", 10),
       ("EBCMWheelSpdFront", 20),
       ("EBCMWheelSpdRear", 20),
+      ("EBCMFrictionBrakeStatus", 20),
       ("AcceleratorPedal2", 33),
       ("ASCMSteeringButton", 33),
       ("ECMEngineStatus", 100),