Add toyota lane departure warning toggle

This commit is contained in:
dragonpilot
2019-09-23 13:34:31 +10:00
parent 01542c4a19
commit 951b5c695a
4 changed files with 13 additions and 1 deletions
Binary file not shown.
+1
View File
@@ -125,6 +125,7 @@ keys = {
"DragonChargingCtrl": [TxType.PERSISTENT],
"DragonCharging": [TxType.PERSISTENT],
"DragonDisCharging": [TxType.PERSISTENT],
"DragonToyotaLaneDepartureWarning": [TxType.PERSISTENT],
}
+11 -1
View File
@@ -122,6 +122,7 @@ class CarController(object):
self.dragon_enable_steering_on_signal = False
self.dragon_allow_gas = False
self.dragon_lat_ctrl = True
self.dragon_lane_departure_warning = True
def update(self, enabled, CS, frame, actuators,
pcm_cancel_cmd, hud_alert, forwarding_camera, left_line,
@@ -131,6 +132,7 @@ class CarController(object):
self.dragon_enable_steering_on_signal = False if params.get("DragonEnableSteeringOnSignal") == "0" else True
self.dragon_allow_gas = False if params.get("DragonAllowGas") == "0" else True
self.dragon_lat_ctrl = False if params.get("DragonLatCtrl") == "0" else True
self.dragon_lane_departure_warning = False if params.get("DragonToyotaLaneDepartureWarning") == "0" else True
# *** compute control surfaces ***
@@ -293,8 +295,16 @@ class CarController(object):
if pcm_cancel_cmd:
send_ui = True
# dragonpilot, lane depart warning mod
if self.dragon_lane_departure_warning:
dragon_left_lane_depart = left_lane_depart
dragon_right_lane_depart = right_lane_depart
else:
dragon_left_lane_depart = False
dragon_right_lane_depart = False
if (frame % 100 == 0 or send_ui) and ECU.CAM in self.fake_ecus:
can_sends.append(create_ui_command(self.packer, steer, pcm_cancel_cmd, left_line, right_line, left_lane_depart, right_lane_depart))
can_sends.append(create_ui_command(self.packer, steer, pcm_cancel_cmd, left_line, right_line, dragon_left_lane_depart, dragon_right_lane_depart))
if frame % 100 == 0 and ECU.DSU in self.fake_ecus and self.car_fingerprint not in TSS2_CAR:
can_sends.append(create_fcw_command(self.packer, fcw))
@@ -45,6 +45,7 @@ default_conf = {
'DragonChargingCtrl': '0',
'DragonCharging': 70,
'DragonDisCharging': 60,
'DragonToyotaLaneDepartureWarning': '1',
}
deprecated_conf = {