From 7c537ee201bb9fd1f61c4c755ee9d6422427d1d6 Mon Sep 17 00:00:00 2001
From: Rick Lan <ricklan@gmail.com>
Date: Thu, 27 Jun 2019 14:58:08 +1000
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=BD=89=E5=90=91=E7=87=88?=
 =?UTF-8?q?=E6=9A=AB=E6=99=82=E5=8F=96=E6=B6=88=20OP=20=E6=96=B9=E5=90=91?=
 =?UTF-8?q?=E7=9B=A4=E6=8E=A7=E5=88=B6=E9=81=B8=E9=A0=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 selfdrive/car/honda/carcontroller.py           | 4 ++++
 selfdrive/car/toyota/carcontroller.py          | 5 +++++
 selfdrive/dragonpilot/dragonconf/dragonconf.py | 7 +++++++
 3 files changed, 16 insertions(+)

diff --git a/selfdrive/car/honda/carcontroller.py b/selfdrive/car/honda/carcontroller.py
index bf7d158fc..3f7c5c93c 100644
--- a/selfdrive/car/honda/carcontroller.py
+++ b/selfdrive/car/honda/carcontroller.py
@@ -6,6 +6,8 @@ from selfdrive.car import create_gas_command
 from selfdrive.car.honda import hondacan
 from selfdrive.car.honda.values import AH, CruiseButtons, CAR
 from selfdrive.can.packer import CANPacker
+from selfdrive.dragonpilot.dragonconf.dragonconf import dragonconf
+dragonconf = dragonconf()
 
 def actuator_hystereses(brake, braking, brake_steady, v_ego, car_fingerprint):
   # hyst params
@@ -146,6 +148,8 @@ class CarController(object):
     # Send CAN commands.
     can_sends = []
 
+    if (CS.left_blinker_on or CS.right_blinker_on) and dragonconf.conf["tempDisableSteerOnSignal"]:
+      apply_steer = 0.
     # Send steering command.
     idx = frame % 4
     can_sends.append(hondacan.create_steering_control(self.packer, apply_steer,
diff --git a/selfdrive/car/toyota/carcontroller.py b/selfdrive/car/toyota/carcontroller.py
index 91bcb677a..744514d5d 100644
--- a/selfdrive/car/toyota/carcontroller.py
+++ b/selfdrive/car/toyota/carcontroller.py
@@ -8,6 +8,9 @@ from selfdrive.car.toyota.toyotacan import make_can_msg, create_video_target,\
                                            create_fcw_command
 from selfdrive.car.toyota.values import ECU, STATIC_MSGS, TSSP2_CAR
 from selfdrive.can.packer import CANPacker
+from selfdrive.dragonpilot.dragonconf.dragonconf import dragonconf
+dragonconf = dragonconf()
+
 
 VisualAlert = car.CarControl.HUDControl.VisualAlert
 AudibleAlert = car.CarControl.HUDControl.AudibleAlert
@@ -197,6 +200,8 @@ class CarController(object):
 
     can_sends = []
 
+    if (CS.left_blinker_on or CS.right_blinker_on) and dragonconf.conf["tempDisableSteerOnSignal"]:
+      apply_steer = 0.
     #*** control msgs ***
     #print("steer {0} {1} {2} {3}".format(apply_steer, min_lim, max_lim, CS.steer_torque_motor)
 
diff --git a/selfdrive/dragonpilot/dragonconf/dragonconf.py b/selfdrive/dragonpilot/dragonconf/dragonconf.py
index c5f4314f6..4d1372162 100644
--- a/selfdrive/dragonpilot/dragonconf/dragonconf.py
+++ b/selfdrive/dragonpilot/dragonconf/dragonconf.py
@@ -41,6 +41,13 @@ class dragonconf():
     if has_new_def:
       self.write(config)
 
+    # Temporary disable OP lat control when on turning singal, default False
+    if "tempDisableSteerOnSignal" not in config:
+      config["tempDisableSteerOnSignal"] = False
+      has_new_def = True
+    if has_new_def:
+      self.write(config)
+
     return config
 
   def write(self, config):