[Fawkes Git] branch/timn/master-preview: created (0.5.0-3436-gc175651)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Wed Dec 21 16:35:10 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, timn/master-preview has been created
        at  c175651ea123c577bedd3e35bb2dc360de7f4466 (commit)

http://git.fawkesrobotics.org/fawkes.git/timn/master-preview

- *Log* ---------------------------------------------------------------
commit 6ee025107fa9e3bc813db5388f20e0e2c9e9e507
Merge: 5880711 4de7cf7
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Dec 21 16:13:59 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:13:59 2016 +0100

    Merge remote-tracking branch 'origin/bschaepers/doc'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 21907b1259e6497b57df8a858817aceba2f4965e
Merge: 6ee0251 71ba39c
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Dec 21 16:16:19 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:16:19 2016 +0100

    Merge remote-tracking branch 'origin/bschaepers/protoc-3-compatibility'

http://git.fawkesrobotics.org/fawkes.git/commit/21907b1
http://trac.fawkesrobotics.org/changeset/21907b1

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 40b2e90d23d459a92fc670ef70692bd014218a1f
Merge: 21907b1 fdb1ccb
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Dec 21 16:16:46 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:16:46 2016 +0100

    Merge remote-tracking branch 'origin/fzwilling/gazebo7-fps-issue-fix'

http://git.fawkesrobotics.org/fawkes.git/commit/40b2e90
http://trac.fawkesrobotics.org/changeset/40b2e90

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit c8ea4744359fe726ad3ef5d6e9a38d84b9c9b1ad
Merge: 40b2e90 da38819
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Dec 21 16:16:57 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:16:57 2016 +0100

    Merge remote-tracking branch 'origin/fzwilling/generic-goto'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 3aa208b7bdf2415269872ed9107843bc2c90106b
Merge: c8ea474 f94a1fe
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Dec 21 16:22:47 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:22:47 2016 +0100

    Merge remote-tracking branch 'origin/fzwilling/jaco-better-error-message'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 7ac1a5f73d4036aba0c54a8fc832314ff0614a64
Merge: 3aa208b 5d0e249
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Dec 21 16:25:43 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:25:43 2016 +0100

    Merge remote-tracking branch 'origin/thofmann/gtest-check-libs-exist'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit c8db401bc6c20e07eccb2c776e00d65aa61acbcf
Merge: 7ac1a5f 05ed774
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Dec 21 16:25:50 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:25:50 2016 +0100

    Merge remote-tracking branch 'origin/thofmann/openssl110'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit d9a15ff0314d6e855243b2ef0b301260e7f9a289
Merge: c8db401 46f1e25
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Dec 21 16:26:05 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:26:05 2016 +0100

    Merge remote-tracking branch 'origin/timn/blackboard-packed-interfaces'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 34cd20dc741f50d180637ac3fa9e9bf824b4a847
Merge: d9a15ff ae6f9ea
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Dec 21 16:26:10 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:26:10 2016 +0100

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

http://git.fawkesrobotics.org/fawkes.git/commit/34cd20d
http://trac.fawkesrobotics.org/changeset/34cd20d

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit cbb1725f3ae546e8b20e92ba666d32133ba5301e
Merge: 34cd20d 993f1e4
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Dec 21 16:26:18 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:26:18 2016 +0100

    Merge remote-tracking branch 'origin/timn/netcomm-ipv6'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 5be4f629d160831d5c191a0fc6ac5a2e28c1779f
Merge: cbb1725 28217e5
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Dec 21 16:26:34 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:26:34 2016 +0100

    Merge remote-tracking branch 'origin/timn/webview-access-log-format'

http://git.fawkesrobotics.org/fawkes.git/commit/5be4f62
http://trac.fawkesrobotics.org/changeset/5be4f62

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit c175651ea123c577bedd3e35bb2dc360de7f4466
Merge: 5be4f62 31b65ac
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Dec 21 16:27:25 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:27:25 2016 +0100

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

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

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


