cr corrections

Author: remibettan

include/librealsense2/rs.h

@@ -26,7 +26,7 @@ extern "C" {
 
 #define RS2_API_MAJOR_VERSION    2
 #define RS2_API_MINOR_VERSION    57
-#define RS2_API_PATCH_VERSION    10
+#define RS2_API_PATCH_VERSION    0
 #define RS2_API_BUILD_VERSION    0
 
 #ifndef STRINGIFY

src/ds/d500/CMakeLists.txt

@@ -31,7 +31,7 @@ target_sources(${LRS_TARGET}
         "${CMAKE_CURRENT_LIST_DIR}/d500-info.h"
         "${CMAKE_CURRENT_LIST_DIR}/d500-fw-update-device.h"
         "${CMAKE_CURRENT_LIST_DIR}/d500-auto-calibration.h"
-        "${CMAKE_CURRENT_LIST_DIR}/d500-md.h"
+        "${CMAKE_CURRENT_LIST_DIR}/d585s-md.h"
         "${CMAKE_CURRENT_LIST_DIR}/d500-auto-calibration.h"
         "${CMAKE_CURRENT_LIST_DIR}/d500-debug-protocol-calibration-engine.h"
 )

src/ds/d500/d500-depth-mapping.cpp

@@ -5,7 +5,7 @@
 
 #include "d500-safety.h"
 #include "d500-info.h"
-#include "d500-md.h"
+#include "d585s-md.h"
 #include "d500-types/safety-interface-config.h"
 
 #include <vector>

src/ds/d500/d500-device.cpp

@@ -830,7 +830,10 @@ namespace librealsense
         parsed_fields->optical_module_sn = _hw_monitor->get_module_serial_string(gvd_buff, ds::d500_gvd_offsets::optical_module_serial_offset);
         parsed_fields->mb_module_sn = _hw_monitor->get_module_serial_string(gvd_buff, ds::d500_gvd_offsets::mb_module_serial_offset);
         parsed_fields->fw_version = _hw_monitor->get_firmware_version_string<uint16_t>(gvd_buff, ds::d500_gvd_offsets::fw_version_offset, 4, false);
-        parsed_fields->safety_sw_suite_version = _hw_monitor->get_firmware_version_string<uint8_t>(gvd_buff, ds::d500_gvd_offsets::safety_sw_suite_version_offset, 4, false);
+        if (_pid == ds::D585S_PID)
+        {
+            parsed_fields->safety_sw_suite_version = _hw_monitor->get_firmware_version_string<uint8_t>(gvd_buff, ds::d500_gvd_offsets::safety_sw_suite_version_offset, 4, false);
+        }
 
         constexpr size_t gvd_header_size = 8;
         auto gvd_payload_data = gvd_buff.data() + gvd_header_size;

src/ds/d500/d500-safety.cpp

@@ -14,7 +14,7 @@
 #include "ds/ds-options.h"
 #include "d500-options.h"
 #include "d500-info.h"
-#include "d500-md.h"
+#include "d585s-md.h"
 #include "stream.h"
 #include "backend.h"
 #include "platform/platform-utils.h"

src/ds/d500/d500-md.h src/ds/d500/d585s-md.hsrc/ds/d500/d500-md.h renamed to src/ds/d500/d585s-md.h

@@ -14,7 +14,7 @@
 #include "device.h"
 #include "image.h"
 #include "metadata.h"
-#include "d500/d500-md.h"
+#include "d500/d585s-md.h"
 
 namespace librealsense
 {

src/ds/ds-timestamp.cpp

@@ -1,4 +1,3 @@
-/* Copyright(c) 2025 RealSense, Inc. All Rights Reserved. */
 // License: Apache 2.0. See LICENSE file in root directory.
 // Copyright(c) 2022-4 RealSense, Inc. All Rights Reserved.
 #pragma once
@@ -31,7 +30,7 @@ class dds_publisher;
 // The 'writer' is used to write data to a topic, bound at creation time (and therefore bound to a specific type).
 // 
 // You may choose to create one via a 'publisher' that manages the activities of several writers and determines when the
-// data is actually sent. By default, data is sent as soon as the writers write() function is called.
+// data is actually sent. By default, data is sent as soon as the writer's write() function is called.
 //
 class dds_topic_writer : protected eprosima::fastdds::dds::DataWriterListener
 {

third-party/realdds/include/realdds/dds-topic-writer.h

@@ -1,6 +1,5 @@
 // Copyright(c) 2025 RealSense, Inc. All Rights Reserved.
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2022-4 RealSense, Inc. All Rights Reserved.
 
 #include <realdds/dds-participant.h>
 #include <realdds/dds-utilities.h>

third-party/realdds/src/dds-participant.cpp

@@ -175,8 +175,7 @@ void waiting_for_device_to_reconnect(rs2::context& ctx, rs2::cli::value<std::str
 
 }
 
-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)
+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;