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

Added on-chip focal length calibration and merged tare groun truth. #7535

Merged
merged 29 commits into from
Dec 1, 2020
Merged

Added on-chip focal length calibration and merged tare groun truth. #7535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0780ad7
Added on-chip focal length calibration and merged tare groun truth.
daversintel Oct 9, 2020
8583909
Python wrapper fix.
daversintel Oct 9, 2020
b239705
Fixed a typo.
daversintel Oct 9, 2020
5e8d18f
Removed the new OCC-FL APIs and used the existed OCC APIs for OCC-FL.
daversintel Oct 12, 2020
00e38da
Updated default target size.
daversintel Oct 12, 2020
f8afdee
Fixed some calibration streaming problems.
daversintel Oct 13, 2020
356df78
1. Combined OCC, OCC-FL, and Tare to one self calibration menu group.
daversintel Oct 13, 2020
f43461d
One button OCC with two commands.
daversintel Oct 14, 2020
54016e8
Updated RS Viewer UI.
daversintel Oct 14, 2020
e5f3367
Update for new one button OCC+.
daversintel Oct 15, 2020
4299de4
Removed unused code for two steps OCC+.
daversintel Oct 15, 2020
64a68cc
Fixed tool tips.
daversintel Oct 15, 2020
e586a2b
Fixed some UI problems.
daversintel Oct 16, 2020
7912a95
Added scan parameter bit for OCC+.
daversintel Oct 16, 2020
94ff4e8
RS Viewer UI improvement.
daversintel Oct 16, 2020
929f9bd
Fixed a typo.
daversintel Oct 16, 2020
26ad141
Updated API description and OCC names in RS VIewer UI window.
daversintel Oct 19, 2020
aaed9e0
1. Use interrupt sampling mode for all types of on-chip calibrations …
daversintel Oct 21, 2020
88dd7b2
Added check for start streaming.
daversintel Oct 23, 2020
125b2a1
1. Using polling mode for tare calibration.
daversintel Oct 31, 2020
589b8d7
Not divide the computation into four quarters any more.
daversintel Nov 11, 2020
d9a4eeb
Added peak and border checks.
daversintel Nov 16, 2020
2524ab0
Updated border size to 20.
daversintel Nov 16, 2020
a803814
Reduced frame number to average from 50 to 25.
daversintel Nov 24, 2020
a75b8f5
OCC FL white wall option and speed reintepretation.
daversintel Nov 25, 2020
f68b2cf
Fixed a speed mapping problem.
daversintel Nov 25, 2020
69fa9e2
Set default speed to slow.
daversintel Nov 26, 2020
db7fe02
Set frame number back to 25.
daversintel Nov 26, 2020
e543afb
Work-around for libusb breaking changes in Master branch (v1.0.24)
ev-mp Nov 30, 2020
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
4 changes: 3 additions & 1 deletion CMake/external_libusb.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ include(ExternalProject)
ExternalProject_Add(
libusb

GIT_REPOSITORY "https://github.com/libusb/libusb.git"
# Work-around for libusb master broken on Nov 26' 2020 with introduction of v1.0.24
# the issue has been reported in https://github.com/libusb/libusb/issues/812
GIT_REPOSITORY "https://github.com/ev-mp/libusb.git"
GIT_TAG "2a7372db54094a406a755f0b8548b614ba8c78ec" # "v1.0.22" + Mac get_device_list hang fix

UPDATE_COMMAND ${CMAKE_COMMAND} -E copy_if_different
Expand Down
12 changes: 4 additions & 8 deletions common/model-views.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4829,7 +4829,6 @@ namespace rs2
}
}


if (_allow_remove)
{
something_to_show = true;
Expand Down Expand Up @@ -4935,9 +4934,7 @@ namespace rs2
}
}
}




bool has_autocalib = false;
for (auto&& sub : subdevices)
{
Expand All @@ -4949,8 +4946,7 @@ namespace rs2
try
{
auto manager = std::make_shared<on_chip_calib_manager>(viewer, sub, *this, dev);
auto n = std::make_shared<autocalib_notification_model>(
"", manager, false);
auto n = std::make_shared<autocalib_notification_model>("", manager, false);

viewer.not_model->add_notification(n);
n->forced = true;
Expand Down Expand Up @@ -5004,9 +5000,9 @@ namespace rs2
}
if (ImGui::IsItemHovered())
ImGui::SetTooltip("Tare calibration is used to adjust camera absolute distance to flat target.\n"
"User needs to enter the known ground truth");
"User needs either to enter the known ground truth or use the get button\n"
"with specific target to get the ground truth.");


if (_calib_model.supports())
{
if (ImGui::Selectable("Calibration Data"))
Expand Down
2 changes: 2 additions & 0 deletions common/model-views.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ namespace rs2
{
static const char* is_3d_view { "viewer_model.is_3d_view" };
static const char* ground_truth_r { "viewer_model.ground_truth_r" };
static const char* target_width_r { "viewer_model.target_width_r" };
static const char* target_height_r { "viewer_model.target_height_r" };
static const char* continue_with_ui_not_aligned { "viewer_model.continue_with_ui_not_aligned" };
static const char* continue_with_current_fw{ "viewer_model.continue_with_current_fw" };
static const char* settings_tab { "viewer_model.settings_tab" };
Expand Down
1 change: 1 addition & 0 deletions common/notifications.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ namespace rs2

std::shared_ptr<process_manager> update_manager = nullptr;
int update_state = 0;
int update_state_prev = 0;
progress_bar _progress_bar;
};

Expand Down
Loading