[Fawkes Git] branch/common/master-merge-review: created (0.5.0-3211-g8ce0593)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Thu Jun 23 14:51:37 CEST 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, common/master-merge-review has been created
        at  8ce059365c185811610de51c75e9ebfd90d85099 (commit)

http://git.fawkesrobotics.org/fawkes.git/common/master-merge-review

- *Log* ---------------------------------------------------------------
commit 029d9a2eb5c0e301b8dd096ca866ce545ecc2437
Merge: 14a3339 b227689
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:26:06 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:26:06 2016 +0200

    Merge remote-tracking branch 'origin/fzwilling/align_at_table-transform'

http://git.fawkesrobotics.org/fawkes.git/commit/029d9a2
http://trac.fawkesrobotics.org/changeset/029d9a2

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 497f55ae030e177b181cb894c1dceb3d9b7aa788
Merge: 029d9a2 0e8e3e2
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:26:55 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:26:55 2016 +0200

    Merge remote-tracking branch 'origin/timn/clips-bb-inf'

http://git.fawkesrobotics.org/fawkes.git/commit/497f55a
http://trac.fawkesrobotics.org/changeset/497f55a

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 762f9af309d8f46821b838547c10433798c95362
Merge: 497f55a fa019ab
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:27:02 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:27:02 2016 +0200

    Merge remote-tracking branch 'origin/timn/map-lasergen-fix'

http://git.fawkesrobotics.org/fawkes.git/commit/762f9af
http://trac.fawkesrobotics.org/changeset/762f9af

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 6e1885f4606b6f3475a39ec88e9d09a41533e2ad
Merge: 762f9af 1187f71
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:27:10 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:27:10 2016 +0200

    Merge remote-tracking branch 'origin/timn/navgraph-deleteall'

http://git.fawkesrobotics.org/fawkes.git/commit/6e1885f
http://trac.fawkesrobotics.org/changeset/6e1885f

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 8fe984ba9ce01faa96544a0dd5878b58e654f37a
Merge: 6e1885f 5971132
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:27:17 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:27:17 2016 +0200

    Merge remote-tracking branch 'origin/timn/navgraph-rospub'

http://git.fawkesrobotics.org/fawkes.git/commit/8fe984b
http://trac.fawkesrobotics.org/changeset/8fe984b

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 30810872687f9b1136fbd8b3175ccdfff8fd7de2
Merge: 8fe984b b4ded1b
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:27:36 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:27:36 2016 +0200

    Merge remote-tracking branch 'origin/timn/netconf-fixes'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 909353843d1358053ff4f0c58e4026a5ad55eebe
Merge: 3081087 fd10f4d
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:27:41 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:27:41 2016 +0200

    Merge remote-tracking branch 'origin/timn/protobuf-clips'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit f1856600e85634ba1ca203f0382c106c88e0b0e3
Merge: 9093538 d022bd3
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:27:49 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:27:49 2016 +0200

    Merge remote-tracking branch 'origin/timn/robotino-direct'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 3ba3a9f8fffea84fcb3d11113d052d8f746ba2b4
Merge: f185660 5af954f
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:28:32 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:28:32 2016 +0200

    Merge remote-tracking branch 'origin/timn/skiller-fixes'

http://git.fawkesrobotics.org/fawkes.git/commit/3ba3a9f
http://trac.fawkesrobotics.org/changeset/3ba3a9f

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 4f6b39cc4b758f051ea907c9d6db5532ca34fe14
Merge: 3ba3a9f 24d074d
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:30:12 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:30:12 2016 +0200

    Merge remote-tracking branch 'origin/timn/skiller-auto-interfaces'

http://git.fawkesrobotics.org/fawkes.git/commit/4f6b39c
http://trac.fawkesrobotics.org/changeset/4f6b39c

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 84568886f6ebfed689ea64f8f010468de63d6c5c
Merge: 4f6b39c c4a99d1
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:30:46 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:30:46 2016 +0200

    Merge remote-tracking branch 'origin/tneumann/angle_distance_fix'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit b2f096ba0ef43132675151721cd57a154169bc60
Merge: 8456888 199ca43
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:30:57 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:30:57 2016 +0200

    Merge remote-tracking branch 'origin/tneumann/pcl-ros-bidirectional'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 4fe72c26926b29109deda44c39389d8e6f5ac10e
Merge: b2f096b 19970f5
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:34:13 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:34:13 2016 +0200

    Merge remote-tracking branch 'origin/vmatare/lua-utils'

