mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-06-24 07:22:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/commaai/openpilot into devel

Browse Source
This commit is contained in:
dragonpilot
2020-02-14 11:13:29 +10:00
parent 9a7dbd0201 d25c617595
commit 89dfdd961f
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/car/toyota/values.py
+2
View File
@@ -346,6 +346,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',
@@ -465,6 +466,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',
selfdrive/controls/dmonitoringd.py
+2
View File
@@ -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