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/skillgui-fix-uuid-handling has been updated to c295afa3b9160a6836110f5118c5348d09b6aa46 (commit) from 0395b5bdfb70d59562e9ae5bddd551bdcc276f2c (commit) https://github.com/fawkesrobotics/fawkes/tree/thofmann/skillgui-fix-uuid-handling 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 c295afa3b9160a6836110f5118c5348d09b6aa46 Author: Till Hofmann <[email protected]> AuthorDate: Wed Jun 2 11:52:53 2021 +0200 Commit: Till Hofmann <[email protected]> CommitDate: Wed Jun 2 11:52:53 2021 +0200 ros-skiller: use string comparison to compare UUIDs Do not implicitly create a UUID but instead compare the strings. This avoids an exception if the skiller's exclusive controller is no valid UUID (e.g., because it is empty). https://github.com/fawkesrobotics/fawkes/commit/c295afa3b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- src/plugins/ros/skiller_thread.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* c295afa3b9160a6836110f5118c5348d09b6aa46 - - - - - - - - - - Author: Till Hofmann <[email protected]> Date: Wed Jun 2 11:52:53 2021 +0200 Subject: ros-skiller: use string comparison to compare UUIDs src/plugins/ros/skiller_thread.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/src/plugins/ros/skiller_thread.cpp b/src/plugins/ros/skiller_thread.cpp index 1fbe4e4be..07c2fbff7 100644 --- a/src/plugins/ros/skiller_thread.cpp +++ b/src/plugins/ros/skiller_thread.cpp @@ -87,7 +87,7 @@ RosSkillerThread::once() void RosSkillerThread::stop() { - if (skiller_if_->exclusive_controller() != skiller_if_->serial()) { + if (skiller_if_->exclusive_controller() != skiller_if_->serial().get_string()) { logger->log_warn(name(), "Skill abortion requested, but currently not in control"); return; } @@ -158,7 +158,7 @@ RosSkillerThread::loop() // currently idle, release skiller control if (!exec_running_ && !exec_request_ - && skiller_if_->exclusive_controller() == skiller_if_->serial()) { + && skiller_if_->exclusive_controller() == skiller_if_->serial().get_string()) { logger->log_debug(name(), "No skill running and no skill requested, releasing control"); skiller_if_->msgq_enqueue(new SkillerInterface::ReleaseControlMessage()); return; @@ -171,7 +171,7 @@ RosSkillerThread::loop() return; } - if (skiller_if_->exclusive_controller() != skiller_if_->serial()) { + if (skiller_if_->exclusive_controller() != skiller_if_->serial().get_string()) { // we need the skiller control, acquire it first logger->log_debug(name(), "Skill execution requested, but currently not in control"); skiller_if_->msgq_enqueue(new SkillerInterface::AcquireControlMessage()); _______________________________________________ fawkes-commits mailing list [email protected] https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