http://git.fawkesrobotics.org/fawkes.git/commit/4fe72c2
http://trac.fawkesrobotics.org/changeset/4fe72c2

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit bed84c0ea7d9a60812209f9a32c3d04ce8cb98cd
Merge: 4fe72c2 6636bc7
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:34:24 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:34:24 2016 +0200

    Merge remote-tracking branch 'origin/vmatare/yamlconf-better-errors'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 38f1f7a18357dbee272bc68c7e572768c87ff155
Merge: bed84c0 4627edb
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:34:27 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:34:27 2016 +0200

    Merge remote-tracking branch 'origin/vmatare/scope-timetracker'

http://git.fawkesrobotics.org/fawkes.git/commit/38f1f7a
http://trac.fawkesrobotics.org/changeset/38f1f7a

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 71b60ea0dbc63be456143f0b9f08b71780655de8
Merge: 38f1f7a 1429d7f
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:34:34 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:34:34 2016 +0200

    Merge remote-tracking branch 'origin/vmatare/cpp-namespaces'

http://git.fawkesrobotics.org/fawkes.git/commit/71b60ea
http://trac.fawkesrobotics.org/changeset/71b60ea

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit b2f2d87bd5288c651e8426aa2eafa7a34408e4a1
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:50:38 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:50:38 2016 +0200

    utils: fix scoped time tracker documentation

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 28621e28f8a0617fe58757e3356141a469304161
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:51:08 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:51:08 2016 +0200

    navgraph: rospub thread doc fixes

http://git.fawkesrobotics.org/fawkes.git/commit/28621e2
http://trac.fawkesrobotics.org/changeset/28621e2

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 8ce059365c185811610de51c75e9ebfd90d85099
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Jun 23 14:51:19 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Jun 23 14:51:19 2016 +0200

    robotino: re-generate interface with latest ffifacegen

http://git.fawkesrobotics.org/fawkes.git/commit/8ce0593
http://trac.fawkesrobotics.org/changeset/8ce0593

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


