Adding device selection support #9
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
willdzeng
requested changes
Mar 31, 2018
src/zed_cpu_ros.cpp
Outdated
| @@ -31,9 +31,10 @@ class StereoCamera | |||
| * @param[in] resolution The resolution | |||
| * @param[in] frame_rate The frame rate | |||
| */ | |||
| StereoCamera(int resolution, double frame_rate): frame_rate_(30.0) { | |||
| StereoCamera(int device, int resolution, double frame_rate) | |||
| : frame_rate_(30.0) { | |||
There was a problem hiding this comment.
can you make this on the same line? Thanks
There was a problem hiding this comment.
Done in 311cb52 :)
launch/zed_cpu_ros.launch
Outdated
| @@ -1,6 +1,7 @@ | |||
| <launch> | |||
| <arg name="config_file_location" default="$(find zed_cpu_ros)/config/SN1267.conf"/> | |||
| <arg name="camera_namespace" default="camera"/> | |||
| <arg name="device" default="0"/> | |||
There was a problem hiding this comment.
change to device_id every where
There was a problem hiding this comment.
Done in 311cb52 :)
README.md
Outdated
| show_image | Whether to use opencv show image | bool | ||
| Parameter | Description | Value | ||
| ------------------------------|-------------------------------------------------------------|------------------------- | ||
| device | device ID selection (if multiple cameras) | int |
There was a problem hiding this comment.
I was using auto-formatting tool (Atom Beautify) which changed indentation in several files. I just reverse patched those changes.
…structor back in one line)
willdzeng
approved these changes
Apr 3, 2018
|
Thank you for your contribution!! |
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.
Thx for your node, it's quite usefull to skip ZED-SDK (no GPU on my laptop).
Unfortunately, I wasn't able to use your node as it is, due to my laptop webcam taking the first video slot
/dev/video0.The way to fix this issue was to change the device parameter here :
camera_ = new cv::VideoCapture(0);tocamera_ = new cv::VideoCapture(1);.It was quite easy to make it a launching argument for the node, so i did it :).
Hope it will be helpfull !