diff --git a/apk/ai.comma.plus.offroad.apk b/apk/ai.comma.plus.offroad.apk index 628289125..abcadfb57 100644 Binary files a/apk/ai.comma.plus.offroad.apk and b/apk/ai.comma.plus.offroad.apk differ diff --git a/common/params.py b/common/params.py index 44bba6763..8a4bbf202 100755 --- a/common/params.py +++ b/common/params.py @@ -109,6 +109,7 @@ keys = { "DragonUIDevMini": [TxType.PERSISTENT], "DragonBootTomTom": [TxType.PERSISTENT], "DragonBootAutonavi": [TxType.PERSISTENT], + "DragonSteeringMonitorTimer": [TxType.PERSISTENT], } diff --git a/selfdrive/controls/lib/driver_monitor.py b/selfdrive/controls/lib/driver_monitor.py index c175adea6..635714101 100644 --- a/selfdrive/controls/lib/driver_monitor.py +++ b/selfdrive/controls/lib/driver_monitor.py @@ -4,8 +4,8 @@ from selfdrive.controls.lib.drive_helpers import create_event, EventTypes as ET from common.filter_simple import FirstOrderFilter from common.params import Params params = Params() - -_AWARENESS_TIME = 90. # 1.5 minutes limit without user touching steering wheels make the car enter a terminal status +_Timer = int(params.get("DragonSteeringMonitorTimer")) * 60 +_AWARENESS_TIME = _Timer if _Timer > 0 else 86400 _AWARENESS_PRE_TIME_TILL_TERMINAL = 20. # a first alert is issued 20s before expiration _AWARENESS_PROMPT_TIME_TILL_TERMINAL = 5. # a second alert is issued 5s before start decelerating the car _DISTRACTED_TIME = 10. diff --git a/selfdrive/dragonpilot/dragonconf/__init__.py b/selfdrive/dragonpilot/dragonconf/__init__.py index 7756743db..a0d6edd31 100644 --- a/selfdrive/dragonpilot/dragonconf/__init__.py +++ b/selfdrive/dragonpilot/dragonconf/__init__.py @@ -28,6 +28,7 @@ default_conf = { 'DragonUIDevMini': '1', 'DragonBootTomTom': '0', 'DragonBootAutonavi': '0', + 'DragonSteeringMonitorTimer': '3', } deprecated_conf = {