From ebea7ebd2cc07c78a1d2206a09b36f8ae2133a37 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Fri, 13 Sep 2019 09:15:23 +1000 Subject: [PATCH] Fix ISH light_stalk message location --- selfdrive/car/toyota/carstate.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/selfdrive/car/toyota/carstate.py b/selfdrive/car/toyota/carstate.py index 69fda1053..9c6f592b5 100644 --- a/selfdrive/car/toyota/carstate.py +++ b/selfdrive/car/toyota/carstate.py @@ -235,13 +235,15 @@ class CarState(object): self.brake_lights = bool(cp.vl["ESP_CONTROL"]['BRAKE_LIGHTS_ACC'] or self.brake_pressed) if self.CP.carFingerprint == CAR.PRIUS: self.generic_toggle = cp.vl["AUTOPARK_STATUS"]['STATE'] != 0 + elif self.CP.carFingerprint == CAR.LEXUS_ISH: + self.generic_toggle = bool(cp.vl["LIGHT_STALK_ISH"]['AUTO_HIGH_BEAM']) else: self.generic_toggle = bool(cp.vl["LIGHT_STALK"]['AUTO_HIGH_BEAM']) if self.dragon_toyota_stock_dsu and self.generic_toggle and self.main_on: enable_acc = True - #if not self.gear_shifter == 'drive' or not self.seatbelt or not self.door_all_closed: - # enable_acc = False + if not self.gear_shifter == GearShifter.drive or not self.seatbelt or not self.door_all_closed: + enable_acc = False self.pcm_acc_active = enable_acc if self.standstill: self.pcm_acc_status = 7