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

on chip calibration bug fixes #6097

Merged
merged 5 commits into from
Mar 25, 2020
Merged

on chip calibration bug fixes #6097

merged 5 commits into from
Mar 25, 2020

Conversation

aseelegbaria
Copy link
Contributor

@aseelegbaria aseelegbaria commented Mar 19, 2020 •
edited
Loading

  1. OCC health check error for values <0 is now based on error magnitude.
  2. On-Chip cal More Options, White Wall is set as default for D415
  3. Tare-cal, The Avg step default values when you hover on the name are now compatible with the number shown (20).
  4. Tare is set to last value the user typed.
  5. Error messages is shifted slightly to the left and the box is bigger.
  6. Progress bar during Tare is updated
    DSO-14650

dorodnic
dorodnic suggested changes Mar 25, 2020
View reviewed changes
common/on-chip-calib.cpp Outdated
@@ -48,6 +48,7 @@ namespace rs2
catch (...) {}
}


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed

common/on-chip-calib.cpp Outdated
@@ -335,6 +336,10 @@ namespace rs2
_in_3d_view = _viewer.is_3d_view;
_viewer.is_3d_view = true;

config_file::instance().set(configurations::viewer::ground_truth_r, ground_truth);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use spaces instead of tabs

common/on-chip-calib.cpp Outdated
@@ -335,6 +336,10 @@ namespace rs2
_in_3d_view = _viewer.is_3d_view;
_viewer.is_3d_view = true;

config_file::instance().set(configurations::viewer::ground_truth_r, ground_truth);
//ground_truth = _viewer.ground_truth_r;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commented out code should not be checked-in

common/on-chip-calib.cpp Outdated
@@ -390,6 +395,9 @@ namespace rs2

_viewer.is_3d_view = _in_3d_view;

_viewer.ground_truth_r = ground_truth;
config_file::instance().set(configurations::viewer::ground_truth_r, ground_truth);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tabs

common/on-chip-calib.cpp Outdated
@@ -431,7 +439,7 @@ namespace rs2
using namespace chrono;

auto health = get_manager().get_health();
auto recommend_keep = health > 0.25;
auto recommend_keep = health > 0.25 || health < -0.25;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use fabs(health) > 0.25f, it's better

common/ux-window.cpp Outdated
@@ -38,6 +38,7 @@ namespace rs2
config_file::instance().set_default(configurations::viewer::log_to_file, false);
config_file::instance().set_default(configurations::viewer::log_severity, 2);
config_file::instance().set_default(configurations::viewer::metric_system, true);
config_file::instance().set_default(configurations::viewer::ground_truth_r, 2500);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tabs

common/viewer.cpp Outdated
@@ -757,6 +757,9 @@ namespace rs2

is_3d_view = config_file::instance().get_or_default(
configurations::viewer::is_3d_view, false);

ground_truth_r = config_file::instance().get_or_default(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tabs

common/viewer.h Outdated
@@ -135,6 +135,8 @@ namespace rs2
bool paused = false;
bool metric_system = true;

uint32_t ground_truth_r = 2500;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it used?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, to save the last value the user typed in tare calibration.

src/ds5/ds5-auto-calibration.cpp Outdated
@@ -251,6 +251,7 @@ namespace librealsense
int data_sampling = DEFAULT_SAMPLING;
int apply_preset = 1;


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra line

src/hw-monitor.cpp Outdated
@@ -152,7 +152,7 @@ namespace librealsense
if (opCodeAsUint32 != opCodeXmit)
{
auto err_type = static_cast<hwmon_response>(opCodeAsUint32);
throw invalid_value_exception(to_string() << "hwmon command 0x" << std::hex << opCodeXmit << " failed. Error type: "
throw invalid_value_exception(to_string() << "hwmon command 0x" << std::hex << opCodeXmit << " failed.\n Error type: "
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Space after \n is not needed

@dorodnic
Copy link
Contributor

Nicely done. Please update pull-request title and add description with the list of fixes and a DSO number

@aseelegbaria aseelegbaria changed the title occ on chip calibration bug fixes Mar 25, 2020
@dorodnic dorodnic merged commit 603ce9e into IntelRealSense:development Mar 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dorodnic dorodnic dorodnic approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aseelegbaria @dorodnic