diff --git a/common/params.py b/common/params.py index d3451c8ee..ad4b1ac62 100755 --- a/common/params.py +++ b/common/params.py @@ -78,10 +78,10 @@ keys = { "TrainingVersion": [TxType.PERSISTENT], "Version": [TxType.PERSISTENT], #dragonpilot config - "d_enableDashcam": [TxType.PERSISTENT], - "d_enableDriverMonitor": [TxType.PERSISTENT], - "d_autoShutdownAt": [TxType.PERSISTENT], - "d_tempDisableSteerOnSignal": [TxType.PERSISTENT], + "DragonEnableDashcam": [TxType.PERSISTENT], + "DragonEnableDriverMonitor": [TxType.PERSISTENT], + "DragonAutoShutdownAt": [TxType.PERSISTENT], + "DragonTempDisableSteerOnSignal": [TxType.PERSISTENT], } diff --git a/selfdrive/car/honda/carcontroller.py b/selfdrive/car/honda/carcontroller.py index d81c26f36..99e303439 100644 --- a/selfdrive/car/honda/carcontroller.py +++ b/selfdrive/car/honda/carcontroller.py @@ -148,7 +148,7 @@ class CarController(object): # Send CAN commands. can_sends = [] - if (CS.left_blinker_on > 0 or CS.right_blinker_on > 0) and params.get("d_tempDisableSteerOnSignal") == "1": + if (CS.left_blinker_on > 0 or CS.right_blinker_on > 0) and params.get("DragonTempDisableSteerOnSignal") == "1": apply_steer = 0 # Send steering command. idx = frame % 4 diff --git a/selfdrive/car/toyota/carcontroller.py b/selfdrive/car/toyota/carcontroller.py index 8b6a5f810..0708ed1c2 100644 --- a/selfdrive/car/toyota/carcontroller.py +++ b/selfdrive/car/toyota/carcontroller.py @@ -200,7 +200,7 @@ class CarController(object): can_sends = [] - if (CS.left_blinker_on or CS.right_blinker_on) and params.get("d_tempDisableSteerOnSignal") == "1": + if (CS.left_blinker_on or CS.right_blinker_on) and params.get("DragonTempDisableSteerOnSignal") == "1": apply_steer = 0 apply_steer_req = 0 #*** control msgs *** diff --git a/selfdrive/controls/lib/driver_monitor.py b/selfdrive/controls/lib/driver_monitor.py index c79d120d0..3c036cf9f 100644 --- a/selfdrive/controls/lib/driver_monitor.py +++ b/selfdrive/controls/lib/driver_monitor.py @@ -145,7 +145,7 @@ class DriverStatus(): not (standstill and self.awareness - self.step_change <= self.threshold_prompt): self.awareness = max(self.awareness - self.step_change, -0.1) - if params.get("d_enableDriverMonitor") == "1": + if params.get("DragonEnableDriverMonitor") == "1": alert = None if self.awareness <= 0.: # terminal red alert: disengagement required diff --git a/selfdrive/dragonpilot/dashcamd/dashcamd.py b/selfdrive/dragonpilot/dashcamd/dashcamd.py index c3d8c5612..4fb3820fe 100644 --- a/selfdrive/dragonpilot/dashcamd/dashcamd.py +++ b/selfdrive/dragonpilot/dashcamd/dashcamd.py @@ -31,7 +31,7 @@ def main(gctx=None): thermal_sock = messaging.sub_sock(context, service_list['thermal'].port) while 1: - if params.get("d_enableDashcam") == "1": + if params.get("DragonEnableDashcam") == "1": # get health of board, log this in "thermal" msg = messaging.recv_sock(thermal_sock, wait=True) diff --git a/selfdrive/dragonpilot/dragonconf/__init__.py b/selfdrive/dragonpilot/dragonconf/__init__.py index 330979ef2..cbc39390b 100644 --- a/selfdrive/dragonpilot/dragonconf/__init__.py +++ b/selfdrive/dragonpilot/dragonconf/__init__.py @@ -6,10 +6,10 @@ file = '/data/dragonpilot.json' default_conf = { - 'd_enableDashcam': '1', - 'd_enableDriverMonitor': '1', - 'd_autoShutdownAt': '1800', # shutdown after 30 mins - 'd_tempDisableSteerOnSignal': '0', + 'DragonEnableDashcam': '1', + 'DragonEnableDriverMonitor': '1', + 'DragonAutoShutdownAt': '1800', # shutdown after 30 mins + 'DragonTempDisableSteerOnSignal': '0', } def write_json_config(config): diff --git a/selfdrive/dragonpilot/shutdownd/shutdownd.py b/selfdrive/dragonpilot/shutdownd/shutdownd.py index 3c004d2ea..13eb20183 100644 --- a/selfdrive/dragonpilot/shutdownd/shutdownd.py +++ b/selfdrive/dragonpilot/shutdownd/shutdownd.py @@ -28,7 +28,7 @@ def main(gctx=None): time.sleep(1) def get_shutdown_val(): - val = params.get("d_autoShutdownAt") + val = params.get("DragonAutoShutdownAt") if val is None: return None else: