merge master

commaai · Nov 15, 2024 · 8275438 · 8275438
1 parent 808be02
commit 8275438
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/opendbc_repo b/opendbc_repo
diff --git a/selfdrive/test/process_replay/model_replay.py b/selfdrive/test/process_replay/model_replay.py
@@ -37,8 +37,8 @@ def plot(proposed, master, title, tmp):
   proposed = list(proposed)
   master = list(master)
   fig, ax = plt.subplots()
-  ax.plot(proposed, label='PROPOSED')
   ax.plot(master, label='MASTER')
+  ax.plot(proposed, label='PROPOSED')
   plt.legend(loc='best')
   plt.title(title)
   plt.savefig(f'{tmp}/{title}.png')

diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit
@@ -1 +1 @@
-2fc2e865ab77fd8145feab86d454f2111c5d9871
+dd0a40182707975c94a40d19198cd60c88735199
diff --git a/tools/cabana/streams/replaystream.cc b/tools/cabana/streams/replaystream.cc
@@ -62,7 +62,7 @@ bool ReplayStream::loadRoute(const QString &route, const QString &data_dir, uint
   QObject::connect(replay.get(), &Replay::segmentsMerged, this, &ReplayStream::mergeSegments);
   bool success = replay->load();
   if (!success) {
-    if (replay->lastRouteError() == RouteLoadError::AccessDenied) {
+    if (replay->lastRouteError() == RouteLoadError::Unauthorized) {
       auto auth_content = util::read_file(util::getenv("HOME") + "/.comma/auth.json");
       QString message;
       if (auth_content.empty()) {