- *Summary* -----------------------------------------------------------
 cfg/conf.d/network.yaml                            |   29 +
 cfg/config.yaml                                    |    9 +-
 etc/buildsys/gtest.mk                              |   16 +-
 res/guis/skillgui/skillgui.ui                      |    3 +-
 src/libs/Makefile                                  |    2 +-
 src/libs/baseapp/run.cpp                           |   41 +-
 src/libs/config/yaml.cpp                           |   49 +-
 src/libs/fvutils/readers/png.cpp                   |    8 +-
 src/libs/gui_utils/Makefile                        |    2 +-
 src/libs/gui_utils/avahi_dispatcher.cpp            |    1 +
 src/libs/gui_utils/avahi_dispatcher.h              |    1 +
 src/libs/gui_utils/service_chooser_dialog.cpp      |  103 +-
 src/libs/gui_utils/service_chooser_dialog.h        |    4 +-
 src/libs/gui_utils/service_model.cpp               |   63 +-
 src/libs/gui_utils/service_model.h                 |   32 +-
 src/libs/interfaces/generator/cpp_generator.cpp    |    6 +-
 src/libs/interfaces/generator/digest.cpp           |   15 +-
 src/libs/netcomm/crypto/decrypt.cpp                |   12 +-
 src/libs/netcomm/crypto/encrypt.cpp                |   20 +-
 src/libs/netcomm/dns-sd/avahi_resolver_handler.cpp |    4 +-
 src/libs/netcomm/dns-sd/avahi_resolver_handler.h   |   10 +-
 src/libs/netcomm/dns-sd/avahi_thread.cpp           |  234 +++-
 src/libs/netcomm/dns-sd/avahi_thread.h             |   23 +-
 src/libs/netcomm/fawkes/client.cpp                 |  112 +-
 src/libs/netcomm/fawkes/client.h                   |   19 +-
 src/libs/netcomm/fawkes/network_manager.cpp        |   20 +-
 src/libs/netcomm/fawkes/network_manager.h          |   10 +-
 src/libs/netcomm/fawkes/server_thread.cpp          |   48 +-
 src/libs/netcomm/fawkes/server_thread.h            |   11 +-
 .../netcomm/service_discovery/browse_handler.h     |    2 +
 src/libs/netcomm/service_discovery/service.cpp     |   53 +-
 src/libs/netcomm/service_discovery/service.h       |    3 +-
 src/libs/netcomm/socket/datagram.cpp               |    5 +-
 src/libs/netcomm/socket/datagram.h                 |    2 +-
 src/libs/netcomm/socket/datagram_broadcast.cpp     |   10 +-
 src/libs/netcomm/socket/datagram_broadcast.h       |    2 +-
 src/libs/netcomm/socket/datagram_multicast.cpp     |   16 +-
 src/libs/netcomm/socket/datagram_multicast.h       |    5 +-
 src/libs/netcomm/socket/socket.cpp                 |  452 ++++++--
 src/libs/netcomm/socket/socket.h                   |   39 +-
 src/libs/netcomm/socket/stream.cpp                 |   25 +-
 src/libs/netcomm/socket/stream.h                   |    3 +-
 src/libs/netcomm/utils/acceptor_thread.cpp         |   34 +
 src/libs/netcomm/utils/acceptor_thread.h           |   16 +-
 src/libs/netcomm/utils/addr_comp.h                 |   74 ++
 .../pointcloud.h => netcomm/utils/addr_size.h}     |   46 +-
 src/libs/netcomm/utils/resolver.cpp                |   43 +-
 src/libs/netcomm/utils/resolver.h                  |   33 +-
 src/libs/netcomm/utils/resolver_thread.cpp         |  114 +--
 src/libs/netcomm/utils/resolver_thread.h           |   30 +-
 src/libs/netcomm/worldinfo/defs.h                  |   34 -
 src/libs/netcomm/worldinfo/handler.cpp             |  153 ---
 src/libs/netcomm/worldinfo/handler.h               |   84 --
 src/libs/netcomm/worldinfo/messages.h              |  256 ----
 src/libs/netcomm/worldinfo/transceiver.cpp         | 1239 --------------------
 src/libs/netcomm/worldinfo/transceiver.h           |  220 ----
 src/libs/protobuf_clips/communicator.cpp           |    6 +-
 src/libs/protobuf_clips/communicator.h             |    3 -
 src/libs/protobuf_comm/crypto.cpp                  |   24 +-
 src/libs/utils/system/argparser.cpp                |  138 ++-
 src/libs/utils/system/argparser.h                  |    4 +
 src/libs/webview/access_log.cpp                    |    2 +-
 src/libs/webview/server.cpp                        |   38 +-
 src/libs/webview/server.h                          |    7 +-
 src/lua/skills/generic/goto.lua                    |  169 ++--
 src/lua/skills/generic/relgoto.lua                 |  184 +--
 src/plugins/Makefile                               |    2 +-
 src/plugins/clips-protobuf/clips/protobuf.clp      |    3 +-
 .../gazsim_vis_localization_thread.cpp             |   10 +-
 src/plugins/gazebo/msgs/Float.proto                |    1 +
 src/plugins/gazebo/msgs/LightSignalDetection.proto |    4 +-
 src/plugins/gazebo/msgs/SimTime.proto              |    4 +-
 src/plugins/jaco/arm_kindrv.cpp                    |    7 +-
 .../refboxcomm/processor}/enums.cpp                |    2 +-
 .../refboxcomm/processor}/enums.h                  |    4 +-
 src/plugins/refboxcomm/processor/msl2010.cpp       |    2 +-
 src/plugins/refboxcomm/processor/spl.cpp           |    2 +-
 src/plugins/refboxcomm/processor/spl.h             |    2 +-
 src/plugins/refboxcomm/processor/state_handler.h   |    2 +-
 src/plugins/ttmainloop/thread.cpp                  |    2 +-
 src/plugins/webview/service_browse_handler.cpp     |    1 +
 src/plugins/webview/service_browse_handler.h       |    1 +
 src/plugins/webview/webview_thread.cpp             |   23 +-
 src/plugins/webview/webview_thread.h               |    2 +
 src/plugins/worldmodel/Makefile                    |   46 -
 src/plugins/worldmodel/fusers/fuser.cpp            |   47 -
 src/plugins/worldmodel/fusers/fuser.h              |   35 -
 src/plugins/worldmodel/fusers/multi_copy.cpp       |  165 ---
 src/plugins/worldmodel/fusers/multi_copy.h         |   63 -
 src/plugins/worldmodel/fusers/objpos_average.cpp   |  293 -----
 src/plugins/worldmodel/fusers/objpos_average.h     |   67 --
 src/plugins/worldmodel/fusers/objpos_majority.cpp  |  534 ---------
 src/plugins/worldmodel/fusers/objpos_majority.h    |  128 --
 src/plugins/worldmodel/fusers/qa/Makefile          |   29 -
 .../worldmodel/fusers/qa/qa_objpos_majority.cpp    |  330 ------
 src/plugins/worldmodel/fusers/single_copy.cpp      |   74 --
 src/plugins/worldmodel/fusers/single_copy.h        |   49 -
 src/plugins/worldmodel/net_thread.cpp              |  491 --------
 src/plugins/worldmodel/net_thread.h                |  134 ---
 src/plugins/worldmodel/wm_thread.cpp               |  285 -----
 src/plugins/worldmodel/wm_thread.h                 |   82 --
 src/plugins/worldmodel/worldmodel_plugin.cpp       |   50 -
 src/plugins/worldmodel/worldmodel_plugin.h         |   34 -
 src/tools/Makefile                                 |    2 +-
 src/tools/battery_monitor/battery_monitor.cpp      |    1 +
 src/tools/battery_monitor/battery_monitor.h        |    1 +
 src/tools/netloggui/netloggui.cpp                  |    6 +-
 src/tools/plugin/main.cpp                          |    2 +-
 src/tools/refboxrep/Makefile                       |   35 -
 src/tools/refboxrep/ffrefboxrep.txt                |   93 --
 src/tools/refboxrep/main.cpp                       |  184 ---
 src/tools/refboxrep/msl2007.cpp                    |  257 ----
 src/tools/refboxrep/msl2007.h                      |   59 -
 src/tools/refboxrep/msl2008.cpp                    |  361 ------
 src/tools/refboxrep/msl2008.h                      |   72 --
 src/tools/refboxrep/msl2010.cpp                    |  401 -------
 src/tools/refboxrep/msl2010.h                      |   78 --
 src/tools/refboxrep/refbox_state_sender.cpp        |  257 ----
 src/tools/refboxrep/refbox_state_sender.h          |   94 --
 src/tools/refboxrep/refbox_state_writer.cpp        |  322 -----
 src/tools/refboxrep/refbox_state_writer.h          |   69 --
 src/tools/refboxrep/spl.cpp                        |  173 ---
 src/tools/refboxrep/spl.h                          |   95 --
 src/tools/vision/net.cpp                           |    1 +
 124 files changed, 1636 insertions(+), 8412 deletions(-)
 create mode 100644 cfg/conf.d/network.yaml
 create mode 100644 src/libs/netcomm/utils/addr_comp.h
 copy src/libs/{aspect/pointcloud.h => netcomm/utils/addr_size.h} (61%)
 delete mode 100644 src/libs/netcomm/worldinfo/defs.h
 delete mode 100644 src/libs/netcomm/worldinfo/handler.cpp
 delete mode 100644 src/libs/netcomm/worldinfo/handler.h
 delete mode 100644 src/libs/netcomm/worldinfo/messages.h
 delete mode 100644 src/libs/netcomm/worldinfo/transceiver.cpp
 delete mode 100644 src/libs/netcomm/worldinfo/transceiver.h
 rename src/{libs/netcomm/worldinfo => plugins/refboxcomm/processor}/enums.cpp (99%)
 rename src/{libs/netcomm/worldinfo => plugins/refboxcomm/processor}/enums.h (98%)
 delete mode 100644 src/plugins/worldmodel/Makefile
 delete mode 100644 src/plugins/worldmodel/fusers/fuser.cpp
 delete mode 100644 src/plugins/worldmodel/fusers/fuser.h
 delete mode 100644 src/plugins/worldmodel/fusers/multi_copy.cpp
 delete mode 100644 src/plugins/worldmodel/fusers/multi_copy.h
 delete mode 100644 src/plugins/worldmodel/fusers/objpos_average.cpp
 delete mode 100644 src/plugins/worldmodel/fusers/objpos_average.h
 delete mode 100644 src/plugins/worldmodel/fusers/objpos_majority.cpp
 delete mode 100644 src/plugins/worldmodel/fusers/objpos_majority.h
 delete mode 100644 src/plugins/worldmodel/fusers/qa/Makefile
 delete mode 100644 src/plugins/worldmodel/fusers/qa/qa_objpos_majority.cpp
 delete mode 100644 src/plugins/worldmodel/fusers/single_copy.cpp
 delete mode 100644 src/plugins/worldmodel/fusers/single_copy.h
 delete mode 100644 src/plugins/worldmodel/net_thread.cpp
 delete mode 100644 src/plugins/worldmodel/net_thread.h
 delete mode 100644 src/plugins/worldmodel/wm_thread.cpp
 delete mode 100644 src/plugins/worldmodel/wm_thread.h
 delete mode 100644 src/plugins/worldmodel/worldmodel_plugin.cpp
 delete mode 100644 src/plugins/worldmodel/worldmodel_plugin.h
 delete mode 100644 src/tools/refboxrep/Makefile
 delete mode 100644 src/tools/refboxrep/ffrefboxrep.txt
 delete mode 100644 src/tools/refboxrep/main.cpp
 delete mode 100644 src/tools/refboxrep/msl2007.cpp
 delete mode 100644 src/tools/refboxrep/msl2007.h
 delete mode 100644 src/tools/refboxrep/msl2008.cpp
 delete mode 100644 src/tools/refboxrep/msl2008.h
 delete mode 100644 src/tools/refboxrep/msl2010.cpp
 delete mode 100644 src/tools/refboxrep/msl2010.h
 delete mode 100644 src/tools/refboxrep/refbox_state_sender.cpp
 delete mode 100644 src/tools/refboxrep/refbox_state_sender.h
 delete mode 100644 src/tools/refboxrep/refbox_state_writer.cpp
 delete mode 100644 src/tools/refboxrep/refbox_state_writer.h
 delete mode 100644 src/tools/refboxrep/spl.cpp
 delete mode 100644 src/tools/refboxrep/spl.h


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

