clean up

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"),

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
+  checksum_mod = (1 - pscm_status["HandsOffSWlDetectionStatus"]) << 5
-  hands_on = os.path.exists('/data/hands_on')
+  pscm_status["HandsOffSWlDetectionStatus"] = 1
-  if hands_on:
+  pscm_status["PSCMStatusChecksum"] += checksum_mod
-    checksum_mod = (1 - values["HandsOffSWlDetectionStatus"]) << 5
+  return packer.make_can_msg("PSCMStatus", 2, pscm_status)
-    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)
 
 def create_steering_control(packer, bus, apply_steer, idx, lkas_active):