wip

SConstruct

@@ -386,10 +386,10 @@ SConscript(['third_party/SConscript'])
 
 SConscript(['selfdrive/SConscript'])
 
-if Dir('#tools/cabana/').exists() and GetOption('extras'):
+#if Dir('#tools/cabana/').exists() and GetOption('extras'):
-  SConscript(['tools/replay/SConscript'])
+SConscript(['tools/replay/SConscript'])
-  if arch != "larch64":
+# if arch != "larch64":
-    SConscript(['tools/cabana/SConscript'])
+SConscript(['tools/cabana/SConscript'])
 
 external_sconscript = GetOption('external_sconscript')
 if external_sconscript:

selfdrive/ui/translations/main_ar.ts

@@ -1372,10 +1372,6 @@ This may take up to a minute.</source>
         <source>Updates are only downloaded while the car is off or in park.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Automatically Update ClearPilot</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>ClearPilot will automatically update itself and it&apos;s assets when you&apos;re offroad and connected to Wi-Fi.</source>
         <translation type="unfinished"></translation>
@@ -1392,6 +1388,10 @@ This may take up to a minute.</source>
         <source>View the error log for openpilot crashes.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> Automatically Update ClearPilot</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SshControl</name>

selfdrive/ui/translations/main_ja.ts

@@ -1354,10 +1354,6 @@ This may take up to a minute.</source>
         <source> Automatically Update ClearPilot</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>FrogPilot will automatically update itself and it&apos;s assets when you&apos;re offroad and connected to Wi-Fi.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Error Log</source>
         <translation type="unfinished"></translation>
@@ -1370,6 +1366,10 @@ This may take up to a minute.</source>
         <source>View the error log for openpilot crashes.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>ClearPilot will automatically update itself and it&apos;s assets when you&apos;re offroad and connected to Wi-Fi.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SshControl</name>

tools/cabana/SConscript

@@ -17,7 +17,13 @@ qt_libs = ['qt_util'] + base_libs
 cabana_env = qt_env.Clone()
 cabana_libs = [widgets, cereal, messaging, visionipc, replay_lib, 'panda', 'avutil', 'avcodec', 'avformat', 'bz2', 'curl', 'yuv', 'usb-1.0'] + qt_libs
 opendbc_path = '-DOPENDBC_FILE_PATH=\'"%s"\'' % (cabana_env.Dir("../../opendbc").abspath)
+
 cabana_env['CXXFLAGS'] += [opendbc_path]
+cabana_env['CXXFLAGS'] += ["-I/usr/include/aarch64-linux-gnu/qt5/QtSerialBus"]
+cabana_env['CXXFLAGS'] += ["-I/usr/include/aarch64-linux-gnu/qt5/QtCanBus"]
+
+# Extending library list with QtSerialBus and QtCanBus
+qt_libs = qt_libs + ['Qt5SerialBus', 'Qt5CanBus']
 
 # build assets
 assets = "assets/assets.cc"

tools/cabana/streams/replaystream.h

@@ -7,6 +7,7 @@
 #include <vector>
 
 #include "common/prefix.h"
+#include "common/timing.h"
 #include "tools/cabana/streams/abstractstream.h"
 #include "tools/replay/replay.h"