- *commit* 6ee025107fa9e3bc813db5388f20e0e2c9e9e507 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Dec 21 16:13:59 2016 +0100
Subject: Merge remote-tracking branch 'origin/bschaepers/doc'

 src/libs/core/threading/thread.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

_Diff for modified files_:

- *commit* 21907b1259e6497b57df8a858817aceba2f4965e - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Dec 21 16:16:19 2016 +0100
Subject: Merge remote-tracking branch 'origin/bschaepers/protoc-3-compatibility'

 src/plugins/gazebo/msgs/Float.proto                |    1 +
 src/plugins/gazebo/msgs/LightSignalDetection.proto |    4 ++--
 src/plugins/gazebo/msgs/SimTime.proto              |    4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

_Diff for modified files_:

- *commit* 40b2e90d23d459a92fc670ef70692bd014218a1f - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Dec 21 16:16:46 2016 +0100
Subject: Merge remote-tracking branch 'origin/fzwilling/gazebo7-fps-issue-fix'

 .../gazsim_vis_localization_thread.cpp             |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

_Diff for modified files_:

- *commit* c8ea4744359fe726ad3ef5d6e9a38d84b9c9b1ad - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Dec 21 16:16:57 2016 +0100
Subject: Merge remote-tracking branch 'origin/fzwilling/generic-goto'

 src/lua/skills/generic/goto.lua    |  169 ++++++++++++++++-----------------
 src/lua/skills/generic/relgoto.lua |  184 +++++++++++-------------------------
 2 files changed, 135 insertions(+), 218 deletions(-)

