[Fawkes Git] branch/fzwilling/jaco-negation-fix: created (0.5.0-3459-gf2e9b78)

Frederik Zwilling zwilling at kbsg.rwth-aachen.de
Thu Dec 22 16:29:50 CET 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, fzwilling/jaco-negation-fix has been created
        at  f2e9b78e522cf15e086c58c869816f7b5377fc6f (commit)

http://git.fawkesrobotics.org/fawkes.git/fzwilling/jaco-negation-fix

- *Log* ---------------------------------------------------------------
commit f2e9b78e522cf15e086c58c869816f7b5377fc6f
Author:     Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
AuthorDate: Thu Dec 22 16:26:02 2016 +0100
Commit:     Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
CommitDate: Thu Dec 22 16:28:30 2016 +0100

    jaco: fixed negation of comparison
    
    Somehow this error popped up as warning during compilation
    with the new merge-preview branch and needed to be fixed.

http://git.fawkesrobotics.org/fawkes.git/commit/f2e9b78
http://trac.fawkesrobotics.org/changeset/f2e9b78

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


- *Summary* -----------------------------------------------------------


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

- *commit* f2e9b78e522cf15e086c58c869816f7b5377fc6f - - - - - - - - - -
Author:  Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
Date:    Thu Dec 22 16:26:02 2016 +0100
Subject: jaco: fixed negation of comparison

 src/plugins/jaco/openrave_thread.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/jaco/openrave_thread.cpp b/src/plugins/jaco/openrave_thread.cpp
index 1cd2c5f..cf440d6 100644
--- a/src/plugins/jaco/openrave_thread.cpp
+++ b/src/plugins/jaco/openrave_thread.cpp
@@ -258,7 +258,7 @@ JacoOpenraveThread::loop()
       } else if( (*it)->trajec_state==TRAJEC_SKIP && (*it)->type == TARGET_ANGULAR ) {
         from = *it;
         break;
-      } else if( !(*it)->type==TARGET_GRIPPER ) {
+      } else if( !((*it)->type==TARGET_GRIPPER) ) {
         // A previous target has unknown final configuration. Cannot plan for our target yet. Abort.
         //  TARGET_GRIPPER would be the only one we could skip without problems.
         __arm->target_mutex->unlock();




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list