- *Summary* -----------------------------------------------------------
 cfg/conf.d/gazsim.yaml                             |    2 +-
 cfg/conf.d/joystick.yaml                           |   57 +-
 cfg/conf.d/navgraph.yaml                           |   30 +-
 cfg/conf.d/robotino.yaml                           |  115 ++-
 cfg/conf.d/ros.yaml                                |    4 +
 cfg/conf.d/skiller.yaml                            |   37 +-
 etc/buildsys/boost.mk                              |   15 +-
 etc/buildsys/lua.mk                                |    4 +-
 src/libs/blackboard/Makefile                       |   22 +-
 src/libs/blackboard/blackboard.tolua               |   65 ++
 src/libs/blackboard/exceptions.h                   |   13 +-
 src/libs/blackboard/internal/interface_manager.cpp |   19 +-
 src/libs/blackboard/ownership.cpp                  |    6 +
 src/libs/config/net_handler.h                      |    4 +-
 src/libs/config/netconf.cpp                        |   14 +-
 src/libs/interface/interface.cpp                   |   17 +-
 src/libs/interface/interface.tolua                 |   24 +-
 src/libs/interface/message.tolua                   |    4 +-
 src/libs/interfaces/BatteryInterface.tolua         |   51 +-
 src/libs/interfaces/CameraControlInterface.tolua   |   68 ++-
 src/libs/interfaces/EclipseDebuggerInterface.tolua |   34 +-
 src/libs/interfaces/FacerInterface.tolua           |  136 +++-
 .../interfaces/FacialExpressionInterface.tolua     |   85 ++-
 src/libs/interfaces/GameStateInterface.tolua       |   68 ++-
 src/libs/interfaces/GripperInterface.tolua         |   51 +-
 src/libs/interfaces/HumanSkeletonInterface.tolua   |   17 +-
 src/libs/interfaces/HumanoidMotionInterface.tolua  |  204 +++++-
 src/libs/interfaces/IMUInterface.tolua             |   17 +-
 src/libs/interfaces/JointInterface.tolua           |   17 +-
 src/libs/interfaces/JoystickInterface.tolua        |   68 ++-
 src/libs/interfaces/KeyValueInterface.tolua        |   17 +-
 src/libs/interfaces/KickerInterface.tolua          |   68 ++-
 src/libs/interfaces/Laser1080Interface.tolua       |   17 +-
 src/libs/interfaces/Laser360Interface.tolua        |   17 +-
 src/libs/interfaces/Laser720Interface.tolua        |   17 +-
 src/libs/interfaces/LedInterface.tolua             |   68 ++-
 src/libs/interfaces/LocalizationInterface.tolua    |   34 +-
 src/libs/interfaces/MotorInterface.tolua           |  204 +++++-
 src/libs/interfaces/NavPathInterface.tolua         |   17 +-
 src/libs/interfaces/NavigatorInterface.tolua       |  289 ++++++-
 src/libs/interfaces/ObjectPositionInterface.tolua  |   17 +-
 src/libs/interfaces/Position2DTrackInterface.tolua |   17 +-
 src/libs/interfaces/Position3DInterface.tolua      |   17 +-
 src/libs/interfaces/SkillerInterface.tolua         |  102 ++-
 src/libs/interfaces/SoccerPenaltyInterface.tolua   |   34 +-
 .../interfaces/SpeechRecognitionInterface.tolua    |   51 +-
 src/libs/interfaces/SpeechSynthInterface.tolua     |   34 +-
 src/libs/interfaces/SwitchInterface.tolua          |   85 ++-
 src/libs/interfaces/TestInterface.tolua            |   68 ++-
 src/libs/interfaces/TransformInterface.tolua       |   17 +-
 src/libs/interfaces/VisualDisplay2DInterface.tolua |  119 +++-
 src/libs/interfaces/generator/tolua_generator.cpp  |   58 ++-
 src/libs/interfaces/generator/tolua_generator.h    |    2 +
 src/libs/logging/component.cpp                     |   19 +
 src/libs/logging/component.h                       |    2 +
 src/libs/lua/context.cpp                           |  211 ++++-
 src/libs/lua/context.h                             |   17 +-
 src/libs/plugin/manager.cpp                        |   80 +-
 src/libs/plugin/net/handler.cpp                    |    4 +-
 src/libs/protobuf_clips/communicator.cpp           |   31 +-
 src/libs/protobuf_clips/communicator.h             |    2 -
 src/libs/tf/time_cache.cpp                         |   10 +-
 src/libs/utils/math/angle.h                        |   16 +-
 src/libs/utils/time/tracker.cpp                    |   20 +
 src/libs/utils/time/tracker.h                      |   11 +
 src/libs/utils/time/tracker_macros.h               |    4 +
 src/lua/fawkes/interface_initializer.lua           |  109 ++-
 src/lua/fawkes/laser-lines_utils.lua               |    9 +
 src/lua/fawkes/mathext.lua                         |    8 +-
 src/lua/fawkes/tfutils.lua                         |   81 ++-
 src/lua/fawkes/toluaext.lua                        |   42 +
 src/lua/skiller/fawkes/init.lua                    |  281 ++++++
 src/lua/skiller/fawkes/start.lua                   |   20 +-
 src/lua/skiller/skillenv.lua                       |  151 ++--
 src/lua/skills/generic/say.lua                     |    2 +-
 src/plugins/amcl/map_lasergen_thread.cpp           |    8 +-
 .../interfaces/OpenCVStereoParamsInterface.tolua   |  204 +++++-
 src/plugins/clips/feature_blackboard.cpp           |   11 +
 src/plugins/colli/search/og_laser.cpp              |    2 +-
 src/plugins/colli/utils/rob/roboshape.cpp          |   18 +-
 .../interfaces/DynamixelServoInterface.tolua       |  340 +++++++-
 .../gazsim_vis_localization_thread.cpp             |    4 +-
 src/plugins/jaco/bimanual_goto_thread.cpp          |    4 +-
 src/plugins/jaco/goto_thread.cpp                   |   14 +-
 .../jaco/interfaces/JacoBimanualInterface.tolua    |   85 ++-
 src/plugins/jaco/interfaces/JacoInterface.tolua    |  170 ++++-
 src/plugins/joystick/acquisition_thread.cpp        |  308 ++++---
 src/plugins/joystick/acquisition_thread.h          |   56 +-
 src/plugins/joystick/joystick_teleop_thread.cpp    |  112 +++-
 src/plugins/joystick/joystick_teleop_thread.h      |   10 +-
 .../katana/interfaces/KatanaInterface.tolua        |  289 ++++++-
 .../interfaces/LaserClusterInterface.tolua         |   51 +-
 .../interfaces/LaserLineInterface.tolua            |   17 +-
 .../nao/interfaces/NaoJointPositionInterface.tolua |   85 ++-
 .../interfaces/NaoJointStiffnessInterface.tolua    |   68 ++-
 .../nao/interfaces/NaoSensorInterface.tolua        |   68 ++-
 .../interfaces/NavGraphGeneratorInterface.cpp      |  194 ++--
 .../interfaces/NavGraphGeneratorInterface.h_ext    |   60 +-
 .../interfaces/NavGraphGeneratorInterface.tolua    |  320 ++++++-
 .../interfaces/NavGraphGeneratorInterface.xml      |   12 +-
 .../navgraph_generator_thread.cpp                  |   14 +-
 src/plugins/navgraph/Makefile                      |   36 +-
 src/plugins/navgraph/navgraph_plugin.cpp           |   12 +
 src/plugins/navgraph/navgraph_thread.cpp           |    4 +-
 src/plugins/navgraph/rospub_thread.cpp             |  129 +++
 .../rospub_thread.h}                               |   41 +-
 src/plugins/navgraph/visualization_thread.cpp      |   25 +
 .../HumanSkeletonProjectionInterface.tolua         |   17 +-
 .../openrave/interfaces/OpenRaveInterface.tolua    |  204 +++++-
 .../pantilt/interfaces/PanTiltInterface.tolua      |  170 ++++-
 .../interfaces/PclDatabaseMergeInterface.tolua     |   34 +-
 .../interfaces/PclDatabaseRetrieveInterface.tolua  |   34 +-
 .../interfaces/PclDatabaseStoreInterface.tolua     |   34 +-
 src/plugins/robotino/Makefile                      |   85 ++-
 src/plugins/robotino/act_thread.cpp                |  675 +++++++-------
 src/plugins/robotino/act_thread.h                  |  155 ++--
 src/plugins/robotino/com_thread.cpp                |  863 +++++++------------
 src/plugins/robotino/com_thread.h                  |  225 +++---
 src/plugins/robotino/direct_com_message.cpp        |  900 ++++++++++++++++++
 src/plugins/robotino/direct_com_message.h          |  232 +++++
 src/plugins/robotino/direct_com_thread.cpp         |  951 ++++++++++++++++++++
 src/plugins/robotino/direct_com_thread.h           |  136 +++
 .../interfaces/RobotinoSensorInterface.cpp         |  204 +++++-
 .../interfaces/RobotinoSensorInterface.h_ext       |   43 +-
 .../interfaces/RobotinoSensorInterface.tolua       |   68 ++-
 .../interfaces/RobotinoSensorInterface.xml         |   13 +-
 src/plugins/robotino/openrobotino_com_thread.cpp   |  545 +++++++++++
 src/plugins/robotino/openrobotino_com_thread.h     |  149 +++
 src/plugins/robotino/robotino.mk                   |   22 +
 src/plugins/robotino/robotino_plugin.cpp           |   49 +-
 src/plugins/robotino/sensor_thread.cpp             |  137 +++-
 src/plugins/robotino/sensor_thread.h               |   44 +-
 src/plugins/roomba/Roomba500Interface.tolua        |  119 +++-
 src/plugins/ros/pcl_thread.cpp                     |  217 +++++-
 src/plugins/ros/pcl_thread.h                       |   36 +-
 src/plugins/ros/skiller_thread.cpp                 |   11 +-
 src/plugins/skiller/SkillerDebugInterface.tolua    |   68 ++-
 src/plugins/skiller/exec_thread.cpp                |  503 +----------
 src/plugins/skiller/exec_thread.h                  |   40 +-
 src/tools/skillgui/skillgui.cpp                    |    4 +
 140 files changed, 11037 insertions(+), 2488 deletions(-)
 create mode 100644 src/libs/blackboard/blackboard.tolua
 create mode 100644 src/lua/fawkes/toluaext.lua
 create mode 100644 src/lua/skiller/fawkes/init.lua
 create mode 100644 src/plugins/navgraph/rospub_thread.cpp
 copy src/plugins/{skiller/skiller_navgraph_feature.h => navgraph/rospub_thread.h} (62%)
 create mode 100644 src/plugins/robotino/direct_com_message.cpp
 create mode 100644 src/plugins/robotino/direct_com_message.h
 create mode 100644 src/plugins/robotino/direct_com_thread.cpp
 create mode 100644 src/plugins/robotino/direct_com_thread.h
 create mode 100644 src/plugins/robotino/openrobotino_com_thread.cpp
 create mode 100644 src/plugins/robotino/openrobotino_com_thread.h


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

