Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating presets #9642

Merged
merged 13 commits into from
Sep 22, 2021
Merged

Updating presets #9642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7c90d72
modified hard-coded presets, and calling functions to relevant preset…
Aug 17, 2021
50d63d8
missing ;
Aug 17, 2021
1f61248
fixed different floating issue when exporting presets
Aug 23, 2021
c1f8f7b
added a comment
Aug 24, 2021
8574769
reverted the 'fix of floating point' and added preset default set values
Aug 30, 2021
2955e65
deletion of extra spaces
Aug 30, 2021
b52b64a
fixed the int field accuracy for json loader
Aug 31, 2021
ae4856c
changed the is_integral function so it will work in linux
Aug 31, 2021
0db52a5
added two presets for d455 - high_res & mid_low_res
Sep 5, 2021
0968b84
fixed typos
Sep 5, 2021
7e83498
made the d455 preset depends on resolution
Sep 9, 2021
586a444
fix PR notes
Sep 13, 2021
e412aa5
fixing warning - explicitly writing float
Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 20 additions & 39 deletions src/ds5/advanced_mode/advanced_mode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ namespace librealsense
{
auto p = get_all();
res_type res;

// configuration is empty before first streaming - so set default res
if (configuration.empty())
res = low_resolution;
Expand All @@ -87,11 +86,26 @@ namespace librealsense
case ds::RS430_PID:
case ds::RS430I_PID:
case ds::RS435_RGB_PID:
case ds::RS435I_PID:
case ds::RS465_PID:
case ds::RS455_PID:
case ds::RS435I_PID:
default_430(p);
break;
case ds::RS455_PID:
default_450_mid_low_res(p);
switch (res)
{
case low_resolution:
case medium_resolution:
//applied defaultly
break;
case high_resolution:
default_450_high_res(p);
break;
default:
throw invalid_value_exception(to_string() << "apply_preset(...) failed! Given device doesn't support Default Preset (pid=0x" <<
std::hex << device_pid << ")");
break;
}
case ds::RS405U_PID:
default_405u(p);
break;
Expand All @@ -117,46 +131,13 @@ namespace librealsense
p.depth_table.depthUnits = 100; // 0.1mm
break;
case RS2_RS400_VISUAL_PRESET_HIGH_ACCURACY:
switch (res)
{
case low_resolution:
low_res_high_accuracy(p);
break;
case medium_resolution:
mid_res_high_accuracy(p);
break;
case high_resolution:
high_res_high_accuracy(p);
break;
}
high_accuracy(p);
break;
case RS2_RS400_VISUAL_PRESET_HIGH_DENSITY:
switch (res)
{
case low_resolution:
low_res_high_density(p);
break;
case medium_resolution:
mid_res_high_density(p);
break;
case high_resolution:
high_res_high_density(p);
break;
}
high_density(p);
break;
case RS2_RS400_VISUAL_PRESET_MEDIUM_DENSITY:
switch (res)
{
case low_resolution:
low_res_mid_density(p);
break;
case medium_resolution:
mid_res_mid_density(p);
break;
case high_resolution:
high_res_mid_density(p);
break;
}
mid_density(p);
break;
case RS2_RS400_VISUAL_PRESET_REMOVE_IR_PATTERN:
{
Expand Down
6 changes: 5 additions & 1 deletion src/ds5/advanced_mode/json_loader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,11 @@ namespace librealsense
void load(const std::string& str) override
{
float value = static_cast<float>(::atof(str.c_str()));
strct->vals[0].*field = static_cast<S>(scale * value);
if (std::is_integral<S>::value) //in order to convert float to int correctly we add 0.5 and then use the floor function
value = std::floor(scale * value + 0.5f);
else
value = scale * value;
strct->vals[0].*field = static_cast<S>(value);
strct->update = true;
}

Expand Down
Loading