device discovered after dfu in fw-update tool

Author: remibettan

tools/fw-update/rs-fw-update.cpp

@@ -31,6 +31,14 @@
 
 using rsutils::json;
 
+std::condition_variable cv;
+std::mutex mutex;
+std::string selected_serial_number;
+
+rs2::device new_device;
+rs2::update_device new_fw_update_device;
+
+bool done = false;
 
 std::vector<uint8_t> read_fw_file(std::string file_path)
 {
@@ -139,7 +147,30 @@ void list_devices( rs2::context ctx )
     }
 }
 
-int write_fw_to_mipi_device( const rs2::device & dev, const std::vector< uint8_t > & fw_image )
+
+void waiting_for_device_to_reconnect(rs2::context& ctx, rs2::cli::value<std::string>& serial_number_arg)
+{
+    std::cout << std::endl << "Waiting for device to reconnect..." << std::endl;
+    std::unique_lock<std::mutex> lk(mutex);
+    cv.wait_for(lk, std::chrono::seconds(WAIT_FOR_DEVICE_TIMEOUT), [&] { return !done || new_device; });
+
+    if (done)
+    {
+        auto devs = ctx.query_devices();
+        for (auto&& d : devs)
+        {
+            auto sn = d.supports(RS2_CAMERA_INFO_SERIAL_NUMBER) ? d.get_info(RS2_CAMERA_INFO_SERIAL_NUMBER) : "unknown";
+            if (serial_number_arg.isSet() && sn != selected_serial_number)
+                continue;
+
+            auto fw = d.supports(RS2_CAMERA_INFO_FIRMWARE_VERSION) ? d.get_info(RS2_CAMERA_INFO_FIRMWARE_VERSION) : "unknown";
+            std::cout << std::endl << "Device " << sn << " successfully updated to FW: " << fw << std::endl;
+        }
+    }
+
+}
+
+int write_fw_to_mipi_device( rs2::context& ctx, rs2::cli::value<std::string>& serial_number_arg, const rs2::device & dev, const std::vector< uint8_t > & fw_image )
 {
     // Write firmware to appropriate file descriptor
     std::cout << std::endl << "Update can take up to 2 minutes" << std::endl;
@@ -186,6 +217,10 @@ int write_fw_to_mipi_device( const rs2::device & dev, const std::vector< uint8_t
         return EXIT_FAILURE;
     }
     std::cout << std::endl << "Firmware update done" << std::endl;
+    
+    done = true;
+    
+    waiting_for_device_to_reconnect(ctx, serial_number_arg);
 
     return EXIT_SUCCESS;
 }
@@ -205,15 +240,6 @@ bool is_mipi_device( const rs2::device & dev )
 int main( int argc, char ** argv )
 try
 {
-    std::condition_variable cv;
-    std::mutex mutex;
-    std::string selected_serial_number;
-
-    rs2::device new_device;
-    rs2::update_device new_fw_update_device;
-
-    bool done = false;
-
     using rs2::cli;
     cli cmd( "librealsense rs-fw-update tool" );
 
@@ -477,25 +503,28 @@ try
                 //     return EXIT_FAILURE;
                 // }
 
-                return write_fw_to_mipi_device( d, fw_image );
+                return write_fw_to_mipi_device(ctx, serial_number_arg, d, fw_image );
             }
 
             if( unsigned_arg.isSet() )
             {
-                std::cout << std::endl << "Firmware update started. Please don't disconnect device!" << std::endl << std::endl;
+            
+                std::cout << std::endl << "Unsigned Firmware update started. Please don't disconnect device!" << std::endl << std::endl;
 
                 if( ISATTY( FILENO( stdout ) ) )
                 {
                     d.as<rs2::updatable>().update_unsigned( fw_image, [&]( const float progress )
                         {
-                            printf( "\rFirmware update progress: %d[%%]", (int)( progress * 100 ) );
+                            printf( "\rUnsigned Firmware update progress: %d[%%]", (int)( progress * 100 ) );
                             std::cout.flush();
                         } );
                 }
                 else
                     d.as<rs2::updatable>().update_unsigned( fw_image, [&]( const float progress ) {} );
 
-                std::cout << std::endl << std::endl << "Firmware update done" << std::endl;
+                std::cout << std::endl << std::endl << "Unsigned Firmware update done" << std::endl;
+                
+                done = true;
             }
             else
             {
@@ -547,23 +576,7 @@ try
         return EXIT_FAILURE;
     }
 