- *commit* 029d9a2eb5c0e301b8dd096ca866ce545ecc2437 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:26:06 2016 +0200
Subject: Merge remote-tracking branch 'origin/fzwilling/align_at_table-transform'

 src/lua/skills/generic/align_at_table.lua |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

_Diff for modified files_:

- *commit* 497f55ae030e177b181cb894c1dceb3d9b7aa788 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:26:55 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/clips-bb-inf'

 src/plugins/clips/feature_blackboard.cpp |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

_Diff for modified files_:

- *commit* 762f9af309d8f46821b838547c10433798c95362 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:27:02 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/map-lasergen-fix'

 src/plugins/amcl/map_lasergen_thread.cpp |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

_Diff for modified files_:

- *commit* 6e1885f4606b6f3475a39ec88e9d09a41533e2ad - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:27:10 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/navgraph-deleteall'

 cfg/conf.d/navgraph.yaml                      |   26 -------------------------
 src/plugins/navgraph/visualization_thread.cpp |   25 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 26 deletions(-)

_Diff for modified files_:

- *commit* 8fe984ba9ce01faa96544a0dd5878b58e654f37a - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:27:17 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/navgraph-rospub'

 cfg/conf.d/navgraph.yaml                           |    4 +
 src/plugins/navgraph/Makefile                      |   36 ++++--
 src/plugins/navgraph/navgraph_plugin.cpp           |   12 ++
 src/plugins/navgraph/rospub_thread.cpp             |  129 ++++++++++++++++++++
 .../rospub_thread.h}                               |   41 ++++---
 5 files changed, 196 insertions(+), 26 deletions(-)

