📄 Add Toggle to Enable Automatic Raw Log Uploading

Brings back the raw log toggle that was used prior to version
8.12.

Upload RLogs First then Videos

This reverts in part commit 2e0c73f.

selfdrive/common/params.cc

@@ -157,6 +157,7 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"TrainingVersion", PERSISTENT},
     {"UpdateAvailable", CLEAR_ON_MANAGER_START},
     {"UpdateFailedCount", CLEAR_ON_MANAGER_START},
+    {"UploadRaw", PERSISTENT},
     {"Version", PERSISTENT},
     {"VisionRadarToggle", PERSISTENT},
     {"ApiCache_Device", PERSISTENT},

selfdrive/loggerd/tests/loggerd_tests_common.py

@@ -56,6 +56,7 @@ class MockParams():
   def __init__(self):
     self.params = {
       "DongleId": b"0000000000000000",
+      "UploadRaw": b"1",
       "IsOffroad": b"1",
     }
 

selfdrive/loggerd/tests/test_uploader.py

@@ -68,6 +68,12 @@ def gen_order(self, seg1, seg2, boot=True):
       keys += [f"boot/{self.seg_format2.format(i)}.bz2" for i in seg2]
     keys += [f"{self.seg_format.format(i)}/qlog.bz2" for i in seg1]
     keys += [f"{self.seg_format2.format(i)}/qlog.bz2" for i in seg2]
+    keys += [f"{self.seg_format.format(i)}/rlog.bz2" for i in seg1]
+    keys += [f"{self.seg_format2.format(i)}/rlog.bz2" for i in seg2]
+    for i in seg1:
+      keys += [f"{self.seg_format.format(i)}/{f}" for f in ['fcamera.hevc', 'dcamera.hevc']]
+    for i in seg2:
+      keys += [f"{self.seg_format2.format(i)}/{f}" for f in ['fcamera.hevc', 'dcamera.hevc']]
     return keys
 
   def test_upload(self):

selfdrive/loggerd/uploader.py

@@ -70,10 +70,16 @@ def __init__(self, dongle_id, root):
 
     self.immediate_folders = ["crash/", "boot/"]
     self.immediate_priority = {"qlog.bz2": 0, "qcamera.ts": 1}
+    self.high_priority = {"rlog.bz2": 0}
+    self.normal_priority = {"fcamera.hevc": 1, "dcamera.hevc": 2, "ecamera.hevc": 3}
 
   def get_upload_sort(self, name):
     if name in self.immediate_priority:
       return self.immediate_priority[name]
+    if name in self.high_priority:
+      return self.high_priority[name] + 100
+    if name in self.normal_priority:
+      return self.normal_priority[name] + 300
     return 1000
 
   def list_upload_files(self):
@@ -114,7 +120,7 @@ def list_upload_files(self):
 
         yield (name, key, fn)
 
-  def next_file_to_upload(self):
+  def next_file_to_upload(self, with_raw):
     upload_files = list(self.list_upload_files())
 
     for name, key, fn in upload_files:
@@ -125,6 +131,17 @@ def next_file_to_upload(self):
       if name in self.immediate_priority:
         return (key, fn)
 
+    if with_raw:
+      # then upload the full log files, rear and front camera files
+      for name, key, fn in upload_files:
+        if name in self.high_priority:
+          return (key, fn)
+
+      # Could add a param here to disable full video uploads
+      for name, key, fn in upload_files:
+        if name in self.normal_priority:
+          return (key, fn)
+
     return None
 
   def do_upload(self, key, fn):
@@ -237,7 +254,9 @@ def uploader_fn(exit_event):
         time.sleep(60 if offroad else 5)
       continue
 
-    d = uploader.next_file_to_upload()
+    allow_raw_upload = params.get_bool("UploadRaw")
+
+    d = uploader.next_file_to_upload(with_raw=allow_raw_upload)
     if d is None:  # Nothing to upload
       if allow_sleep:
         time.sleep(60 if offroad else 5)

selfdrive/ui/qt/offroad/settings.cc

@@ -53,6 +53,12 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) {
       "Display speed in km/h instead of mph.",
       "../assets/offroad/icon_metric.png",
     },
+    {
+      "UploadRaw",
+      "Upload Raw Logs",
+      "Upload full logs and full resolution video by default while on Wi-Fi. If not enabled, individual logs can be marked for upload at useradmin.comma.ai.",
+      "../assets/offroad/icon_network.png",
+    },
     {
       "RecordFront",
       "Record and Upload Driver Camera",