From a072c467b51d2066de4d40fef533bee4252429c8 Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Tue, 30 May 2023 15:33:02 -0700
Subject: [PATCH] cars: explicitly add counter/checksum messages (#28341)

* hkg canfd: add counter/checksum

* add explicitly to subaru

* same for ES_LKAS_State

* and ES_DashStatus

* aaand INFOTAINMENT_STATUS

* and preglobal ES_Distance

* Revert "and preglobal ES_Distance"

This reverts commit 68d98307703a24296ff7aafd99503ea6af4b231b.
old-commit-hash: 439a30aae4c0495bb27aed4b5cd2d0e684fe0f1b
---
 selfdrive/car/hyundai/carstate.py | 3 +++
 selfdrive/car/subaru/carstate.py  | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/selfdrive/car/hyundai/carstate.py b/selfdrive/car/hyundai/carstate.py
index bb84dcde1d..9bf2e0d4c1 100644
--- a/selfdrive/car/hyundai/carstate.py
+++ b/selfdrive/car/hyundai/carstate.py
@@ -486,6 +486,8 @@ class CarState(CarStateBase):
 
     if not (CP.flags & HyundaiFlags.CANFD_CAMERA_SCC.value) and not CP.openpilotLongitudinalControl:
       signals += [
+        ("COUNTER", "SCC_CONTROL"),
+        ("CHECKSUM", "SCC_CONTROL"),
         ("ACCMode", "SCC_CONTROL"),
         ("VSetDis", "SCC_CONTROL"),
         ("CRUISE_STANDSTILL", "SCC_CONTROL"),
@@ -528,6 +530,7 @@ class CarState(CarStateBase):
     elif CP.flags & HyundaiFlags.CANFD_CAMERA_SCC:
       signals += [
         ("COUNTER", "SCC_CONTROL"),
+        ("CHECKSUM", "SCC_CONTROL"),
         ("NEW_SIGNAL_1", "SCC_CONTROL"),
         ("MainMode_ACC", "SCC_CONTROL"),
         ("ACCMode", "SCC_CONTROL"),
diff --git a/selfdrive/car/subaru/carstate.py b/selfdrive/car/subaru/carstate.py
index 9d7b0a65cc..8ce31b1842 100644
--- a/selfdrive/car/subaru/carstate.py
+++ b/selfdrive/car/subaru/carstate.py
@@ -110,6 +110,7 @@ class CarState(CarStateBase):
   def get_global_es_distance_signals():
     signals = [
       ("COUNTER", "ES_Distance"),
+      ("CHECKSUM", "ES_Distance"),
       ("Signal1", "ES_Distance"),
       ("Cruise_Fault", "ES_Distance"),
       ("Cruise_Throttle", "ES_Distance"),
@@ -251,6 +252,7 @@ class CarState(CarStateBase):
     else:
       signals = [
         ("COUNTER", "ES_DashStatus"),
+        ("CHECKSUM", "ES_DashStatus"),
         ("PCB_Off", "ES_DashStatus"),
         ("LDW_Off", "ES_DashStatus"),
         ("Signal1", "ES_DashStatus"),
@@ -278,6 +280,7 @@ class CarState(CarStateBase):
         ("Cruise_State", "ES_DashStatus"),
 
         ("COUNTER", "ES_LKAS_State"),
+        ("CHECKSUM", "ES_LKAS_State"),
         ("LKAS_Alert_Msg", "ES_LKAS_State"),
         ("Signal1", "ES_LKAS_State"),
         ("LKAS_ACTIVE", "ES_LKAS_State"),
@@ -305,6 +308,8 @@ class CarState(CarStateBase):
 
       if CP.flags & SubaruFlags.SEND_INFOTAINMENT:
         signals += [
+          ("COUNTER", "INFOTAINMENT_STATUS"),
+          ("CHECKSUM", "INFOTAINMENT_STATUS"),
           ("LKAS_State_Infotainment", "INFOTAINMENT_STATUS"),
           ("LKAS_Blue_Lines", "INFOTAINMENT_STATUS"),
           ("Signal1", "INFOTAINMENT_STATUS"),