Changes have been pushed for the repository "fawkesrobotics/fawkes".
Clone: https://github.com/fawkesrobotics/fawkes.git Gitweb: https://github.com/fawkesrobotics/fawkes The branch, thofmann/realsense-restart-device-after-errors has been updated to 9bbc4c6560eab4d5020f08908315ce2796dcc923 (commit) via c6174a467626d61774d60f521ba4dea79f0c099b (commit) via 876efbf24c9549645ad38ea93c36b633a0c52698 (commit) from 0996cc086807fc30b7c5ef8dd1fc15ecfb81cca3 (commit) https://github.com/fawkesrobotics/fawkes/tree/thofmann/realsense-restart-device-after-errors 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 876efbf24c9549645ad38ea93c36b633a0c52698 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Sun Apr 28 08:55:45 2019 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Sun Apr 28 09:01:10 2019 +0200 config: add documentation for realsense key 'restart_after_num_errors' https://github.com/fawkesrobotics/fawkes/commit/876efbf24 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit c6174a467626d61774d60f521ba4dea79f0c099b Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Sun Apr 28 08:57:59 2019 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Sun Apr 28 09:01:39 2019 +0200 realsense: simplify config reading for key 'use_switch' Use get_bool_or_default instead of using the old try/catch pattern. https://github.com/fawkesrobotics/fawkes/commit/c6174a467 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 9bbc4c6560eab4d5020f08908315ce2796dcc923 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Sun Apr 28 09:00:00 2019 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Sun Apr 28 09:03:11 2019 +0200 config: add documentation for realsense config key 'use_switch' https://github.com/fawkesrobotics/fawkes/commit/9bbc4c656 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- cfg/conf.d/realsense.yaml | 7 +++++++ src/plugins/realsense/realsense_thread.cpp | 8 ++------ 2 files changed, 9 insertions(+), 6 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* 876efbf24c9549645ad38ea93c36b633a0c52698 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Sun Apr 28 08:55:45 2019 +0200 Subject: config: add documentation for realsense key 'restart_after_num_errors' cfg/conf.d/realsense.yaml | 3 +++ 1 file changed, 3 insertions(+) _Diff for modified files_: diff --git a/cfg/conf.d/realsense.yaml b/cfg/conf.d/realsense.yaml index 1ebab1ed6..1f25ad077 100644 --- a/cfg/conf.d/realsense.yaml +++ b/cfg/conf.d/realsense.yaml @@ -10,6 +10,9 @@ realsense: # ID of the PointCloud pcl_id: "/camera/depth/points" + # Number of retries after unsuccessful polling before restarting the camera + # restart_after_num_errors: 50 + # Section to set the Realsense device options device_options: # Laser power from 0 - 15 as integer - *commit* c6174a467626d61774d60f521ba4dea79f0c099b - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Sun Apr 28 08:57:59 2019 +0200 Subject: realsense: simplify config reading for key 'use_switch' src/plugins/realsense/realsense_thread.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) _Diff for modified files_: diff --git a/src/plugins/realsense/realsense_thread.cpp b/src/plugins/realsense/realsense_thread.cpp index 662d16904..ff0b979d8 100644 --- a/src/plugins/realsense/realsense_thread.cpp +++ b/src/plugins/realsense/realsense_thread.cpp @@ -37,8 +37,7 @@ using namespace fawkes; RealsenseThread::RealsenseThread() : Thread("RealsenseThread", Thread::OPMODE_WAITFORWAKEUP), BlockedTimingAspect(BlockedTimingAspect::WAKEUP_HOOK_SENSOR_ACQUIRE), - switch_if_(NULL), - cfg_use_switch_(true) + switch_if_(NULL) { } @@ -53,10 +52,7 @@ RealsenseThread::init() restart_after_num_errors_ = config->get_uint_or_default(std::string(cfg_prefix + "restart_after_num_errors").c_str(), 50); - try { - cfg_use_switch_ = config->get_bool((cfg_prefix + "use_switch").c_str()); - } catch (Exception &e) { - } // ignore, use default + cfg_use_switch_ = config->get_bool_or_default((cfg_prefix + "use_switch").c_str(), true); if (cfg_use_switch_) { logger->log_info(name(), "Switch enabled"); - *commit* 9bbc4c6560eab4d5020f08908315ce2796dcc923 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Sun Apr 28 09:00:00 2019 +0200 Subject: config: add documentation for realsense config key 'use_switch' cfg/conf.d/realsense.yaml | 4 ++++ 1 file changed, 4 insertions(+) _Diff for modified files_: diff --git a/cfg/conf.d/realsense.yaml b/cfg/conf.d/realsense.yaml index 1f25ad077..df36c435e 100644 --- a/cfg/conf.d/realsense.yaml +++ b/cfg/conf.d/realsense.yaml @@ -10,6 +10,10 @@ realsense: # ID of the PointCloud pcl_id: "/camera/depth/points" + # If true, the camera will be enabled/disabled on incoming Enable/Disable + # messages. If false, switch messages will be ignored. + # use_switch: true + # Number of retries after unsuccessful polling before restarting the camera # restart_after_num_errors: 50 _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
