SR305 added #5997
Merged
SR305 added #5997
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
ev-mp
requested changes
Mar 9, 2020
src/ivcam/sr300.cpp
Outdated
| @@ -57,7 +70,8 @@ namespace librealsense | |||
| std::vector<std::shared_ptr<device_info>> results; | |||
|
|
|||
| auto correct_pid = filter_by_product(uvc, { SR300_PID, SR300v2_PID }); | |||
| auto group_devices = group_devices_by_unique_id(correct_pid); | |||
|
|
|||
| auto group_devices = group_devices_by_unique_id(correct_pid); | |||
There was a problem hiding this comment.
This also highlighted in Travis log:
[ERROR] src/ivcam/sr300.cpp has tabs (this project is using spaces as delimiters)
[ERROR] src/ivcam/sr300.h has tabs (this project is using spaces as delimiters)
find: ‘third-party/libtm’: No such file or directory
Pull-Request check failed, please address 2 the errors reported above
src/ivcam/sr300.h
Outdated
| @@ -394,7 +394,8 @@ namespace librealsense | |||
| return dynamic_cast<uvc_sensor&>(*depth_sensor.get_raw_sensor()); | |||
| } | |||
|
|
|||
| sr300_camera(std::shared_ptr<context> ctx, | |||
|
|
|||
| sr300_camera(std::shared_ptr<context> ctx, | |||
src/ivcam/sr300.h
Outdated
| @@ -528,5 +530,18 @@ namespace librealsense | |||
| std::shared_ptr<lazy<rs2_extrinsics>> _depth_to_color_extrinsics; | |||
|
|
|||
| lazy<ivcam::camera_calib_params> _camer_calib_params; | |||
|
|
|||
| friend class sr305_camera; | |||
src/sensor.cpp
Outdated
| { | ||
| _camera_info[info] = val; | ||
| } | ||
| _camera_info[info] = val; |
added 2 commits
March 9, 2020 14:02
ev-mp
approved these changes
Mar 9, 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.
Tracked on: DSO-14170