[Fawkes Git] branch/common/caro-current: created (0.5.0-3160-g7ab4c4d)

Frederik Zwilling zwilling at kbsg.rwth-aachen.de
Thu Apr 14 18:13:07 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/caro-current has been created
        at  7ab4c4d6d0d549514d13c6bd516949eb0762aaa8 (commit)

http://git.fawkesrobotics.org/fawkes.git/common/caro-current

- *Log* ---------------------------------------------------------------
commit b7dc922f6a232fed38131e841f73d2484e983b3d
Merge: fa019ab 24d074d
Author:     Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
AuthorDate: Thu Apr 14 18:12:19 2016 +0200
Commit:     Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
CommitDate: Thu Apr 14 18:12:19 2016 +0200

    Merge remote-tracking branch 'origin/timn/skiller-auto-interfaces' into common/caro-current

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit c2e522c0cef7b3ad776d2cfaa38406ddab95d7af
Merge: b7dc922 ce7348c
Author:     Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
AuthorDate: Thu Apr 14 18:12:32 2016 +0200
Commit:     Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
CommitDate: Thu Apr 14 18:12:32 2016 +0200

    Merge remote-tracking branch 'origin/timn/robotino-direct' into common/caro-current

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 7ab4c4d6d0d549514d13c6bd516949eb0762aaa8
Merge: c2e522c 55cd4f0
Author:     Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
AuthorDate: Thu Apr 14 18:12:45 2016 +0200
Commit:     Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
CommitDate: Thu Apr 14 18:12:45 2016 +0200

    Merge remote-tracking branch 'origin/sschoenitz/timeout' into common/caro-current

http://git.fawkesrobotics.org/fawkes.git/commit/7ab4c4d
http://trac.fawkesrobotics.org/changeset/7ab4c4d

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


- *Summary* -----------------------------------------------------------
 cfg/conf.d/joystick.yaml                         |   41 +-
 cfg/conf.d/robotino.yaml                         |  105 +++-
 etc/buildsys/boost.mk                            |   15 +-
 src/libs/plugin/manager.cpp                      |   80 +-
 src/libs/tf/time_cache.cpp                       |   10 +-
 src/lua/fawkes/fsm/jumpstate.lua                 |   12 +-
 src/plugins/joystick/acquisition_thread.cpp      |  287 ++++---
 src/plugins/joystick/acquisition_thread.h        |   45 +-
 src/plugins/joystick/joystick_teleop_thread.cpp  |   80 ++-
 src/plugins/joystick/joystick_teleop_thread.h    |    4 +
 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              |  857 ++++++++--------------
 src/plugins/robotino/com_thread.h                |  222 +++---
 src/plugins/robotino/direct_com_message.cpp      |  883 +++++++++++++++++++++
 src/plugins/robotino/direct_com_message.h        |  223 ++++++
 src/plugins/robotino/direct_com_thread.cpp       |  886 ++++++++++++++++++++++
 src/plugins/robotino/direct_com_thread.h         |  128 ++++
 src/plugins/robotino/openrobotino_com_thread.cpp |  539 +++++++++++++
 src/plugins/robotino/openrobotino_com_thread.h   |  148 ++++
 src/plugins/robotino/robotino.mk                 |   22 +
 src/plugins/robotino/robotino_plugin.cpp         |   49 +-
 src/plugins/robotino/sensor_thread.cpp           |  128 +++-
 src/plugins/robotino/sensor_thread.h             |   44 +-
 25 files changed, 4325 insertions(+), 1398 deletions(-)
 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* b7dc922f6a232fed38131e841f73d2484e983b3d - - - - - - - - - -
Author:  Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
Date:    Thu Apr 14 18:12:19 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/skiller-auto-interfaces' into common/caro-current

 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                |  503 ++------------------
 src/plugins/skiller/exec_thread.h                  |   40 +--
 src/tools/skillgui/skillgui.cpp                    |    4 +
 84 files changed, 5559 insertions(+), 935 deletions(-)

_Diff for modified files_:

- *commit* c2e522c0cef7b3ad776d2cfaa38406ddab95d7af - - - - - - - - - -
Author:  Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
Date:    Thu Apr 14 18:12:32 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/robotino-direct' into common/caro-current

 cfg/conf.d/joystick.yaml                         |   41 +-
 cfg/conf.d/robotino.yaml                         |  105 +++-
 etc/buildsys/boost.mk                            |   15 +-
 src/libs/plugin/manager.cpp                      |   80 +-
 src/libs/tf/time_cache.cpp                       |   10 +-
 src/plugins/joystick/acquisition_thread.cpp      |  287 ++++---
 src/plugins/joystick/acquisition_thread.h        |   45 +-
 src/plugins/joystick/joystick_teleop_thread.cpp  |   80 ++-
 src/plugins/joystick/joystick_teleop_thread.h    |    4 +
 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              |  857 ++++++++--------------
 src/plugins/robotino/com_thread.h                |  222 +++---
 src/plugins/robotino/direct_com_message.cpp      |  883 +++++++++++++++++++++
 src/plugins/robotino/direct_com_message.h        |  223 ++++++
 src/plugins/robotino/direct_com_thread.cpp       |  886 ++++++++++++++++++++++
 src/plugins/robotino/direct_com_thread.h         |  128 ++++
 src/plugins/robotino/openrobotino_com_thread.cpp |  539 +++++++++++++
 src/plugins/robotino/openrobotino_com_thread.h   |  148 ++++
 src/plugins/robotino/robotino.mk                 |   22 +
 src/plugins/robotino/robotino_plugin.cpp         |   49 +-
 src/plugins/robotino/sensor_thread.cpp           |  128 +++-
 src/plugins/robotino/sensor_thread.h             |   44 +-
 24 files changed, 4315 insertions(+), 1396 deletions(-)

_Diff for modified files_:

- *commit* 7ab4c4d6d0d549514d13c6bd516949eb0762aaa8 - - - - - - - - - -
Author:  Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
Date:    Thu Apr 14 18:12:45 2016 +0200
Subject: Merge remote-tracking branch 'origin/sschoenitz/timeout' into common/caro-current

 src/lua/fawkes/fsm/jumpstate.lua |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

_Diff for modified files_:




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


More information about the fawkes-commits mailing list