_Diff for modified files_:

- *commit* 30810872687f9b1136fbd8b3175ccdfff8fd7de2 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:27:36 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/netconf-fixes'

 src/libs/config/net_handler.h |    4 ++--
 src/libs/config/netconf.cpp   |   14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

_Diff for modified files_:

- *commit* 909353843d1358053ff4f0c58e4026a5ad55eebe - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:27:41 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/protobuf-clips'

 src/libs/protobuf_clips/communicator.cpp |   31 +++++++++++++----------------
 src/libs/protobuf_clips/communicator.h   |    2 -
 2 files changed, 14 insertions(+), 19 deletions(-)

_Diff for modified files_:

- *commit* f1856600e85634ba1ca203f0382c106c88e0b0e3 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:27:49 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/robotino-direct'

 cfg/conf.d/joystick.yaml                           |   57 +-
 cfg/conf.d/robotino.yaml                           |  115 ++-
 etc/buildsys/boost.mk                              |   15 +-
 src/libs/plugin/manager.cpp                        |   80 +-
 src/libs/tf/time_cache.cpp                         |   10 +-
 src/plugins/joystick/acquisition_thread.cpp        |  308 ++++---
 src/plugins/joystick/acquisition_thread.h          |   56 +-
 src/plugins/joystick/joystick_teleop_thread.cpp    |  112 +++-
 src/plugins/joystick/joystick_teleop_thread.h      |   10 +-
 src/plugins/robotino/Makefile                      |   85 ++-
 src/plugins/robotino/act_thread.cpp                |  675 +++++++-------
 src/plugins/robotino/act_thread.h                  |  155 ++--
 src/plugins/robotino/com_thread.cpp                |  863 +++++++------------
 src/plugins/robotino/com_thread.h                  |  225 +++---
 src/plugins/robotino/direct_com_message.cpp        |  900 ++++++++++++++++++
 src/plugins/robotino/direct_com_message.h          |  232 +++++
 src/plugins/robotino/direct_com_thread.cpp         |  951 ++++++++++++++++++++
 src/plugins/robotino/direct_com_thread.h           |  136 +++
 .../interfaces/RobotinoSensorInterface.cpp         |  204 +++++-
 .../interfaces/RobotinoSensorInterface.h_ext       |   43 +-
 .../interfaces/RobotinoSensorInterface.tolua       |   17 +
 .../interfaces/RobotinoSensorInterface.xml         |   13 +-
 src/plugins/robotino/openrobotino_com_thread.cpp   |  545 +++++++++++
 src/plugins/robotino/openrobotino_com_thread.h     |  149 +++
 src/plugins/robotino/robotino.mk                   |   22 +
 src/plugins/robotino/robotino_plugin.cpp           |   49 +-
 src/plugins/robotino/sensor_thread.cpp             |  137 +++-
 src/plugins/robotino/sensor_thread.h               |   44 +-
 28 files changed, 4802 insertions(+), 1406 deletions(-)

