From c7ebc05373b8c228b395fa348893e32b5503ecc1 Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Sat, 20 May 2023 18:09:57 -0700
Subject: [PATCH] GM: explicitly copy signals to forward (#28243)

* gm

* same order as DBC
old-commit-hash: 3d94423108cbe313d47301c7d6e3f24227157c07
---
 selfdrive/car/gm/gmcan.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/selfdrive/car/gm/gmcan.py b/selfdrive/car/gm/gmcan.py
index 63189bcd89..0de2066678 100644
--- a/selfdrive/car/gm/gmcan.py
+++ b/selfdrive/car/gm/gmcan.py
@@ -20,10 +20,20 @@ def create_buttons(packer, bus, idx, button):
 
 
 def create_pscm_status(packer, bus, pscm_status):
-  checksum_mod = int(1 - pscm_status["HandsOffSWlDetectionStatus"]) << 5
-  pscm_status["HandsOffSWlDetectionStatus"] = 1
-  pscm_status["PSCMStatusChecksum"] += checksum_mod
-  return packer.make_can_msg("PSCMStatus", bus, pscm_status)
+  values = {s: pscm_status[s] for s in [
+    "HandsOffSWDetectionMode",
+    "HandsOffSWlDetectionStatus",
+    "LKATorqueDeliveredStatus",
+    "LKADriverAppldTrq",
+    "LKATorqueDelivered",
+    "LKATotalTorqueDelivered",
+    "RollingCounter",
+    "PSCMStatusChecksum",
+  ]}
+  checksum_mod = int(1 - values["HandsOffSWlDetectionStatus"]) << 5
+  values["HandsOffSWlDetectionStatus"] = 1
+  values["PSCMStatusChecksum"] += checksum_mod
+  return packer.make_can_msg("PSCMStatus", bus, values)
 
 
 def create_steering_control(packer, bus, apply_steer, idx, lkas_active):