sync: update message queues and upstream merge conflicts (#1585)

* bug: fix sp message queues and protected method access

* more

---------

Co-authored-by: Jason Wen <haibin.wen3@gmail.com>

cereal/services.py

@@ -90,8 +90,8 @@ _services: dict[str, tuple] = {
   "qRoadEncodeData": (False, 20., None, QueueSize.BIG),
 
   # sunnypilot
-  "modelManagerSP": (False, 1., 1),
-  "backupManagerSP": (False, 1., 1),
+  "modelManagerSP": (False, 1., 1, QueueSize.BIG),
+  "backupManagerSP": (False, 1., 1, QueueSize.BIG),
   "selfdriveStateSP": (True, 100., 10),
   "longitudinalPlanSP": (True, 20., 10),
   "onroadEventsSP": (True, 1., 1),
@@ -99,7 +99,7 @@ _services: dict[str, tuple] = {
   "carControlSP": (True, 100., 10),
   "carStateSP": (True, 100., 10),
   "liveMapDataSP": (True, 1., 1),
-  "modelDataV2SP": (True, 20.),
+  "modelDataV2SP": (True, 20., None, QueueSize.BIG),
   "liveLocationKalman": (True, 20.),
 
   # debug

selfdrive/ui/sunnypilot/layouts/settings/models.py

@@ -153,7 +153,7 @@ class ModelsLayout(Widget):
       self.clear_cache_item.action_item.set_value(f"{self._calculate_cache_size():.2f} MB")
 
     if self.download_status == custom.ModelManagerSP.DownloadStatus.downloading:
-      device.reset_interactive_timeout()
+      device._reset_interactive_timeout()
 
     for model in bundle.models:
       if label := labels.get(getattr(model.type, 'raw', model.type)):

selfdrive/ui/sunnypilot/layouts/settings/osm.py

@@ -165,7 +165,7 @@ class OSMLayout(Widget):
     pending = ui_state.params.get_bool("OsmDbUpdatesCheck")
     if downloading or pending:
       if downloading:
-        device.reset_interactive_timeout()
+        device._reset_interactive_timeout()
         self._update_map_size()
       self._progress.set_visible(True)
       progress = ui_state.params.get("OSMDownloadProgress")