_Diff for modified files_:

- *commit* 3ba3a9f8fffea84fcb3d11113d052d8f746ba2b4 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:28:32 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/skiller-fixes'

 src/plugins/ros/skiller_thread.cpp  |   11 +++++++----
 src/plugins/skiller/exec_thread.cpp |    1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

_Diff for modified files_:

- *commit* 4f6b39cc4b758f051ea907c9d6db5532ca34fe14 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:30:12 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/skiller-auto-interfaces'

 cfg/conf.d/gazsim.yaml                             |    2 +-
 cfg/conf.d/skiller.yaml                            |   37 +--
 etc/buildsys/lua.mk                                |    4 +-
 src/libs/blackboard/Makefile                       |   22 +-
 src/libs/blackboard/blackboard.tolua               |   65 +++
 src/libs/blackboard/exceptions.h                   |   13 +-
 src/libs/blackboard/internal/interface_manager.cpp |   19 +-
 src/libs/blackboard/ownership.cpp                  |    6 +
 src/libs/interface/interface.cpp                   |   17 +-
 src/libs/interface/interface.tolua                 |   24 +-
 src/libs/interface/message.tolua                   |    4 +-
 src/libs/interfaces/BatteryInterface.tolua         |   51 ++-
 src/libs/interfaces/CameraControlInterface.tolua   |   68 +++-
 src/libs/interfaces/EclipseDebuggerInterface.tolua |   34 ++-
 src/libs/interfaces/FacerInterface.tolua           |  136 ++++++-
 .../interfaces/FacialExpressionInterface.tolua     |   85 ++++-
 src/libs/interfaces/GameStateInterface.tolua       |   68 +++-
 src/libs/interfaces/GripperInterface.tolua         |   51 ++-
 src/libs/interfaces/HumanSkeletonInterface.tolua   |   17 +-
 src/libs/interfaces/HumanoidMotionInterface.tolua  |  204 ++++++++-
 src/libs/interfaces/IMUInterface.tolua             |   17 +-
 src/libs/interfaces/JointInterface.tolua           |   17 +-
 src/libs/interfaces/JoystickInterface.tolua        |   68 +++-
 src/libs/interfaces/KeyValueInterface.tolua        |   17 +-
 src/libs/interfaces/KickerInterface.tolua          |   68 +++-
 src/libs/interfaces/Laser1080Interface.tolua       |   17 +-
 src/libs/interfaces/Laser360Interface.tolua        |   17 +-
 src/libs/interfaces/Laser720Interface.tolua        |   17 +-
 src/libs/interfaces/LedInterface.tolua             |   68 +++-
 src/libs/interfaces/LocalizationInterface.tolua    |   34 ++-
 src/libs/interfaces/MotorInterface.tolua           |  204 ++++++++-
 src/libs/interfaces/NavPathInterface.tolua         |   17 +-
 src/libs/interfaces/NavigatorInterface.tolua       |  289 +++++++++++-
 src/libs/interfaces/ObjectPositionInterface.tolua  |   17 +-
 src/libs/interfaces/Position2DTrackInterface.tolua |   17 +-
 src/libs/interfaces/Position3DInterface.tolua      |   17 +-
 src/libs/interfaces/SkillerInterface.tolua         |  102 ++++-
 src/libs/interfaces/SoccerPenaltyInterface.tolua   |   34 ++-
 .../interfaces/SpeechRecognitionInterface.tolua    |   51 ++-
 src/libs/interfaces/SpeechSynthInterface.tolua     |   34 ++-
 src/libs/interfaces/SwitchInterface.tolua          |   85 ++++-
 src/libs/interfaces/TestInterface.tolua            |   68 +++-
 src/libs/interfaces/TransformInterface.tolua       |   17 +-
 src/libs/interfaces/VisualDisplay2DInterface.tolua |  119 +++++-
 src/libs/interfaces/generator/tolua_generator.cpp  |   58 +++-
 src/libs/interfaces/generator/tolua_generator.h    |    2 +
 src/libs/logging/component.cpp                     |   19 +
 src/libs/logging/component.h                       |    2 +
 src/libs/lua/context.cpp                           |  211 +++++++--
 src/libs/lua/context.h                             |   17 +-
 src/libs/plugin/net/handler.cpp                    |    4 +-
 src/lua/fawkes/interface_initializer.lua           |  109 ++++-
 src/lua/fawkes/toluaext.lua                        |   42 ++
 src/lua/skiller/fawkes/init.lua                    |  281 +++++++++++
 src/lua/skiller/fawkes/start.lua                   |   20 +-
 src/lua/skiller/skillenv.lua                       |  151 ++++---
 src/lua/skills/generic/say.lua                     |    2 +-
 .../interfaces/OpenCVStereoParamsInterface.tolua   |  204 ++++++++-
 .../interfaces/DynamixelServoInterface.tolua       |  340 +++++++++++++-
 .../jaco/interfaces/JacoBimanualInterface.tolua    |   85 ++++-
 src/plugins/jaco/interfaces/JacoInterface.tolua    |  170 +++++++-
 .../katana/interfaces/KatanaInterface.tolua        |  289 +++++++++++-
 .../interfaces/LaserClusterInterface.tolua         |   51 ++-
 .../interfaces/LaserLineInterface.tolua            |   17 +-
 .../nao/interfaces/NaoJointPositionInterface.tolua |   85 ++++-
 .../interfaces/NaoJointStiffnessInterface.tolua    |   68 +++-
 .../nao/interfaces/NaoSensorInterface.tolua        |   68 +++-
 .../interfaces/NavGraphGeneratorInterface.cpp      |  194 ++++----
 .../interfaces/NavGraphGeneratorInterface.h_ext    |   60 ++--
 .../interfaces/NavGraphGeneratorInterface.tolua    |  320 ++++++++++++-
 .../interfaces/NavGraphGeneratorInterface.xml      |   12 +-
 .../navgraph_generator_thread.cpp                  |   14 +-
 .../HumanSkeletonProjectionInterface.tolua         |   17 +-
 .../openrave/interfaces/OpenRaveInterface.tolua    |  204 ++++++++-
 .../pantilt/interfaces/PanTiltInterface.tolua      |  170 +++++++-
 .../interfaces/PclDatabaseMergeInterface.tolua     |   34 ++-
 .../interfaces/PclDatabaseRetrieveInterface.tolua  |   34 ++-
 .../interfaces/PclDatabaseStoreInterface.tolua     |   34 ++-
 .../interfaces/RobotinoSensorInterface.tolua       |   34 ++-
 src/plugins/roomba/Roomba500Interface.tolua        |  119 +++++-
 src/plugins/skiller/SkillerDebugInterface.tolua    |   68 +++-
 src/plugins/skiller/exec_thread.cpp                |  504 ++------------------
 src/plugins/skiller/exec_thread.h                  |   40 +--
 src/tools/skillgui/skillgui.cpp                    |    4 +
 84 files changed, 5559 insertions(+), 936 deletions(-)