-    std::cout << std::endl << "Waiting for device to reconnect..." << std::endl;
-    std::unique_lock<std::mutex> lk(mutex);
-    cv.wait_for(lk, std::chrono::seconds(WAIT_FOR_DEVICE_TIMEOUT), [&] { return !done || new_device; });
-
-    if (done)
-    {
-        auto devs = ctx.query_devices();
-        for (auto&& d : devs)
-        {
-            auto sn = d.supports(RS2_CAMERA_INFO_SERIAL_NUMBER) ? d.get_info(RS2_CAMERA_INFO_SERIAL_NUMBER) : "unknown";
-            if (serial_number_arg.isSet() && sn != selected_serial_number)
-                continue;
-
-            auto fw = d.supports(RS2_CAMERA_INFO_FIRMWARE_VERSION) ? d.get_info(RS2_CAMERA_INFO_FIRMWARE_VERSION) : "unknown";
-            std::cout << std::endl << "Device " << sn << " successfully updated to FW: " << fw << std::endl;
-        }
-    }
+    waiting_for_device_to_reconnect(ctx, serial_number_arg);
 
     return EXIT_SUCCESS;
 }

unit-tests/test-fw-update.py

@@ -173,8 +173,6 @@ def find_image_or_exit( product_name, fw_version_regex = r'(\d+\.){3}(\d+)' ):
 product_line = device.get_info( rs.camera_info.product_line )
 product_name = device.get_info( rs.camera_info.name )
 log.d( 'product line:', product_line )
-sn = device.get_info( rs.camera_info.serial_number )
-print("Device serial number = " + repr(sn))
 ###############################################################################
 #
 
@@ -186,7 +184,7 @@ def find_image_or_exit( product_name, fw_version_regex = r'(\d+\.){3}(\d+)' ):
     log.d( "recovering device ..." )
     try:
         image_file = find_image_or_exit(product_name) if not custom_fw_d400_path else custom_fw_d400_path
-        cmd = [fw_updater_exe, '-r', '-f', image_file, '-s', sn]
+        cmd = [fw_updater_exe, '-r', '-f', image_file]
         if custom_fw_d400_path:
             # unsiged fw
             cmd.insert(1, '-u')
@@ -232,7 +230,7 @@ def find_image_or_exit( product_name, fw_version_regex = r'(\d+\.){3}(\d+)' ):
 image_file = find_image_or_exit(product_name, fw_version_regex) if not custom_fw_d400_path else custom_fw_d400_path
 # finding file containing image for FW update
 
-cmd = [fw_updater_exe, '-f', image_file, '-s', sn]
+cmd = [fw_updater_exe, '-f', image_file]
 if custom_fw_d400_path:
     # unsigned fw
     cmd.insert(1, '-u')
@@ -244,20 +242,6 @@ def find_image_or_exit( product_name, fw_version_regex = r'(\d+\.){3}(\d+)' ):
 time.sleep(3) # MIPI devices do not re-enumerate so we need to give them some time to restart
 devices.query( monitor_changes = False )
 sn_list = devices.all()
-sn_list_size = len(sn_list)
-if sn_list_size == 0:
-    retries = 5
-    while retries > 0 and sn_list_size == 0:
-        retries -= 1
-        time.sleep(2)
-        devices.query( monitor_changes = False )
-        sn_list = devices.all()
-        sn_list_size = len(sn_list)
-        if sn_list_size == 0:
-            print("Device discovery... Device not found yet - remaining retries: " + repr(retries) )
-        else:
-            print("Device discovery... Device found.")
-
 device = devices.get_first( sn_list ).handle
 current_fw_version = rsutils.version( device.get_info( rs.camera_info.firmware_version ))
 test.check_equal(current_fw_version, bundled_fw_version if not custom_fw_d400_path else custom_fw_d400_version)