From 25634cc2a0f16bcceb5f4f6353062ab68a3aefa1 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Wed, 14 Aug 2019 11:14:59 +1000 Subject: [PATCH 1/4] =?UTF-8?q?=E9=97=9C=E9=96=89=20updated?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- selfdrive/manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selfdrive/manager.py b/selfdrive/manager.py index b70a58ca6..759e03792 100755 --- a/selfdrive/manager.py +++ b/selfdrive/manager.py @@ -118,7 +118,7 @@ managed_processes = { "visiond": ("selfdrive/visiond", ["./visiond"]), "sensord": ("selfdrive/sensord", ["./start_sensord.py"]), "gpsd": ("selfdrive/sensord", ["./start_gpsd.py"]), - "updated": "selfdrive.updated", + #"updated": "selfdrive.updated", "dashcamd": "selfdrive.dragonpilot.dashcamd.dashcamd", "shutdownd": "selfdrive.dragonpilot.shutdownd.shutdownd", } @@ -147,7 +147,7 @@ persistent_processes = [ 'tombstoned', 'uploader', 'ui', - 'updated', + #'updated', 'shutdownd', ] From 675801948e3387a4fdba4004f8ab600df986e74c Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Wed, 14 Aug 2019 11:53:59 +1000 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=96=8B=E6=A9=9F?= =?UTF-8?q?=E5=95=9F=E5=8B=95TOMTOM/AUTONAVI=20=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/params.py | 2 ++ selfdrive/dragonpilot/dragonconf/__init__.py | 2 ++ selfdrive/manager.py | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/common/params.py b/common/params.py index ee8d18794..44bba6763 100755 --- a/common/params.py +++ b/common/params.py @@ -107,6 +107,8 @@ keys = { "DragonUIFace": [TxType.PERSISTENT], "DragonUIDev": [TxType.PERSISTENT], "DragonUIDevMini": [TxType.PERSISTENT], + "DragonBootTomTom": [TxType.PERSISTENT], + "DragonBootAutonavi": [TxType.PERSISTENT], } diff --git a/selfdrive/dragonpilot/dragonconf/__init__.py b/selfdrive/dragonpilot/dragonconf/__init__.py index 9fefd3365..7756743db 100644 --- a/selfdrive/dragonpilot/dragonconf/__init__.py +++ b/selfdrive/dragonpilot/dragonconf/__init__.py @@ -26,6 +26,8 @@ default_conf = { 'DragonUIFace': '0', 'DragonUIDev': '0', 'DragonUIDevMini': '1', + 'DragonBootTomTom': '0', + 'DragonBootAutonavi': '0', } deprecated_conf = { diff --git a/selfdrive/manager.py b/selfdrive/manager.py index 759e03792..6fb7515ca 100755 --- a/selfdrive/manager.py +++ b/selfdrive/manager.py @@ -371,6 +371,10 @@ def manager_thread(): # start frame pm_apply_packages('enable') + if params.get("DragonBootTomTom") == "1": + system("am start -n com.tomtom.speedcams.android.map/com.tomtom.speedcams.android.activities.SpeedCamActivity") + if params.get("DragonBootAutonavi") == "1": + system("start -n com.autonavi.amapauto/.MainMapActivity") system("am start -n ai.comma.plus.frame/.MainActivity") if os.getenv("NOBOARD") is None: From 255505e5320cda7b4b75b67c77b083cb5869abbc Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Wed, 14 Aug 2019 12:03:45 +1000 Subject: [PATCH 3/4] =?UTF-8?q?=E5=9C=A8=20frame=20=E4=B9=8B=E5=BE=8C?= =?UTF-8?q?=E5=86=8D=E9=96=8B=E5=95=9F=20tomtom/autonavi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- selfdrive/manager.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/selfdrive/manager.py b/selfdrive/manager.py index 6fb7515ca..ecfbeb55b 100755 --- a/selfdrive/manager.py +++ b/selfdrive/manager.py @@ -371,10 +371,6 @@ def manager_thread(): # start frame pm_apply_packages('enable') - if params.get("DragonBootTomTom") == "1": - system("am start -n com.tomtom.speedcams.android.map/com.tomtom.speedcams.android.activities.SpeedCamActivity") - if params.get("DragonBootAutonavi") == "1": - system("start -n com.autonavi.amapauto/.MainMapActivity") system("am start -n ai.comma.plus.frame/.MainActivity") if os.getenv("NOBOARD") is None: @@ -382,6 +378,11 @@ def manager_thread(): logger_dead = False + if params.get("DragonBootTomTom") == "1": + system("am start -n com.tomtom.speedcams.android.map/com.tomtom.speedcams.android.activities.SpeedCamActivity") + if params.get("DragonBootAutonavi") == "1": + system("start -n com.autonavi.amapauto/.MainMapActivity") + while 1: msg = messaging.recv_sock(thermal_sock, wait=True) From c4765f9aefb6e089d86b95636bd4730092b62e39 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Wed, 14 Aug 2019 12:06:42 +1000 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=96=8B=E6=A9=9F?= =?UTF-8?q?=E5=95=9F=E5=8B=95=20autonavi=20=E7=9A=84=E9=8C=AF=E8=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- selfdrive/manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/manager.py b/selfdrive/manager.py index ecfbeb55b..ccb63f1f4 100755 --- a/selfdrive/manager.py +++ b/selfdrive/manager.py @@ -381,7 +381,7 @@ def manager_thread(): if params.get("DragonBootTomTom") == "1": system("am start -n com.tomtom.speedcams.android.map/com.tomtom.speedcams.android.activities.SpeedCamActivity") if params.get("DragonBootAutonavi") == "1": - system("start -n com.autonavi.amapauto/.MainMapActivity") + system("am start -n com.autonavi.amapauto/.MainMapActivity") while 1: msg = messaging.recv_sock(thermal_sock, wait=True)