From d8e77e1ac37ecae867747115543fed6cce479d99 Mon Sep 17 00:00:00 2001 From: Shane Date: Thu, 13 Jun 2019 19:31:56 -0500 Subject: [PATCH 1/5] don't use custom apk --- launch_chffrplus.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launch_chffrplus.sh b/launch_chffrplus.sh index 62d0e06ac9b4f2..837e0025b0036c 100755 --- a/launch_chffrplus.sh +++ b/launch_chffrplus.sh @@ -27,7 +27,7 @@ function launch { export PYTHONPATH="$PWD" # check to see if custom APK is installed - python ./checkCustomAPK.py + #python ./checkCustomAPK.py # start manager cd selfdrive From fe792a129b3424c497b6c9f2656068d5637e2d7f Mon Sep 17 00:00:00 2001 From: Shane Date: Thu, 13 Jun 2019 19:38:17 -0500 Subject: [PATCH 2/5] simplify crash.py --- selfdrive/crash.py | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/selfdrive/crash.py b/selfdrive/crash.py index f59a0fd889d8ce..00979fcd44eba4 100644 --- a/selfdrive/crash.py +++ b/selfdrive/crash.py @@ -21,35 +21,30 @@ def install(): from raven import Client from raven.transport.http import HTTPTransport - error_tags = {'dirty': dirty, 'branch': 'unknown'} + error_tags = {'dirty': dirty, 'username': 'char_error'} try: with open("/data/data/ai.comma.plus.offroad/files/persistStore/persist-auth", "r") as f: auth = json.loads(f.read()) auth = json.loads(auth['commaUser']) - try: - error_tags['username'] = ''.join(char for char in auth['username'].decode('utf-8', 'ignore') if char.isalnum()) - except: - error_tags['username'] = "char_error" - try: - error_tags['email'] = auth['email'] - except: - pass + tags = ['username', 'email'] + for tag in tags: + try: + error_tags[tag] = ''.join(char for char in auth[tag].decode('utf-8', 'ignore') if char.isalnum()) + except: + pass except: pass try: with open("/data/params/d/CommunityPilotUser", "r") as f: auth = json.loads(f.read()) - - try: - error_tags['username'] = ''.join(char for char in auth['username'].decode('utf-8', 'ignore') if char.isalnum()) - except: - error_tags['username'] = "char_error" - try: - error_tags['email'] = auth['email'] - except: - pass + tags = ['username', 'email'] + for tag in tags: + try: + error_tags[tag] = ''.join(char for char in auth[tag].decode('utf-8', 'ignore') if char.isalnum()) + except: + pass except: pass From 8e139d45edac263aec263622beb5e0ec45a01b7c Mon Sep 17 00:00:00 2001 From: Shane Date: Thu, 13 Jun 2019 19:49:53 -0500 Subject: [PATCH 3/5] use custom apk --- launch_chffrplus.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launch_chffrplus.sh b/launch_chffrplus.sh index 837e0025b0036c..62d0e06ac9b4f2 100755 --- a/launch_chffrplus.sh +++ b/launch_chffrplus.sh @@ -27,7 +27,7 @@ function launch { export PYTHONPATH="$PWD" # check to see if custom APK is installed - #python ./checkCustomAPK.py + python ./checkCustomAPK.py # start manager cd selfdrive From 7d2cfae4e4ceb4dd30324810e64be421df74527f Mon Sep 17 00:00:00 2001 From: Shane Date: Thu, 13 Jun 2019 19:50:10 -0500 Subject: [PATCH 4/5] fix error --- checkCustomAPK.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkCustomAPK.py b/checkCustomAPK.py index 89aa683cba6bec..9c1884ebf3b639 100755 --- a/checkCustomAPK.py +++ b/checkCustomAPK.py @@ -37,7 +37,7 @@ def waitForConnection(): if not path_exists: print "%s does not exist, installing" % apk_dir - waitForconnection() + waitForConnection() os.system("curl -L %s | python" % install_script) else: print "APK already installed" From fd69885cb380cd1e80bc0c9f30d27f2bf16990a7 Mon Sep 17 00:00:00 2001 From: Arne Schwarck Date: Fri, 14 Jun 2019 10:18:44 +0200 Subject: [PATCH 5/5] Update .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index e27599f833af42..807e1f9382d5e3 100644 --- a/.gitignore +++ b/.gitignore @@ -34,5 +34,9 @@ selfdrive/test/tests/plant/out selfdrive/visiond/visiond selfdrive/visiond/visiond-normal /src/ +apk/ai.comma.plus.offroad.apk +openpilot +selfdrive/data_collection/df-data +selfdrive/data_collection/gps-data one