From 833557901b28e8a88ca595ba60cc1b360afad788 Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Fri, 7 Oct 2022 22:58:03 -0700
Subject: [PATCH] clean up

---
 selfdrive/car/gm/carstate.py |  6 +++---
 selfdrive/car/gm/gmcan.py    | 17 ++++-------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/selfdrive/car/gm/carstate.py b/selfdrive/car/gm/carstate.py
index 0c2ed38719..f9a98b8af0 100644
--- a/selfdrive/car/gm/carstate.py
+++ b/selfdrive/car/gm/carstate.py
@@ -122,11 +122,11 @@ class CarState(CarStateBase):
       ("RRWheelSpd", "EBCMWheelSpdRear"),
       ("PRNDL2", "ECMPRDNL2"),
       ("ManualMode", "ECMPRDNL2"),
-      ("HandsOffSWDetectionMode", "PSCMStatus"),
-      ("HandsOffSWlDetectionStatus", "PSCMStatus"),
-      ("LKATorqueDeliveredStatus", "PSCMStatus"),
       ("LKADriverAppldTrq", "PSCMStatus"),
       ("LKATorqueDelivered", "PSCMStatus"),
+      ("HandsOffSWlDetectionStatus", "PSCMStatus"),
+      ("HandsOffSWDetectionMode", "PSCMStatus"),
+      ("LKATorqueDeliveredStatus", "PSCMStatus"),
       ("LKATotalTorqueDelivered", "PSCMStatus"),
       ("PSCMStatusChecksum", "PSCMStatus"),
       ("RollingCounter", "PSCMStatus"),
diff --git a/selfdrive/car/gm/gmcan.py b/selfdrive/car/gm/gmcan.py
index 78f9d3ef63..ebeb0f3e68 100644
--- a/selfdrive/car/gm/gmcan.py
+++ b/selfdrive/car/gm/gmcan.py
@@ -1,7 +1,5 @@
-import os
 from selfdrive.car import make_can_msg
 
-
 def create_buttons(packer, bus, idx, button):
   values = {
     "ACCButtons": button,
@@ -10,17 +8,10 @@ def create_buttons(packer, bus, idx, button):
   return packer.make_can_msg("ASCMSteeringButton", bus, values)
 
 def create_pscm_status(packer, pscm_status):
-  values = pscm_status
-  hands_on = os.path.exists('/data/hands_on')
-  if hands_on:
-    checksum_mod = (1 - values["HandsOffSWlDetectionStatus"]) << 5
-    values["HandsOffSWlDetectionStatus"] = 1
-    values["PSCMStatusChecksum"] += checksum_mod
-  else:
-    checksum_mod = values["HandsOffSWlDetectionStatus"] << 5
-    values["HandsOffSWlDetectionStatus"] = 0
-    values["PSCMStatusChecksum"] -= checksum_mod
-  return packer.make_can_msg("PSCMStatus", 2, values)
+  checksum_mod = (1 - pscm_status["HandsOffSWlDetectionStatus"]) << 5
+  pscm_status["HandsOffSWlDetectionStatus"] = 1
+  pscm_status["PSCMStatusChecksum"] += checksum_mod
+  return packer.make_can_msg("PSCMStatus", 2, pscm_status)
 
 def create_steering_control(packer, bus, apply_steer, idx, lkas_active):