_Diff for modified files_:

- *commit* 3aa208b7bdf2415269872ed9107843bc2c90106b - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Dec 21 16:22:47 2016 +0100
Subject: Merge remote-tracking branch 'origin/fzwilling/jaco-better-error-message'

 src/plugins/jaco/arm_kindrv.cpp |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

_Diff for modified files_:

- *commit* 7ac1a5f73d4036aba0c54a8fc832314ff0614a64 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Dec 21 16:25:43 2016 +0100
Subject: Merge remote-tracking branch 'origin/thofmann/gtest-check-libs-exist'

 etc/buildsys/gtest.mk |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

_Diff for modified files_:

- *commit* c8db401bc6c20e07eccb2c776e00d65aa61acbcf - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Dec 21 16:25:50 2016 +0100
Subject: Merge remote-tracking branch 'origin/thofmann/openssl110'

 src/libs/interfaces/generator/digest.cpp |   15 ++++++++++-----
 src/libs/netcomm/crypto/decrypt.cpp      |   12 ++++++++----
 src/libs/netcomm/crypto/encrypt.cpp      |   20 ++++++++++++--------
 src/libs/protobuf_comm/crypto.cpp        |   24 ++++++++++++++++--------
 4 files changed, 46 insertions(+), 25 deletions(-)

