From 91f4472f02c201a48b7727166eadd3194570fc63 Mon Sep 17 00:00:00 2001 From: gwen2018 Date: Tue, 28 Jan 2025 13:31:24 -0800 Subject: [PATCH] more d430 gmsl mipi specific changes --- include/librealsense2/rs.h | 4 ++-- src/ds/d400/d400-active.cpp | 2 +- src/ds/d400/d400-device.cpp | 6 +++--- src/fw-update/fw-update-device.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/librealsense2/rs.h b/include/librealsense2/rs.h index f93ed10c10..6a1fa3b981 100644 --- a/include/librealsense2/rs.h +++ b/include/librealsense2/rs.h @@ -24,8 +24,8 @@ extern "C" { #include "h/rs_sensor.h" #define RS2_API_MAJOR_VERSION 2 -#define RS2_API_MINOR_VERSION 56 -#define RS2_API_PATCH_VERSION 0 +#define RS2_API_MINOR_VERSION 57 +#define RS2_API_PATCH_VERSION 52 #define RS2_API_BUILD_VERSION 0 #ifndef STRINGIFY diff --git a/src/ds/d400/d400-active.cpp b/src/ds/d400/d400-active.cpp index 7fb88d26a9..2c4499d64f 100644 --- a/src/ds/d400/d400-active.cpp +++ b/src/ds/d400/d400-active.cpp @@ -34,7 +34,7 @@ namespace librealsense auto pid = this->_pid; auto& depth_ep = get_depth_sensor(); - if( pid == ds::RS457_PID ) + if( pid == ds::RS457_PID || pid == ds::RS430_GMSL_PID) { depth_ep.register_option( RS2_OPTION_PROJECTOR_TEMPERATURE, std::make_shared< projector_temperature_option_mipi >( diff --git a/src/ds/d400/d400-device.cpp b/src/ds/d400/d400-device.cpp index 5a210d76df..9200bc27f5 100644 --- a/src/ds/d400/d400-device.cpp +++ b/src/ds/d400/d400-device.cpp @@ -909,7 +909,7 @@ namespace librealsense } } - if (!val_in_range(_pid, { ds::RS457_PID })) + if (!val_in_range(_pid, { ds::RS457_PID, RS430_GMSL_PID })) { depth_sensor.register_option( RS2_OPTION_STEREO_BASELINE, std::make_shared< const_value_option >( @@ -992,7 +992,7 @@ namespace librealsense firmware_version fw_ver = firmware_version( get_info( RS2_CAMERA_INFO_FIRMWARE_VERSION ) ); auto pid = get_pid(); - if( ( pid == ds::RS457_PID || pid == ds::RS455_PID ) && fw_ver >= firmware_version( 5, 14, 0, 0 ) ) + if( ( pid == ds::RS457_PID || pid == ds::RS455_PID || pid == ds::RS430_GMSL_PID ) && fw_ver >= firmware_version( 5, 14, 0, 0 ) ) register_feature( std::make_shared< emitter_frequency_feature >( get_depth_sensor() ) ); if( fw_ver >= firmware_version( 5, 11, 9, 0 ) ) @@ -1003,7 +1003,7 @@ namespace librealsense register_feature( std::make_shared< auto_exposure_roi_feature >( get_depth_sensor(), _hw_monitor ) ); - if( pid != ds::RS457_PID && pid != ds::RS415_PID && fw_ver >= firmware_version( 5, 12, 10, 11 ) ) + if( pid != ds::RS457_PID && pid != ds::RS415_PID && pid != ds::RS430_GMSL_PID && fw_ver >= firmware_version( 5, 12, 10, 11 ) ) { register_feature( std::make_shared< auto_exposure_limit_feature >( get_depth_sensor(), d400_device::_hw_monitor ) ); diff --git a/src/fw-update/fw-update-device.cpp b/src/fw-update/fw-update-device.cpp index 7d3e10e1ad..ef171bc36f 100644 --- a/src/fw-update/fw-update-device.cpp +++ b/src/fw-update/fw-update-device.cpp @@ -341,7 +341,7 @@ namespace librealsense void update_device::update(const void* fw_image, int fw_image_size, rs2_update_progress_callback_sptr update_progress_callback) const { LOG_INFO( "Uploading FW image ..." ); - if(_pid == "ABCD" || _pid == "BBCD") + if(_pid == "ABCD" || _pid == "BBCD" || _pid == "ABCE") { update_mipi(fw_image, fw_image_size, update_progress_callback); }