_Diff for modified files_:

- *commit* 84568886f6ebfed689ea64f8f010468de63d6c5c - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:30:46 2016 +0200
Subject: Merge remote-tracking branch 'origin/tneumann/angle_distance_fix'

 src/libs/utils/math/angle.h               |   16 +++++++++++++---
 src/lua/fawkes/mathext.lua                |    8 +-------
 src/plugins/jaco/bimanual_goto_thread.cpp |    4 ++--
 src/plugins/jaco/goto_thread.cpp          |   14 +++++++-------
 src/plugins/navgraph/navgraph_thread.cpp  |    4 ++--
 5 files changed, 25 insertions(+), 21 deletions(-)

_Diff for modified files_:

- *commit* b2f096ba0ef43132675151721cd57a154169bc60 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:30:57 2016 +0200
Subject: Merge remote-tracking branch 'origin/tneumann/pcl-ros-bidirectional'

 cfg/conf.d/ros.yaml            |    4 +
 src/plugins/ros/pcl_thread.cpp |  217 +++++++++++++++++++++++++++++++++++++---
 src/plugins/ros/pcl_thread.h   |   36 +++++++-
 3 files changed, 242 insertions(+), 15 deletions(-)

_Diff for modified files_:

- *commit* 4fe72c26926b29109deda44c39389d8e6f5ac10e - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:34:13 2016 +0200
Subject: Merge remote-tracking branch 'origin/vmatare/lua-utils'

 src/lua/fawkes/laser-lines_utils.lua |    9 ++++
 src/lua/fawkes/tfutils.lua           |   81 ++++++++++++++++++++++++++++-----
 2 files changed, 77 insertions(+), 13 deletions(-)

_Diff for modified files_:

- *commit* bed84c0ea7d9a60812209f9a32c3d04ce8cb98cd - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:34:24 2016 +0200
Subject: Merge remote-tracking branch 'origin/vmatare/yamlconf-better-errors'


