From e9169797eae655b2df001e8c776b318a01a263bf Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 3 Jan 2022 16:09:53 -0800 Subject: [PATCH] GM: Switch to AcceleratorPedal2 (#23376) * GM: Switch to AcceleratorPedal2 * bump panda Co-authored-by: Jason Shuler old-commit-hash: 231f74cd23b63a4c519431a588209ec20ba05b96 --- panda | 2 +- selfdrive/car/gm/carstate.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/panda b/panda index 224736b22a..83cf88557c 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 224736b22a7fd7e665b2185a5525d3d15fc6e2de +Subproject commit 83cf88557c37a6c46c3754b926cf734481a0b33d diff --git a/selfdrive/car/gm/carstate.py b/selfdrive/car/gm/carstate.py index e4d6448348..5180d2e511 100644 --- a/selfdrive/car/gm/carstate.py +++ b/selfdrive/car/gm/carstate.py @@ -36,7 +36,7 @@ class CarState(CarStateBase): if ret.brake < 10/0xd0: ret.brake = 0. - ret.gas = pt_cp.vl["AcceleratorPedal"]["AcceleratorPedal"] / 254. + ret.gas = pt_cp.vl["AcceleratorPedal2"]["AcceleratorPedal2"] / 254. ret.gasPressed = ret.gas > 1e-5 ret.steeringAngleDeg = pt_cp.vl["PSCMSteeringAngle"]["SteeringWheelAngle"] @@ -90,7 +90,7 @@ class CarState(CarStateBase): ("LeftSeatBelt", "BCMDoorBeltStatus", 0), ("RightSeatBelt", "BCMDoorBeltStatus", 0), ("TurnSignals", "BCMTurnSignals", 0), - ("AcceleratorPedal", "AcceleratorPedal", 0), + ("AcceleratorPedal2", "AcceleratorPedal2", 0), ("CruiseState", "AcceleratorPedal2", 0), ("ACCButtons", "ASCMSteeringButton", CruiseButtons.UNPRESS), ("SteeringWheelAngle", "PSCMSteeringAngle", 0), @@ -117,7 +117,6 @@ class CarState(CarStateBase): ("EPBStatus", 20), ("EBCMWheelSpdFront", 20), ("EBCMWheelSpdRear", 20), - ("AcceleratorPedal", 33), ("AcceleratorPedal2", 33), ("ASCMSteeringButton", 33), ("ECMEngineStatus", 100),