retropilot
/
openpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

working with snap (#20155) 

* changes

* fixes

* Update tools/plotjuggler/juggle.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
albatross
iejMac 2021-02-24 22:50:27 -08:00 committed by GitHub
parent 93450dddaa
commit 90ba43676a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/plotjuggler/install.sh
View File

@ -1,5 +1,6 @@
#!/bin/bash -e
wget https://github.com/commaai/PlotJuggler/releases/download/latest/bin.tar.gz
tar -xf bin.tar.gz
rm bin.tar.gz
sudo snap install plotjuggler
wget https://github.com/commaai/PlotJuggler/releases/download/latest/libDataLoadRlog.so.tar.gz
tar -xf libDataLoadRlog.so.tar.gz
rm libDataLoadRlog.so.tar.gz

6
tools/plotjuggler/juggle.py
View File

@ -11,6 +11,7 @@ from selfdrive.test.process_replay.compare_logs import save_log
from tools.lib.route import Route
from tools.lib.logreader import LogReader
juggle_dir = os.path.dirname(os.path.realpath(__file__))
def load_segment(segment_name):
print(f"Loading {segment_name}")
@ -30,8 +31,7 @@ def juggle_file(fn, dbc=None):
if dbc:
env["DBC_NAME"] = dbc
juggle_dir = os.path.dirname(os.path.realpath(__file__))
subprocess.call(f"bin/plotjuggler -d {fn}", shell=True, env=env, cwd=juggle_dir)
subprocess.call(f"plotjuggler --plugin_folders {juggle_dir} -d {fn}", shell=True, env=env, cwd=juggle_dir)
def juggle_route(route_name, segment_number, qlog):
r = Route(route_name)
@ -65,7 +65,7 @@ def juggle_route(route_name, segment_number, qlog):
pass
break
tempfile = NamedTemporaryFile(suffix='.rlog')
tempfile = NamedTemporaryFile(suffix='.rlog', dir=juggle_dir)
save_log(tempfile.name, all_data, compress=False)
del all_data