Skip to content

Commit

Permalink
more d430 gmsl mipi specific changes
Browse files Browse the repository at this point in the history
  • Loading branch information
gwen2018 committed Jan 28, 2025
1 parent eb43b2c commit 91f4472
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions include/librealsense2/rs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/ds/d400/d400-active.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 >(
Expand Down
6 changes: 3 additions & 3 deletions src/ds/d400/d400-device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 >(
Expand Down Expand Up @@ -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 ) )
Expand All @@ -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 ) );
Expand Down
2 changes: 1 addition & 1 deletion src/fw-update/fw-update-device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 91f4472

Please sign in to comment.