PR #13969 from OhadMeir/R/256: Cherry Pick PR #13968 from OhadMeir: Handle DDS devices in Recovery Mode

Author: OhadMeir

common/dds-model.cpp

@@ -99,12 +99,25 @@ bool dds_model::check_DDS_support()
 {
     if( _device.is< rs2::debug_protocol >() )
     {
-        auto dev = debug_protocol( _device );
-        auto cmd = dev.build_command( GET_ETH_CONFIG, CURRENT_VALUES );
-        auto data = dev.send_and_receive_raw_data( cmd );
-        int32_t const & code = *reinterpret_cast< int32_t const * >( data.data() );
-        if( code == GET_ETH_CONFIG )
-            return true;
+        if( _device.supports( RS2_CAMERA_INFO_NAME ) )
+        {
+            std::string name = _device.get_info( RS2_CAMERA_INFO_NAME );
+            if( name.find( "Recovery" ) != std::string::npos )
+                return false; // Recovery devices don't support HWM.
+        }
+
+        try
+        {
+            auto dev = debug_protocol( _device );
+            auto cmd = dev.build_command( GET_ETH_CONFIG, CURRENT_VALUES );
+            auto data = dev.send_and_receive_raw_data( cmd );
+            int32_t const & code = *reinterpret_cast< int32_t const * >( data.data() );
+            if( code == GET_ETH_CONFIG )
+                return true;
+        }
+        catch( ... )
+        {
+        }
     }
 
     return false;

src/dds/rs-dds-device-proxy.cpp

@@ -151,7 +151,8 @@ dds_device_proxy::dds_device_proxy( std::shared_ptr< const device_info > const &
     , _dds_dev( dev )
 {
     //LOG_DEBUG( "=====> dds-device-proxy " << this << " created on top of dds-device " << _dds_dev.get() );
-    register_info( RS2_CAMERA_INFO_NAME, dev->device_info().name() );
+    std::string suffix = dev->device_info().is_recovery() ? " Recovery" : "";
+    register_info( RS2_CAMERA_INFO_NAME, dev->device_info().name() + suffix );
     register_info( RS2_CAMERA_INFO_PHYSICAL_PORT, dev->device_info().topic_root() );
     register_info( RS2_CAMERA_INFO_PRODUCT_ID, "DDS" );
 

third-party/realdds/include/realdds/topics/device-info-msg.h

@@ -25,6 +25,8 @@ class device_info
     rsutils::json const & to_json() const;
     static device_info from_json( rsutils::json const & );
 
+    bool is_recovery() const;
+
     // Substring of information already stored in the device-info that can be used to print the device 'name'.
     // (mostly for use with debug messages)
     rsutils::string::slice debug_name() const;

third-party/realdds/src/topics/device-info-msg.cpp

@@ -73,6 +73,12 @@ void device_info::set_serial_number( std::string const & v )
 }
 
 
+bool device_info::is_recovery() const
+{
+    return _json.nested( key::recovery, &rsutils::json::is_boolean ).default_value( false );
+}
+
+
 rsutils::string::slice device_info::debug_name() const
 {
     return device_name_from_root( topic_root() );

tools/dds/dds-config/rs-dds-config.cpp

@@ -132,7 +132,8 @@ bool find_device( rs2::context const & ctx,
                   eth_config & config,
                   rs2::cli::value< std::string > & sn_arg,
                   bool const golden,
-                  std::set< std::string > & devices_looked_at )
+                  std::set< std::string > & devices_looked_at,
+                  bool & recovery )
 {
     auto device_list = ctx.query_devices();
     auto const n_devices = device_list.size();
@@ -148,7 +149,11 @@ bool find_device( rs2::context const & ctx,
             if( ! devices_looked_at.insert( sn ).second )
                 continue;  // insert failed: device was already looked at
             LOG_DEBUG( "trying " << describe_device( possible_device ) );
-            config = get_eth_config( possible_device, golden );
+            std::string name = possible_device.get_info( RS2_CAMERA_INFO_NAME );
+            if( name.find( "Recovery" ) != std::string::npos )
+                recovery = true;
+            else
+                config = get_eth_config( possible_device, golden );
             if( device )
                 more_than_one_device = true;
             list_device( device = possible_device );
@@ -228,24 +233,49 @@ try
         }
         return EXIT_SUCCESS;
     }
+    
+    // Enable DDS in future runs
+    auto const filename = rsutils::os::get_special_folder( rsutils::os::special_folder::app_data ) + RS2_CONFIG_FILENAME;
+    auto config = rsutils::json_config::load_from_file( filename );
+    if( ! config )
+        config = json::object();
+
+    if( ! config.nested( "context", "dds", "enabled" ).default_value( false ) )
+    {
+        config["context"]["dds"]["enabled"] = true;
+        try
+        {
+            std::ofstream out( filename );
+            out << std::setw( 2 ) << config;
+            out.close();
+            INFO( "DDS is now enabled by default in " RS2_CONFIG_FILENAME );
+        }
+        catch( std::exception const & e )
+        {
+            std::cout << "-W-  FAILED to enable DDS by default: " << e.what() << std::endl;
+        }
+    }
 
     bool const golden = golden_arg.isSet();
 
     // Create a RealSense context and look for a device
-    settings["dds"]["enabled"] = true;
     rs2::context ctx( settings.dump() );
 
     rs2::device device;
     eth_config current;
     std::set< std::string > devices_looked_at;
-    if( ! find_device( ctx, device, current, sn_arg, golden, devices_looked_at ) )
+    bool recovery = false;
+    if( ! find_device( ctx, device, current, sn_arg, golden, devices_looked_at, recovery ) )
     {
         if( sn_arg.isSet() )
             throw std::runtime_error( "Device not found or does not support Eth" );
 
         throw std::runtime_error( "No device found supporting Eth" );
     }
 
+    if( recovery )
+        throw std::runtime_error( "Recovery devices don't support Ethernet params configuration" );
+
     eth_config requested( current );
     if( golden || factory_reset_arg.isSet() || reset_arg.isSet() )
     {
@@ -357,36 +387,6 @@ try
     else if( requested == current )
     {
         LOG_DEBUG( "nothing to do" );
-
-        // When running with no arguments, and DDS is disabled, and we actually find a DDS device, we automatically
-        // enable DDS in future runs:
-        if( device.get_type() == "DDS" )
-        {
-            auto const filename
-                = rsutils::os::get_special_folder( rsutils::os::special_folder::app_data ) + RS2_CONFIG_FILENAME;
-            auto config = rsutils::json_config::load_from_file( filename );
-
-            bool enabled;
-            if( ! config.nested( "context", "dds", "enabled" ).get_ex( enabled ) )
-            {
-                config["context"]["dds"]["enabled"] = true;
-                try
-                {
-                    std::ofstream out( filename );
-                    out << std::setw( 2 ) << config;
-                    out.close();
-                    INFO( "DDS is now enabled by default in " RS2_CONFIG_FILENAME );
-                }
-                catch( std::exception const & e )
-                {
-                    std::cout << "-W- " << "FAILED to enable DDS by default: " << e.what() << std::endl;
-                }
-            }
-            else
-            {
-                LOG_DEBUG( "'dds/enabled' was pre-set in configuration file (to " << enabled << "); no changes made" );
-            }
-        }
     }
     else
     {