try to forward this PSCMStatus

pull/26010/head
Shane Smiskol 3 years ago
parent e027c004f8
commit beba07f9fc
  1. 2
      panda
  2. 3
      selfdrive/car/gm/carcontroller.py
  3. 1
      selfdrive/car/gm/carstate.py
  4. 8
      selfdrive/car/gm/gmcan.py

@ -1 +1 @@
Subproject commit 3334dc21f5c55007c5a754dfd8ee5d642be3e2bb Subproject commit b76f242955c68eb7dbe683d362a61bd6948a93a2

@ -108,6 +108,9 @@ class CarController:
can_sends += gmcan.create_adas_keepalive(CanBus.POWERTRAIN) can_sends += gmcan.create_adas_keepalive(CanBus.POWERTRAIN)
else: else:
if self.frame % 10 == 0:
can_sends.append(gmcan.create_pscm_status(self.packer_pt, CS.pscm_status))
# Stock longitudinal, integrated at camera # Stock longitudinal, integrated at camera
if (self.frame - self.last_button_frame) * DT_CTRL > 0.04: if (self.frame - self.last_button_frame) * DT_CTRL > 0.04:
if CC.cruiseControl.cancel: if CC.cruiseControl.cancel:

@ -59,6 +59,7 @@ class CarState(CarStateBase):
self.lka_steering_cmd_counter = loopback_cp.vl["ASCMLKASteeringCmd"]["RollingCounter"] self.lka_steering_cmd_counter = loopback_cp.vl["ASCMLKASteeringCmd"]["RollingCounter"]
# 0 inactive, 1 active, 2 temporarily limited, 3 failed # 0 inactive, 1 active, 2 temporarily limited, 3 failed
self.pscm_status = pt_cp.vl["PSCMStatus"]
self.lkas_status = pt_cp.vl["PSCMStatus"]["LKATorqueDeliveredStatus"] self.lkas_status = pt_cp.vl["PSCMStatus"]["LKATorqueDeliveredStatus"]
ret.steerFaultTemporary = self.lkas_status == 2 ret.steerFaultTemporary = self.lkas_status == 2
ret.steerFaultPermanent = self.lkas_status == 3 ret.steerFaultPermanent = self.lkas_status == 3

@ -1,5 +1,6 @@
from selfdrive.car import make_can_msg from selfdrive.car import make_can_msg
def create_buttons(packer, bus, idx, button): def create_buttons(packer, bus, idx, button):
values = { values = {
"ACCButtons": button, "ACCButtons": button,
@ -7,6 +8,13 @@ def create_buttons(packer, bus, idx, button):
} }
return packer.make_can_msg("ASCMSteeringButton", bus, values) return packer.make_can_msg("ASCMSteeringButton", bus, values)
def create_pscm_status(packer, pscm_status):
values = pscm_status.copy()
values["LKASteeringCmdActive"] = 0
values["LKASteeringCmd"] = 0
return packer.make_can_msg("PSCMStatus", 2, values)
def create_steering_control(packer, bus, apply_steer, idx, lkas_active): def create_steering_control(packer, bus, apply_steer, idx, lkas_active):
values = { values = {

Loading…
Cancel
Save