From 4ef8ae41b38b5a96f59f470d8f5fdfb04c84da1e Mon Sep 17 00:00:00 2001
From: Arnaud Degroote <arnaud.degroote@isae.fr>
Date: Fri, 31 Jan 2014 16:16:50 +0100
Subject: [PATCH] [wip/morse-pocolibs] Update to 1.2
Changes since 1.1:
==================
``pocolibs`` is now able to export velodyne sensor.
---
morse-pocolibs/Makefile | 14 ++++++++++++--
morse-pocolibs/PLIST | 5 ++++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/morse-pocolibs/Makefile b/morse-pocolibs/Makefile
index 53e9613b..4094932b 100644
--- a/morse-pocolibs/Makefile
+++ b/morse-pocolibs/Makefile
@@ -17,7 +17,7 @@ CMAKE_ARGS+= -DBUILD_YARP2_SUPPORT=OFF
PKG_SUPPORTED_OPTIONS+= viam
-PKG_OPTION_DESCR.outdoor= Enable support for image camera support
+PKG_OPTION_DESCR.viam = Enable support for image camera support
define PKG_OPTION_SET.viam
CMAKE_ARGS+= -DBUILD_POCOLIBS_VIAM_SUPPORT=ON
@@ -27,7 +27,7 @@ define PKG_OPTION_SET.viam
endef
PKG_SUPPORTED_OPTIONS+= stereopixel
-PKG_OPTION_DESCR.outdoor= Enable support for depth camera support
+PKG_OPTION_DESCR.stereopixel = Enable support for depth camera (stereopixel) support
define PKG_OPTION_SET.stereopixel
CMAKE_ARGS+= -DBUILD_POCOLIBS_STEREOPIXEL_SUPPORT=ON
@@ -36,6 +36,16 @@ define PKG_OPTION_SET.stereopixel
include ../../middleware/pocolibs/depend.mk
endef
+PKG_SUPPORTED_OPTIONS+= velodyne
+PKG_OPTION_DESCR.velodyne = Enable support for velodyne support
+
+define PKG_OPTION_SET.velodyne
+ CMAKE_ARGS+= -DBUILD_POCOLIBS_VELODYNE_SUPPORT=ON
+
+ include ../../hardware/velodyne-genom/depend.mk
+ include ../../middleware/pocolibs/depend.mk
+endef
+
include ../../simulation/morse/depend.mk
include ../../mk/robotpkg.mk
diff --git a/morse-pocolibs/PLIST b/morse-pocolibs/PLIST
index 941d253e..09647e01 100644
--- a/morse-pocolibs/PLIST
+++ b/morse-pocolibs/PLIST
@@ -1,4 +1,4 @@
-@comment Fri Mar 1 18:22:15 CET 2013
+@comment Fri Jan 31 12:13:09 CET 2014
${PYTHON_SITELIB}/morse/middleware/pocolibs/__init__.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/__init__.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/genpos.py
@@ -10,6 +10,7 @@ ${PYTHON_SITELIB}/morse/middleware/pocolibs/overlays/fingers.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/overlays/platine_overlay.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/overlays/rflex_overlay.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/overlays/stereopixel_overlay.py
+${PYTHON_SITELIB}/morse/middleware/pocolibs/overlays/velodyne_overlay.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/overlays/viam_overlay.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/__init__.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/human_posture.py
@@ -17,9 +18,11 @@ ${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/platine_posture.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/pom.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/stereopixel.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/target.py
+${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/velodyne.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/viam.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/viman.py
${PLIST.stereopixel}${PYTHON_SITELIB}/morse/middleware/pocolibs/stereopixel.so
+${PLIST.velodyne}${PYTHON_SITELIB}/morse/middleware/pocolibs/velodyne.so
${PLIST.viam}${PYTHON_SITELIB}/morse/middleware/pocolibs/viam.so
${PYTHON_SITELIB}/morse/middleware/pocolibs_datastream.py
${PYTHON_SITELIB}/morse/middleware/pocolibs_request_manager.py
--
GitLab