From a6545b1604aabada34a361cae9aa394ca6a0fa43 Mon Sep 17 00:00:00 2001 From: Dragonpilot Date: Fri, 12 Jul 2019 12:08:16 +1000 Subject: [PATCH] =?UTF-8?q?=E6=96=B9=E5=90=91=E7=87=88=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=96=B9=E5=90=91=E7=9B=A4=E6=8E=A7=E5=88=B6=E9=96=8B=E5=95=9F?= =?UTF-8?q?=E6=99=82=E9=A1=AF=E7=A4=BA=E6=8F=90=E7=A4=BA=E8=A8=8A=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- selfdrive/car/honda/interface.py | 4 +++- selfdrive/car/toyota/interface.py | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/selfdrive/car/honda/interface.py b/selfdrive/car/honda/interface.py index 8267ec401..9718c892f 100755 --- a/selfdrive/car/honda/interface.py +++ b/selfdrive/car/honda/interface.py @@ -12,6 +12,8 @@ from selfdrive.car.honda.carstate import CarState, get_can_parser, get_cam_can_p from selfdrive.car.honda.values import CruiseButtons, CAR, HONDA_BOSCH, AUDIO_HUD, VISUAL_HUD, CAMERA_MSGS from selfdrive.car import STD_CARGO_KG, CivicParams, scale_rot_inertia, scale_tire_stiffness from selfdrive.controls.lib.planner import _A_CRUISE_MAX_V_FOLLOWING +from common.params import Params +params = Params() A_ACC_MAX = max(_A_CRUISE_MAX_V_FOLLOWING) @@ -475,7 +477,7 @@ class CarInterface(object): events.append(create_event('invalidGiraffeHonda', [ET.NO_ENTRY, ET.IMMEDIATE_DISABLE, ET.PERMANENT])) if not self.CS.lkMode: events.append(create_event('manualSteeringRequired', [ET.WARNING])) - elif self.CS.lkMode and (self.CS.left_blinker_on or self.CS.right_blinker_on): + elif self.CS.lkMode and (self.CS.left_blinker_on or self.CS.right_blinker_on) and params.get("DragonTempDisableSteerOnSignal") == "1": events.append(create_event('manualSteeringRequiredBlinkersOn', [ET.WARNING])) elif self.CS.steer_error: events.append(create_event('steerUnavailable', [ET.NO_ENTRY, ET.IMMEDIATE_DISABLE, ET.PERMANENT])) diff --git a/selfdrive/car/toyota/interface.py b/selfdrive/car/toyota/interface.py index a1cffae95..dfb14e97b 100755 --- a/selfdrive/car/toyota/interface.py +++ b/selfdrive/car/toyota/interface.py @@ -8,7 +8,8 @@ from selfdrive.car.toyota.carstate import CarState, get_can_parser, get_cam_can_ from selfdrive.car.toyota.values import ECU, check_ecu_msgs, CAR, NO_STOP_TIMER_CAR from selfdrive.car import STD_CARGO_KG, scale_rot_inertia, scale_tire_stiffness from selfdrive.swaglog import cloudlog - +from common.params import Params +params = Params() class CarInterface(object): def __init__(self, CP, CarController): @@ -340,7 +341,9 @@ class CarInterface(object): events.append(create_event('wrongCarMode', [ET.NO_ENTRY, ET.USER_DISABLE])) if ret.gearShifter == 'reverse' and self.CP.enableDsu: events.append(create_event('reverseGear', [ET.NO_ENTRY, ET.IMMEDIATE_DISABLE])) - if self.CS.steer_error: + if (self.CS.left_blinker_on or self.CS.right_blinker_on) and params.get("DragonTempDisableSteerOnSignal") == "1": + events.append(create_event('manualSteeringRequiredBlinkersOn', [ET.WARNING])) + elif self.CS.steer_error: events.append(create_event('steerTempUnavailable', [ET.NO_ENTRY, ET.WARNING])) if self.CS.low_speed_lockout and self.CP.enableDsu: events.append(create_event('lowSpeedLockout', [ET.NO_ENTRY, ET.PERMANENT]))