Add Reflectivity option restrictions #7706
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maloel
reviewed
Nov 4, 2020
src/l500/l500-options.cpp
Outdated
| @@ -226,6 +226,8 @@ namespace librealsense | |||
|
|
|||
| void l500_options::on_set_option(rs2_option opt, float value) | |||
| { | |||
| verify_max_usable_range_restrictions(value); | |||
There was a problem hiding this comment.
opt may not be VISUAL_PRESET... but inside the verify fn you compare the value to MAX_RANGE...? Am I misunderstanding?
There was a problem hiding this comment.
You are correct, the logic was not good.
Changed.
maloel
reviewed
Nov 4, 2020
|
|
||
| if (ds.supports_option(RS2_OPTION_ENABLE_IR_REFLECTIVITY) && ds.get_option(RS2_OPTION_ENABLE_IR_REFLECTIVITY).query() == 1.0f) | ||
| { | ||
| ds.get_option(RS2_OPTION_ENABLE_IR_REFLECTIVITY).set(0.0f); |
There was a problem hiding this comment.
Let's do this only after the other test passes
There was a problem hiding this comment.
We leave it as is as we discussed, we changed the throw to set MUR off
maloel
reviewed
Nov 5, 2020
src/l500/l500-options.cpp
Outdated
| (ds.get_option(RS2_OPTION_ENABLE_MAX_USABLE_RANGE).query() == 1.0) && | ||
| (value != rs2_sensor_mode::RS2_SENSOR_MODE_VGA)) | ||
| { | ||
| throw wrong_api_call_sequence_exception("Max Usable Range support VGA resolution only"); |
There was a problem hiding this comment.
I think we should turn it off, not throw
maloel
reviewed
Nov 5, 2020
common/model-views.cpp
Outdated
| { | ||
| int sensor_mode = static_cast<int>(s->get_option(RS2_OPTION_SENSOR_MODE)); | ||
| int width = 0, height = 0; | ||
| width_height_from_resolution(static_cast<rs2_sensor_mode>(sensor_mode), width, height); |
There was a problem hiding this comment.
Add function resolution_id_from_sensor_mode
maloel
reviewed
Nov 5, 2020
common/model-views.cpp
Outdated
| @@ -76,6 +76,27 @@ static void width_height_from_resolution(rs2_sensor_mode mode, int &width, int & | |||
| } | |||
| } | |||
|
|
|||
| static int get_resolution_id_from_sensor_mode(int sensor_mode, const rs2::sensor &s, const std::vector<std::pair<int, int>> &res_values) | |||
There was a problem hiding this comment.
Why not pass in rs2_sensor_mode?
maloel
reviewed
Nov 5, 2020
common/model-views.cpp
Outdated
| { | ||
| int width = 0, height = 0; | ||
| width_height_from_resolution(static_cast<rs2_sensor_mode>(sensor_mode), width, height); | ||
| auto iter = std::find_if(res_values.begin(), |
maloel
reviewed
Nov 5, 2020
src/l500/l500-options.cpp
Outdated
| if( ds.supports_option( RS2_OPTION_ENABLE_IR_REFLECTIVITY ) | ||
| && ds.get_option( RS2_OPTION_ENABLE_IR_REFLECTIVITY ).query() == 1.0f ) | ||
| throw librealsense::wrong_api_call_sequence_exception( | ||
| "Enabling Alternate IR while IR Reflectivity is enabled is prohibited" ); |
There was a problem hiding this comment.
Alternate IR cannot be enabled with IR Reflectivity
maloel
approved these changes
Nov 5, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implement IR Reflectivity option restrictions according to [RS5-8358]
Note: