Merge branch 'devel-en' into devel-zhs

# Conflicts:
#	apk/ai.comma.plus.offroad.apk
This commit is contained in:
dragonpilot
2019-08-14 12:12:59 +10:00
4 changed files with 11 additions and 2 deletions
Binary file not shown.
+2
View File
@@ -107,6 +107,8 @@ keys = {
"DragonUIFace": [TxType.PERSISTENT],
"DragonUIDev": [TxType.PERSISTENT],
"DragonUIDevMini": [TxType.PERSISTENT],
"DragonBootTomTom": [TxType.PERSISTENT],
"DragonBootAutonavi": [TxType.PERSISTENT],
}
@@ -26,6 +26,8 @@ default_conf = {
'DragonUIFace': '0',
'DragonUIDev': '0',
'DragonUIDevMini': '1',
'DragonBootTomTom': '0',
'DragonBootAutonavi': '0',
}
deprecated_conf = {
+7 -2
View File
@@ -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',
]
@@ -378,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("am start -n com.autonavi.amapauto/.MainMapActivity")
while 1:
msg = messaging.recv_sock(thermal_sock, wait=True)