PR #13102 from remibettan: Ubuntu24 RS-Viewer DFU fix - D457 w/a removed

IntelRealSense · Jul 3, 2024 · 660d533 · 660d533
2 parents f393369 + 3ebb3d0
commit 660d533
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/ds/d400/d400-factory.cpp b/src/ds/d400/d400-factory.cpp
@@ -1162,17 +1162,30 @@ namespace librealsense
             // Device with multi sensors can be enabled only if all sensors (RGB + Depth) are present
             auto is_pid_of_multisensor_device = [](int pid) { return std::find(std::begin(ds::d400_multi_sensors_pid), std::end(ds::d400_multi_sensors_pid), pid) != std::end(ds::d400_multi_sensors_pid); };
             bool is_device_multisensor = false;
+            auto is_pid_of_mipi_device = [](int pid) { return std::find(std::begin(ds::d400_mipi_device_pid), std::end(ds::d400_mipi_device_pid), pid) != std::end(ds::d400_mipi_device_pid); };
+            bool is_mipi_device = false;
             for (auto&& uvc : devices)
             {
                 if (is_pid_of_multisensor_device(uvc.pid))
                     is_device_multisensor = true;
+                if (is_pid_of_mipi_device(uvc.pid))
+                    is_mipi_device = true;
             }
 
             if(is_device_multisensor)
             {
-                all_sensors_present = all_sensors_present && mi_present(devices, 3);
-                // temp w/a
-                all_sensors_present = true;
+                if(!is_mipi_device)
+                {
+                    // usb devices: all sensors mi=0, except  RGB mi=3
+                    all_sensors_present = all_sensors_present &&
+                                          mi_present(devices, 3);
+                }
+                else
+                {
+                    // mipi devices: all sensors mi=0, except  Accel/Gyro mi=4
+                    all_sensors_present = all_sensors_present &&
+                                           mi_present(devices, 4);
+                }
             }
 
 

diff --git a/src/ds/d400/d400-private.h b/src/ds/d400/d400-private.h
@@ -80,6 +80,10 @@ namespace librealsense
             ds::RS457_PID
         };
 
+        static const std::set<std::uint16_t> d400_mipi_device_pid = {
+            ds::RS457_PID
+        };
+
         static const std::set<std::uint16_t> d400_hid_sensors_pid = {
             ds::RS435I_PID,
             ds::RS430I_PID,