_Diff for modified files_:

- *commit* 38f1f7a18357dbee272bc68c7e572768c87ff155 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:34:27 2016 +0200
Subject: Merge remote-tracking branch 'origin/vmatare/scope-timetracker'

 src/libs/utils/time/tracker.cpp      |   10 ++++++++++
 src/libs/utils/time/tracker.h        |   11 +++++++++++
 src/libs/utils/time/tracker_macros.h |    4 ++++
 3 files changed, 25 insertions(+), 0 deletions(-)

_Diff for modified files_:

- *commit* 71b60ea0dbc63be456143f0b9f08b71780655de8 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:34:34 2016 +0200
Subject: Merge remote-tracking branch 'origin/vmatare/cpp-namespaces'

 src/plugins/colli/search/og_laser.cpp              |    2 +-
 src/plugins/colli/utils/rob/roboshape.cpp          |   18 +++++++++---------
 .../gazsim_vis_localization_thread.cpp             |    4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

_Diff for modified files_:

- *commit* b2f2d87bd5288c651e8426aa2eafa7a34408e4a1 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:50:38 2016 +0200
Subject: utils: fix scoped time tracker documentation

 src/libs/utils/time/tracker.cpp |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/libs/utils/time/tracker.cpp b/src/libs/utils/time/tracker.cpp
index b4bcf06..2dc7998 100644
--- a/src/libs/utils/time/tracker.cpp
+++ b/src/libs/utils/time/tracker.cpp
@@ -466,12 +466,22 @@ TimeTracker::print_to_file()
   fflush(__timelog);
 }
 
+/** @class ScopedClassItemTracker "utils/time/tracker.h"
+ * Scoped time tracking for specific item.
+ * @author Victor Matare
+ */
 
+/** Constructor.
+ * Starts time tracking for given class on given time tracker.
+ * @param tt time tracker
+ * @param cls class ID
+ */
 ScopedClassItemTracker::ScopedClassItemTracker(TimeTracker &tt, unsigned int cls)
 : tt_(tt), cls_(cls)
 { tt_.ping_start(cls_); }
 
 
+/** Destructor. */
 ScopedClassItemTracker::~ScopedClassItemTracker()
 { tt_.ping_end(cls_); }
 

- *commit* 28621e28f8a0617fe58757e3356141a469304161 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:51:08 2016 +0200
Subject: navgraph: rospub thread doc fixes

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

_Diff for modified files_:
diff --git a/src/plugins/navgraph/rospub_thread.cpp b/src/plugins/navgraph/rospub_thread.cpp
index d8c1321..89d3b68 100644
--- a/src/plugins/navgraph/rospub_thread.cpp
+++ b/src/plugins/navgraph/rospub_thread.cpp
@@ -29,7 +29,7 @@
 
 using namespace fawkes;
 
-/** @class NavGraphROSPubThread "navgraph_rospub_thread.h"
+/** @class NavGraphROSPubThread "rospub_thread.h"
  * Publish navgaraph to ROS.
  * @author Tim Niemueller
  */

- *commit* 8ce059365c185811610de51c75e9ebfd90d85099 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Jun 23 14:51:19 2016 +0200
Subject: robotino: re-generate interface with latest ffifacegen

 .../interfaces/RobotinoSensorInterface.tolua       |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/robotino/interfaces/RobotinoSensorInterface.tolua b/src/plugins/robotino/interfaces/RobotinoSensorInterface.tolua
index e71d106..94f5677 100644
--- a/src/plugins/robotino/interfaces/RobotinoSensorInterface.tolua
+++ b/src/plugins/robotino/interfaces/RobotinoSensorInterface.tolua
@@ -40,6 +40,23 @@ class RobotinoSensorInterface : public Interface
     SetDigitalOutputMessage();
     ~SetDigitalOutputMessage();
 
+    unsigned int      id() const;
+
+    unsigned int      sender_id() const;
+    const char *      sender_thread_name() const;
+    Interface *       interface() const;
+    const char *      type() const;
+
+    const void *      datachunk() const;
+    unsigned int      datasize() const;
+
+    void              set_from_chunk(const void *chunk);
+
+    /* from RefCount */
+    void              ref();
+    void              unref();
+    unsigned int      refcount();
+
     unsigned char digital_out();
     void set_digital_out(const unsigned char new_digital_out);
     int maxlenof_digital_out() const;




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


More information about the fawkes-commits mailing list