Enabling USB and MIPI at once

common/fw-update-helper.cpp

@@ -194,10 +194,61 @@ namespace rs2
         return false;
     }
 
+    void firmware_update_manager_mipi::process_flow(std::function<void()> cleanup, invoker invoke)
+    {
+        if (!_is_signed)
+        {
+            LOG_INFO("Only Signed Firmware can be burnt on MIPI device");
+            return;
+        }
+        auto dev_updatable = _dev.as<updatable>();
+        if(!(dev_updatable && dev_updatable.check_firmware_compatibility(_fw)))
+        {
+            fail("Firmware Update failed - fw version must be newer than version 5.13.1.1");
+            return;
+        }
+
+        // Enter DFU mode
+        auto device_debug = _dev.as<rs2::debug_protocol>();
+        uint32_t dfu_opcode = 0x1e;
+        device_debug.build_command(dfu_opcode, 1);
+
+        _progress = 30;
+        // Grant permissions for writing
+        // skipped for now - must be done in sudo
+        //chmod("/dev/d4xx-dfu504", __S_IREAD|__S_IWRITE);
+
+        // Write signed firmware to appropriate file descritptor
+        std::ofstream fw_path_in_device("/dev/d4xx-dfu504", std::ios::binary);
+        if (fw_path_in_device)
+        {
+            fw_path_in_device.write(reinterpret_cast<const char*>(_fw.data()), _fw.size());
+        }
+        else
+        {
+            fail("Firmware Update failed - wrong path or permissions missing");
+            return;
+        }
+        LOG_INFO("Firmware Update for MIPI device done.");
+        fw_path_in_device.close();
+
+        _progress = 100;
+        _done = true;
+        // need to find a way to update the fw version field in the viewer
+    }
+
     void firmware_update_manager::process_flow(
         std::function<void()> cleanup,
         invoker invoke)
     {
+        auto str = _dev.get_info(RS2_CAMERA_INFO_PRODUCT_ID);
+        if (!strcmp(_dev.get_info(RS2_CAMERA_INFO_PRODUCT_ID), "ABCD")) // if device is D457
+        {
+            firmware_update_manager_mipi fw_update_mgr_mipi(_not_model, _model, _dev, _ctx, _fw, _is_signed);
+            fw_update_mgr_mipi.process_flow(cleanup, invoke);
+            return;
+        }
+
         std::string serial = "";
         if (_dev.supports(RS2_CAMERA_INFO_FIRMWARE_UPDATE_ID))
             serial = _dev.get_info(RS2_CAMERA_INFO_FIRMWARE_UPDATE_ID);

common/fw-update-helper.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include "notifications.h"
+#include "../src/fw-update/fw-update-device-interface.h"
 
 
 namespace rs2
@@ -28,7 +29,7 @@ namespace rs2
         const device_model& get_device_model() const { return _model; }
         std::shared_ptr<notifications_model> get_protected_notification_model() { return _not_model.lock(); };
 
-    private:
+    protected:
         void process_flow(std::function<void()> cleanup,
             invoker invoke) override;
         bool check_for(
@@ -43,6 +44,23 @@ namespace rs2
         device_model& _model;
     };
 
+    class firmware_update_manager_mipi : public process_manager
+    {
+    public:
+        firmware_update_manager_mipi(std::weak_ptr<notifications_model> not_model, device_model& model, device dev, context ctx, std::vector<uint8_t> fw, bool is_signed)
+            : process_manager("Firmware Update Mipi"), _not_model(not_model), _model(model),
+              _fw(fw), _is_signed(is_signed), _dev(dev), _ctx(ctx) {}
+        void process_flow(std::function<void()> cleanup, invoker invoke);
+
+    private:
+        std::weak_ptr<notifications_model> _not_model;
+        device _dev;
+        context _ctx;
+        std::vector<uint8_t> _fw;
+        bool _is_signed;
+        device_model& _model;
+    };
+
     struct fw_update_notification_model : public process_notification_model
     {
         fw_update_notification_model(std::string name,
@@ -53,4 +71,4 @@ namespace rs2
         void draw_expanded(ux_window& win, std::string& error_message) override;
         int calc_height() override;
     };
-}
+}

src/ds5/ds5-color.cpp

@@ -240,8 +240,8 @@ namespace librealsense
         }
         if (_pid != ds::RS457_PID)
         {
-            color_ep.register_processing_block(processing_block_factory::create_pbf_vector<uyvy_converter>(RS2_FORMAT_UYVY, map_supported_color_formats(RS2_FORMAT_UYVY), RS2_STREAM_COLOR));
             color_ep.register_processing_block(processing_block_factory::create_pbf_vector<yuy2_converter>(RS2_FORMAT_YUYV, map_supported_color_formats(RS2_FORMAT_YUYV), RS2_STREAM_COLOR));
+            color_ep.register_processing_block(processing_block_factory::create_id_pbf(RS2_FORMAT_RAW16, RS2_STREAM_COLOR));
         }
         else
         {

src/ds5/ds5-private.h

@@ -735,7 +735,8 @@ namespace librealsense
             {RS465_PID, "5.12.7.100" },
             {RS416_RGB_PID, "5.8.15.0" },
             {RS405_PID, "5.12.11.8" },
-            {RS455_PID, "5.12.7.100" }
+            {RS455_PID, "5.12.7.100" },
+            {RS457_PID, "5.13.1.1" }
         };