_Diff for modified files_:

- *commit* d9a15ff0314d6e855243b2ef0b301260e7f9a289 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Dec 21 16:26:05 2016 +0100
Subject: Merge remote-tracking branch 'origin/timn/blackboard-packed-interfaces'

 src/libs/interfaces/generator/cpp_generator.cpp |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

_Diff for modified files_:

- *commit* 34cd20dc741f50d180637ac3fa9e9bf824b4a847 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Dec 21 16:26:10 2016 +0100
Subject: Merge remote-tracking branch 'origin/timn/clips-protobuf-cleanup'

 src/libs/protobuf_clips/communicator.cpp      |    6 ++----
 src/libs/protobuf_clips/communicator.h        |    3 ---
 src/plugins/clips-protobuf/clips/protobuf.clp |    3 ++-
 3 files changed, 4 insertions(+), 8 deletions(-)

_Diff for modified files_:

- *commit* cbb1725f3ae546e8b20e92ba666d32133ba5301e - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Dec 21 16:26:18 2016 +0100
Subject: Merge remote-tracking branch 'origin/timn/netcomm-ipv6'

 cfg/conf.d/network.yaml                            |   29 +
 cfg/config.yaml                                    |    9 +-
 res/guis/skillgui/skillgui.ui                      |    3 +-
 src/libs/Makefile                                  |    2 +-
 src/libs/baseapp/run.cpp                           |   41 +-
 src/libs/config/yaml.cpp                           |   49 +-
 src/libs/gui_utils/Makefile                        |    2 +-
 src/libs/gui_utils/avahi_dispatcher.cpp            |    1 +
 src/libs/gui_utils/avahi_dispatcher.h              |    1 +
 src/libs/gui_utils/service_chooser_dialog.cpp      |  103 +-
 src/libs/gui_utils/service_chooser_dialog.h        |    4 +-
 src/libs/gui_utils/service_model.cpp               |   63 +-
 src/libs/gui_utils/service_model.h                 |   32 +-
 src/libs/netcomm/dns-sd/avahi_resolver_handler.cpp |    4 +-
 src/libs/netcomm/dns-sd/avahi_resolver_handler.h   |   10 +-
 src/libs/netcomm/dns-sd/avahi_thread.cpp           |  234 +++-
 src/libs/netcomm/dns-sd/avahi_thread.h             |   23 +-
 src/libs/netcomm/fawkes/client.cpp                 |  112 +-
 src/libs/netcomm/fawkes/client.h                   |   19 +-
 src/libs/netcomm/fawkes/network_manager.cpp        |   20 +-
 src/libs/netcomm/fawkes/network_manager.h          |   10 +-
 src/libs/netcomm/fawkes/server_thread.cpp          |   48 +-
 src/libs/netcomm/fawkes/server_thread.h            |   11 +-
 .../netcomm/service_discovery/browse_handler.h     |    2 +
 src/libs/netcomm/service_discovery/service.cpp     |   53 +-
 src/libs/netcomm/service_discovery/service.h       |    3 +-
 src/libs/netcomm/socket/datagram.cpp               |    5 +-
 src/libs/netcomm/socket/datagram.h                 |    2 +-
 src/libs/netcomm/socket/datagram_broadcast.cpp     |   10 +-
 src/libs/netcomm/socket/datagram_broadcast.h       |    2 +-
 src/libs/netcomm/socket/datagram_multicast.cpp     |   16 +-
 src/libs/netcomm/socket/datagram_multicast.h       |    5 +-
 src/libs/netcomm/socket/socket.cpp                 |  452 ++++++--
 src/libs/netcomm/socket/socket.h                   |   39 +-
 src/libs/netcomm/socket/stream.cpp                 |   25 +-
 src/libs/netcomm/socket/stream.h                   |    3 +-
 src/libs/netcomm/utils/acceptor_thread.cpp         |   34 +
 src/libs/netcomm/utils/acceptor_thread.h           |   16 +-
 src/libs/netcomm/utils/addr_comp.h                 |   74 ++
 .../pointcloud.h => netcomm/utils/addr_size.h}     |   46 +-
 src/libs/netcomm/utils/resolver.cpp                |   43 +-
 src/libs/netcomm/utils/resolver.h                  |   33 +-
 src/libs/netcomm/utils/resolver_thread.cpp         |  114 +--
 src/libs/netcomm/utils/resolver_thread.h           |   30 +-
 src/libs/netcomm/worldinfo/defs.h                  |   34 -
 src/libs/netcomm/worldinfo/handler.cpp             |  153 ---
 src/libs/netcomm/worldinfo/handler.h               |   84 --
 src/libs/netcomm/worldinfo/messages.h              |  256 ----
 src/libs/netcomm/worldinfo/transceiver.cpp         | 1239 --------------------
 src/libs/netcomm/worldinfo/transceiver.h           |  220 ----
 src/libs/utils/system/argparser.cpp                |  138 ++-
 src/libs/utils/system/argparser.h                  |    4 +
 src/libs/webview/server.cpp                        |   38 +-
 src/libs/webview/server.h                          |    7 +-
 src/plugins/Makefile                               |    2 +-
 .../refboxcomm/processor}/enums.cpp                |    2 +-
 .../refboxcomm/processor}/enums.h                  |    4 +-
 src/plugins/refboxcomm/processor/msl2010.cpp       |    2 +-
 src/plugins/refboxcomm/processor/spl.cpp           |    2 +-
 src/plugins/refboxcomm/processor/spl.h             |    2 +-
 src/plugins/refboxcomm/processor/state_handler.h   |    2 +-
 src/plugins/ttmainloop/thread.cpp                  |    2 +-
 src/plugins/webview/service_browse_handler.cpp     |    1 +
 src/plugins/webview/service_browse_handler.h       |    1 +
 src/plugins/webview/webview_thread.cpp             |   23 +-
 src/plugins/webview/webview_thread.h               |    2 +
 src/plugins/worldmodel/Makefile                    |   46 -
 src/plugins/worldmodel/fusers/fuser.cpp            |   47 -
 src/plugins/worldmodel/fusers/fuser.h              |   35 -
 src/plugins/worldmodel/fusers/multi_copy.cpp       |  165 ---
 src/plugins/worldmodel/fusers/multi_copy.h         |   63 -
 src/plugins/worldmodel/fusers/objpos_average.cpp   |  293 -----
 src/plugins/worldmodel/fusers/objpos_average.h     |   67 --
 src/plugins/worldmodel/fusers/objpos_majority.cpp  |  534 ---------
 src/plugins/worldmodel/fusers/objpos_majority.h    |  128 --
 src/plugins/worldmodel/fusers/qa/Makefile          |   29 -
 .../worldmodel/fusers/qa/qa_objpos_majority.cpp    |  330 ------
 src/plugins/worldmodel/fusers/single_copy.cpp      |   74 --
 src/plugins/worldmodel/fusers/single_copy.h        |   49 -
 src/plugins/worldmodel/net_thread.cpp              |  491 --------
 src/plugins/worldmodel/net_thread.h                |  134 ---
 src/plugins/worldmodel/wm_thread.cpp               |  285 -----
 src/plugins/worldmodel/wm_thread.h                 |   82 --
 src/plugins/worldmodel/worldmodel_plugin.cpp       |   50 -
 src/plugins/worldmodel/worldmodel_plugin.h         |   34 -
 src/tools/Makefile                                 |    2 +-
 src/tools/battery_monitor/battery_monitor.cpp      |    1 +
 src/tools/battery_monitor/battery_monitor.h        |    1 +
 src/tools/netloggui/netloggui.cpp                  |    6 +-
 src/tools/plugin/main.cpp                          |    2 +-
 src/tools/refboxrep/Makefile                       |   35 -
 src/tools/refboxrep/ffrefboxrep.txt                |   93 --
 src/tools/refboxrep/main.cpp                       |  184 ---
 src/tools/refboxrep/msl2007.cpp                    |  257 ----
 src/tools/refboxrep/msl2007.h                      |   59 -
 src/tools/refboxrep/msl2008.cpp                    |  361 ------
 src/tools/refboxrep/msl2008.h                      |   72 --
 src/tools/refboxrep/msl2010.cpp                    |  401 -------
 src/tools/refboxrep/msl2010.h                      |   78 --
 src/tools/refboxrep/refbox_state_sender.cpp        |  257 ----
 src/tools/refboxrep/refbox_state_sender.h          |   94 --
 src/tools/refboxrep/refbox_state_writer.cpp        |  322 -----
 src/tools/refboxrep/refbox_state_writer.h          |   69 --
 src/tools/refboxrep/spl.cpp                        |  173 ---
 src/tools/refboxrep/spl.h                          |   95 --
 src/tools/vision/net.cpp                           |    1 +
 106 files changed, 1413 insertions(+), 8141 deletions(-)

_Diff for modified files_:

- *commit* 5be4f629d160831d5c191a0fc6ac5a2e28c1779f - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Dec 21 16:26:34 2016 +0100
Subject: Merge remote-tracking branch 'origin/timn/webview-access-log-format'

 src/libs/webview/access_log.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

_Diff for modified files_:

- *commit* c175651ea123c577bedd3e35bb2dc360de7f4466 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Dec 21 16:27:25 2016 +0100
Subject: Merge remote-tracking branch 'origin/vmatare/png-better-errors'

 src/libs/fvutils/readers/png.cpp |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

_Diff for modified files_:




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


More information about the fawkes-commits mailing list