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  be1c521d08a1202902769e676eccd002b720cf0d (commit)
      from  35405a2ac41965933f3f1261c203c67782527885 (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 be1c521d08a1202902769e676eccd002b720cf0d
Author:     Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Sat Apr 27 13:32:26 2019 +0200
Commit:     Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Sat Apr 27 13:32:26 2019 +0200

    realsense: stop loop early if camera is disabled and not running
    
    If the camera is not running and should be disabled, actually stop the
    loop and do not continue as if it was running and enabled.

https://github.com/fawkesrobotics/fawkes/commit/be1c521d0

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------
 src/plugins/realsense/realsense_thread.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


- *Diffs* -------------------------------------------------------------

- *commit* be1c521d08a1202902769e676eccd002b720cf0d - - - - - - - - - -
Author:  Till Hofmann <hofm...@kbsg.rwth-aachen.de>
Date:    Sat Apr 27 13:32:26 2019 +0200
Subject: realsense: stop loop early if camera is disabled and not running

 src/plugins/realsense/realsense_thread.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/realsense/realsense_thread.cpp 
b/src/plugins/realsense/realsense_thread.cpp
index de6e68949..cf495e978 100644
--- a/src/plugins/realsense/realsense_thread.cpp
+++ b/src/plugins/realsense/realsense_thread.cpp
@@ -92,8 +92,10 @@ RealsenseThread::loop()
                connect_and_start_camera();
                // Start reading in the next loop
                return;
-       } else if (!enable_camera_ && camera_running_) {
-               stop_camera();
+       } else if (!enable_camera_) {
+               if (camera_running_) {
+                       stop_camera();
+               }
                return;
        }
        if (rs_poll_for_frames(rs_device_, &rs_error_) == 1) {



_______________________________________________
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits

Reply via email to