Changes have been pushed for the repository "fawkesrobotics/fawkes".
Clone: https://github.com/fawkesrobotics/fawkes.git Gitweb: https://github.com/fawkesrobotics/fawkes The branch, neltester/realsense2_save_image has been updated to 339080dd1a9cde8b62ffc093f939cbc30ebb4031 (commit) via 070d722b9e9e5a9d03e6b3523d712ef789d08e96 (commit) from 330683044ec8caab87b388aacd03d7a9bfc1cd60 (commit) https://github.com/fawkesrobotics/fawkes/tree/neltester/realsense2_save_image Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --------------------------------------------------------------- commit 070d722b9e9e5a9d03e6b3523d712ef789d08e96 Author: Niklas Sebastian Eltester <[email protected]> AuthorDate: Fri Nov 13 16:10:24 2020 +0100 Commit: Niklas Sebastian Eltester <[email protected]> CommitDate: Fri Nov 13 16:10:24 2020 +0100 cfg: adapt config values to hardware limits https://github.com/fawkesrobotics/fawkes/commit/070d722b9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 339080dd1a9cde8b62ffc093f939cbc30ebb4031 Author: Niklas Sebastian Eltester <[email protected]> AuthorDate: Fri Nov 13 16:11:20 2020 +0100 Commit: Niklas Sebastian Eltester <[email protected]> CommitDate: Fri Nov 13 16:13:47 2020 +0100 realsense2: change data types of config values to fit function call https://github.com/fawkesrobotics/fawkes/commit/339080dd1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- cfg/conf.d/realsense2.yaml | 8 +++++--- src/plugins/realsense2/realsense2_thread.cpp | 8 ++++---- src/plugins/realsense2/realsense2_thread.h | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* 070d722b9e9e5a9d03e6b3523d712ef789d08e96 - - - - - - - - - - Author: Niklas Sebastian Eltester <[email protected]> Date: Fri Nov 13 16:10:24 2020 +0100 Subject: cfg: adapt config values to hardware limits cfg/conf.d/realsense2.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/cfg/conf.d/realsense2.yaml b/cfg/conf.d/realsense2.yaml index d1c1a9576..fa610feec 100644 --- a/cfg/conf.d/realsense2.yaml +++ b/cfg/conf.d/realsense2.yaml @@ -20,9 +20,11 @@ realsense2: # Resolution of the RGB camera rgb_width: 1920 - rgb_heigth: 1080 + rgb_height: 1080 # Desired/Supported RGB frame rate at the desired resolution - rgb_frame_rate: 15 + # currently only 10 fps work + # this might be cause by hardware limitations + rgb_frame_rate: 10 # Number of retries after unsuccessful polling before restarting the camera restart_after_num_errors: 50 @@ -33,7 +35,7 @@ realsense2: laser_power: 15 # Path to directory to save images - rgb_path: "/home/robotino/realsense_images/" + rgb_path: "/home/neltester/realsense_images/" # Camera Control Interface name camera_interface_name: "realsense2_cam" - *commit* 339080dd1a9cde8b62ffc093f939cbc30ebb4031 - - - - - - - - - - Author: Niklas Sebastian Eltester <[email protected]> Date: Fri Nov 13 16:11:20 2020 +0100 Subject: realsense2: change data types of config values to fit function call src/plugins/realsense2/realsense2_thread.cpp | 8 ++++---- src/plugins/realsense2/realsense2_thread.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) _Diff for modified files_: diff --git a/src/plugins/realsense2/realsense2_thread.cpp b/src/plugins/realsense2/realsense2_thread.cpp index 63291d4f1..df3d6aa84 100644 --- a/src/plugins/realsense2/realsense2_thread.cpp +++ b/src/plugins/realsense2/realsense2_thread.cpp @@ -62,9 +62,9 @@ Realsense2Thread::init() rgb_path_ = config->get_string_or_default((cfg_prefix + "rgb_path").c_str(), "/home/robotino/realsense_images"); //rgb camera resolution/frame rate - rgb_width_ = config->get_uint_or_default((cfg_prefix + "rgb_width").c_str(), 1920); - rgb_heigth_ = config->get_uint_or_default((cfg_prefix + "rgb_heigth").c_str(), 1080); - rgb_frame_rate_ = config->get_uint_or_default((cfg_prefix + "rgb_framerate").c_str(), 15); + rgb_width_ = config->get_int_or_default((cfg_prefix + "rgb_width").c_str(), 1920); + rgb_height_ = config->get_int_or_default((cfg_prefix + "rgb_height").c_str(), 1080); + rgb_frame_rate_ = config->get_int_or_default((cfg_prefix + "rgb_frame_rate").c_str(), 10); camera_if_name_ = config->get_string_or_default((cfg_prefix + "camera_interface_name").c_str(), "realsense2_cam"); @@ -226,7 +226,7 @@ Realsense2Thread::start_camera() //rgb config rs2::config rgb_config; rgb_config.enable_stream( - RS2_STREAM_COLOR, rgb_width_, rgb_heigth_, RS2_FORMAT_RGB8, rgb_frame_rate_); + RS2_STREAM_COLOR, rgb_width_, rgb_height_, RS2_FORMAT_RGB8, rgb_frame_rate_); rs2::pipeline_profile rs_pipeline_profile_rgb_ = rs_rgb_pipe_->start(rgb_config); auto rgb_stream = rs_pipeline_profile_rgb_.get_stream(RS2_STREAM_COLOR).as<rs2::video_stream_profile>(); diff --git a/src/plugins/realsense2/realsense2_thread.h b/src/plugins/realsense2/realsense2_thread.h index 3653c39cd..020b4ce40 100644 --- a/src/plugins/realsense2/realsense2_thread.h +++ b/src/plugins/realsense2/realsense2_thread.h @@ -113,9 +113,9 @@ private: std::string image_name_; std::string camera_if_name_; uint frame_rate_; - uint rgb_frame_rate_; - uint rgb_width_; - uint rgb_heigth_; + int rgb_frame_rate_; + int rgb_width_; + int rgb_height_; float laser_power_; bool camera_running_ = false; bool enable_camera_ = true; _______________________________________________ fawkes-commits mailing list [email protected] https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
