From 05180077b6973c4a329de9f05e7056a40a30b966 Mon Sep 17 00:00:00 2001 From: Justin Newberry Date: Fri, 31 Mar 2023 01:18:44 +0000 Subject: [PATCH] rename --- opendbc | 2 +- selfdrive/car/subaru/carstate.py | 2 ++ selfdrive/car/subaru/subarucan.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/opendbc b/opendbc index 163c02a662..e67379a344 160000 --- a/opendbc +++ b/opendbc @@ -1 +1 @@ -Subproject commit 163c02a662c701660a70792863fae4bd3d3fe4f7 +Subproject commit e67379a344f9d75f3f554f8a2900f07564ff5a2c diff --git a/selfdrive/car/subaru/carstate.py b/selfdrive/car/subaru/carstate.py index 2e07a2d4cf..72bf81665a 100644 --- a/selfdrive/car/subaru/carstate.py +++ b/selfdrive/car/subaru/carstate.py @@ -277,6 +277,8 @@ class CarState(CarStateBase): ("Cruise_State", "ES_DashStatus"), ("LKAS_State", "ES_DashStatus"), + ("LKAS_State_Infotainment", "INFOTAINMENT_STATUS"), + ("COUNTER", "ES_LKAS_State"), ("LKAS_Alert_Msg", "ES_LKAS_State"), ("Signal1", "ES_LKAS_State"), diff --git a/selfdrive/car/subaru/subarucan.py b/selfdrive/car/subaru/subarucan.py index d10374a91d..ab0d97b96d 100644 --- a/selfdrive/car/subaru/subarucan.py +++ b/selfdrive/car/subaru/subarucan.py @@ -80,8 +80,8 @@ def create_infotainmentstatus(packer, infotainmentstatus_msg): values = copy.copy(infotainmentstatus_msg) # Filter stock LKAS disabled and Keep hands on steering wheel OFF alerts - if values["LKAS_State"] in [1,2]: - values["LKAS_State"] = 0 + if values["LKAS_State_Infotainment"] in [1,2]: + values["LKAS_State_Infotainment"] = 0 return packer.make_can_msg("INFOTAINMENT_STATUS", 0, values)