[Fawkes Git] branch/fzwilling/gazsim-pantilt: created (0.5.0-3081-g01105a6)

Frederik Zwilling zwilling at kbsg.rwth-aachen.de
Thu Feb 25 10:18:18 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/gazsim-pantilt has been created
        at  01105a678453dbc06a3abe3ac1f0aea435edaebf (commit)

http://git.fawkesrobotics.org/fawkes.git/fzwilling/gazsim-pantilt

- *Log* ---------------------------------------------------------------
commit 01105a678453dbc06a3abe3ac1f0aea435edaebf
Author:     Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
AuthorDate: Thu Feb 25 10:15:26 2016 +0100
Commit:     Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
CommitDate: Thu Feb 25 10:17:06 2016 +0100

    gazsim-pantilt: simulate pantilt usage, first primitive vesion
    
    This first version just provides the PanTiltInterface and sets it to
    final for any incoming Goto message.

http://git.fawkesrobotics.org/fawkes.git/commit/01105a6
http://trac.fawkesrobotics.org/changeset/01105a6

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


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


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

- *commit* 01105a678453dbc06a3abe3ac1f0aea435edaebf - - - - - - - - - -
Author:  Frederik Zwilling <zwilling at kbsg.rwth-aachen.de>
Date:    Thu Feb 25 10:15:26 2016 +0100
Subject: gazsim-pantilt: simulate pantilt usage, first primitive vesion

 cfg/conf.d/gazsim.yaml                             |    6 +
 src/plugins/Makefile                               |    2 +-
 src/plugins/gazebo/Makefile                        |    3 +-
 .../gazebo-plugin => gazsim-pantilt}/Makefile      |   36 +++---
 .../gazsim_pantilt_plugin.cpp}                     |   38 +++---
 .../gazsim-pantilt/gazsim_pantilt_thread.cpp       |  136 ++++++++++++++++++++
 .../gazsim_pantilt_thread.h}                       |   52 ++++----
 7 files changed, 212 insertions(+), 61 deletions(-)

_Diff for modified files_:
diff --git a/cfg/conf.d/gazsim.yaml b/cfg/conf.d/gazsim.yaml
index 350c5f6..70a741b 100644
--- a/cfg/conf.d/gazsim.yaml
+++ b/cfg/conf.d/gazsim.yaml
@@ -64,6 +64,7 @@ gazsim:
     addresses:  []
     send-ports: []
     recv-ports: []
+    
   visualization:
     location-scripts: "model://label/materials/scripts"
     location-textures: "model://label/materials/textures"
@@ -74,3 +75,8 @@ gazsim:
       update-rate: 5.0 #in Hz
       label-size: 0.3
       label-height: 0.9
+      
+  pantilt:
+    if-name: "PanTilt RX28"
+    cfg-prefix: "/hardware/pantilt/ptus/RX28/"
+    gazebo-joint-name: ""
\ No newline at end of file
diff --git a/src/plugins/Makefile b/src/plugins/Makefile
index caee20b..e45d872 100644
--- a/src/plugins/Makefile
+++ b/src/plugins/Makefile
@@ -42,7 +42,7 @@ clips-navgraph clips-agent clips-protobuf clips-tf: clips
 clips-navgraph navgraph-clusters: navgraph
 clips-webview: clips webview
 clips-ros: clips ros
-gazebo: robotino
+gazebo: robotino pantilt
 skiller: navgraph
 perception: mongodb
 navgraph-generator: navgraph amcl
diff --git a/src/plugins/gazebo/Makefile b/src/plugins/gazebo/Makefile
index 60cc4b4..0521d5f 100644
--- a/src/plugins/gazebo/Makefile
+++ b/src/plugins/gazebo/Makefile
@@ -23,7 +23,8 @@ include $(BASEDIR)/src/plugins/gazebo/protobuf.mk
 PRESUBDIRS = aspect msgs
 
 SUBDIRS = gazsim-robotino gazsim-laser gazsim-localization gazsim-comm \
-	  gazsim-vis-localization gazsim-webcam gazsim-timesource
+	  gazsim-vis-localization gazsim-webcam gazsim-timesource \
+	  gazsim-pantilt
 
 LIBS_gazebo = fawkescore fawkesaspects fawkesgazeboaspect
 OBJS_gazebo = gazebo_plugin.o node_thread.o




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


More information about the fawkes-commits mailing list