From 1cb08640a1c56a72447f3beb1ff4abc4666009bf Mon Sep 17 00:00:00 2001 From: ZwX1616 Date: Sat, 8 Feb 2020 11:22:21 -0800 Subject: [PATCH 1/3] fix not resetting on interaction (#1063) --- selfdrive/controls/dmonitoringd.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/selfdrive/controls/dmonitoringd.py b/selfdrive/controls/dmonitoringd.py index 09108a62f..3c888d7b3 100755 --- a/selfdrive/controls/dmonitoringd.py +++ b/selfdrive/controls/dmonitoringd.py @@ -63,6 +63,8 @@ def dmonitoringd_thread(sm=None, pm=None): driver_engaged = len(sm['carState'].buttonEvents) > 0 or \ v_cruise != v_cruise_last or \ sm['carState'].steeringPressed + if driver_engaged: + _ = driver_status.update([], True, sm['carState'].cruiseState.enabled, sm['carState'].standstill) v_cruise_last = v_cruise # Get model meta From ae50520cb47b13546705f0881696577b06be1eb9 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Tue, 11 Feb 2020 13:33:17 -0800 Subject: [PATCH 2/3] Add engine FW version for Camry Hybrid --- selfdrive/car/toyota/values.py | 1 + 1 file changed, 1 insertion(+) diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py index 9114dd595..1dc8594d8 100644 --- a/selfdrive/car/toyota/values.py +++ b/selfdrive/car/toyota/values.py @@ -301,6 +301,7 @@ FW_VERSIONS = { b'\x028966306B2100\x00\x00\x00\x00897CF3302002\x00\x00\x00\x00', b'\x028966306N8200\x00\x00\x00\x00897CF3302002\x00\x00\x00\x00', b'\x028966306R5000\x00\x00\x00\x00897CF3302002\x00\x00\x00\x00', + b'\x028966306R6000\x00\x00\x00\x00897CF3302002\x00\x00\x00\x00', ], (Ecu.esp, 0x7b0, None): [ b'F152633712\x00\x00\x00\x00\x00\x00', From 997c7bb3bb82f4e2892aaba1dd4f0801ffa6b7b0 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Tue, 11 Feb 2020 11:42:50 -0800 Subject: [PATCH 3/3] Add Corolla Hybrid TSS2 eps firmware version --- selfdrive/car/toyota/values.py | 1 + 1 file changed, 1 insertion(+) diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py index 1dc8594d8..7fbe60512 100644 --- a/selfdrive/car/toyota/values.py +++ b/selfdrive/car/toyota/values.py @@ -421,6 +421,7 @@ FW_VERSIONS = { b'\x018965B12350\x00\x00\x00\x00\x00\x00', b'\x018965B12470\x00\x00\x00\x00\x00\x00', b'\x018965B12500\x00\x00\x00\x00\x00\x00', + b'\x018965B12530\x00\x00\x00\x00\x00\x00', ], (Ecu.esp, 0x7b0, None): [ b'F152612590\x00\x00\x00\x00\x00\x00',