[Fawkes Git] branch/common/caro-current: 4 revs updated. (0.5.0-3164-gf1d853e)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Fri Apr 15 16:24:15 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 updated
        to  f1d853ef23a663a129350efd7bc2a095b2fe6375 (commit)
       via  7d9de92414f9268b847db72a06a8493ef47ab148 (commit)
       via  e413a9902aa836811103134e6a6f1c159465f33b (commit)
       via  e4e6cce12c35a39477095701036e1e1982d92a17 (commit)
      from  7ab4c4d6d0d549514d13c6bd516949eb0762aaa8 (commit)

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

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 f1d853ef23a663a129350efd7bc2a095b2fe6375
Merge: 7ab4c4d 7d9de92
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Fri Apr 15 16:24:08 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Fri Apr 15 16:24:08 2016 +0200

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

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

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


- *Summary* -----------------------------------------------------------
 cfg/conf.d/joystick.yaml                           |   16 ++
 src/plugins/joystick/acquisition_thread.cpp        |   25 +++-
 src/plugins/joystick/acquisition_thread.h          |    1 +
 src/plugins/joystick/joystick_teleop_thread.cpp    |   32 +++
 src/plugins/joystick/joystick_teleop_thread.h      |    6 +-
 src/plugins/robotino/com_thread.cpp                |    6 +
 src/plugins/robotino/com_thread.h                  |    3 +
 src/plugins/robotino/direct_com_thread.cpp         |   38 ++++
 src/plugins/robotino/direct_com_thread.h           |    4 +
 .../interfaces/RobotinoSensorInterface.cpp         |  204 +++++++++++++++++++-
 .../interfaces/RobotinoSensorInterface.h_ext       |   43 ++++-
 .../interfaces/RobotinoSensorInterface.tolua       |   17 ++
 .../interfaces/RobotinoSensorInterface.xml         |   13 ++-
 src/plugins/robotino/openrobotino_com_thread.cpp   |    6 +
 src/plugins/robotino/openrobotino_com_thread.h     |    1 +
 src/plugins/robotino/sensor_thread.cpp             |    9 +
 16 files changed, 417 insertions(+), 7 deletions(-)


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

- *commit* f1d853ef23a663a129350efd7bc2a095b2fe6375 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Fri Apr 15 16:24:08 2016 +0200
Subject: Merge remote-tracking branch 'origin/timn/robotino-direct' into caro-current

 cfg/conf.d/joystick.yaml                           |   16 ++
 src/plugins/joystick/acquisition_thread.cpp        |   25 +++-
 src/plugins/joystick/acquisition_thread.h          |    1 +
 src/plugins/joystick/joystick_teleop_thread.cpp    |   32 +++
 src/plugins/joystick/joystick_teleop_thread.h      |    6 +-
 src/plugins/robotino/com_thread.cpp                |    6 +
 src/plugins/robotino/com_thread.h                  |    3 +
 src/plugins/robotino/direct_com_thread.cpp         |   38 ++++
 src/plugins/robotino/direct_com_thread.h           |    4 +
 .../interfaces/RobotinoSensorInterface.cpp         |  204 +++++++++++++++++++-
 .../interfaces/RobotinoSensorInterface.h_ext       |   43 ++++-
 .../interfaces/RobotinoSensorInterface.tolua       |   17 ++
 .../interfaces/RobotinoSensorInterface.xml         |   13 ++-
 src/plugins/robotino/openrobotino_com_thread.cpp   |    6 +
 src/plugins/robotino/openrobotino_com_thread.h     |    1 +
 src/plugins/robotino/sensor_thread.cpp             |    9 +
 16 files changed, 417 insertions(+), 7 deletions(-)

_Diff for modified files_:




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


More information about the fawkes-commits mailing list