From 3c275a5b263a0c5c478ebc4b6dca84e17c7507de Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 1 Aug 2022 09:48:03 -0700 Subject: [PATCH] Subaru: set cruiseState.standstill (#25320) * Subaru: set cruiseState.standstill * only global old-commit-hash: 9eb27259c7b9bf267671b16d17ae9a21b43105f3 --- selfdrive/car/subaru/carstate.py | 3 +++ selfdrive/test/process_replay/ref_commit | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/selfdrive/car/subaru/carstate.py b/selfdrive/car/subaru/carstate.py index 2d1e768485..de5e62cb7e 100644 --- a/selfdrive/car/subaru/carstate.py +++ b/selfdrive/car/subaru/carstate.py @@ -57,6 +57,9 @@ class CarState(CarStateBase): ret.cruiseState.available = cp_cruise.vl["CruiseControl"]["Cruise_On"] != 0 ret.cruiseState.speed = cp_cam.vl["ES_DashStatus"]["Cruise_Set_Speed"] * CV.KPH_TO_MS + if self.car_fingerprint not in PREGLOBAL_CARS: + ret.cruiseState.standstill = cp_cam.vl["ES_DashStatus"]["Cruise_State"] == 3 + if (self.car_fingerprint in PREGLOBAL_CARS and cp.vl["Dash_State2"]["UNITS"] == 1) or \ (self.car_fingerprint not in PREGLOBAL_CARS and cp.vl["Dashlights"]["UNITS"] == 1): ret.cruiseState.speed *= CV.MPH_TO_KPH diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 80f5980fb6..ef0a47fbb8 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -01e23eec1394b07d2c537f0e28493b10e05923c2 \ No newline at end of file +20c140b10eef52b6f6d6b9e142ed944264865bac \ No newline at end of file