JdeRobot · fqez · Dec 18, 2017 · Dec 14, 2017 · Dec 14, 2017 · Dec 14, 2017
diff --git a/Deps/kobuki/CMakeLists.txt b/Deps/kobuki/CMakeLists.txt
diff --git a/Deps/ros/CMakeLists.txt b/Deps/ros/CMakeLists.txt
@@ -1,7 +1,7 @@
 OPTION(ENABLE_ROS "Enable ROS compatibility modules" ON)
 
 if (ENABLE_ROS)
-	find_package(roscpp QUIET)
+	find_package(roscpp REQUIRED)
 
 	if(roscpp_FOUND)
 
@@ -11,18 +11,22 @@ if (ENABLE_ROS)
 
 	    usePython(2)
 	    set (CATKIN_BUILD_BINARY_PACKAGE 1) #doesn't add ROS environment files to package
-	
+
 	    find_package(catkin REQUIRED COMPONENTS
 	      roscpp
 	      std_msgs
 	      cv_bridge
 	      image_transport
 	      nav_msgs
 	      geometry_msgs
-	      kobuki_gazebo
 	    )
 
-		list(APPEND DEPS ros-kinetic-roscpp ros-kinetic-std-msgs ros-kinetic-cv-bridge ros-kinetic-image-transport ros-kinetic-roscpp-core ros-kinetic-rospy ros-kinetic-nav-msgs ros-kinetic-geometry-msgs ros-kinetic-kobuki-gazebo)
+		list(APPEND DEPS ros-kinetic-roscpp ros-kinetic-std-msgs ros-kinetic-cv-bridge ros-kinetic-image-transport ros-kinetic-roscpp-core ros-kinetic-rospy ros-kinetic-nav-msgs ros-kinetic-geometry-msgs )
+
+		ADD_SUBDIRECTORY (${CMAKE_CURRENT_SOURCE_DIR}/Deps/ros/laser)
+		ADD_SUBDIRECTORY (${CMAKE_CURRENT_SOURCE_DIR}/Deps/ros/kobuki-real)
+		ADD_SUBDIRECTORY (${CMAKE_CURRENT_SOURCE_DIR}/Deps/ros/kobuki-sim)
+
 
 	#	list(APPEND DEPS_DEV )
 	else()

diff --git a/Deps/ros/kobuki-real/CMakeLists.txt b/Deps/ros/kobuki-real/CMakeLists.txt
@@ -0,0 +1,20 @@
+
+#[[find_package(catkin QUIET COMPONENTS
+	      kobuki
+	      kobuki_core
+	    )
+
+messge(kobuki_FOUND)
+if(kobuki_FOUND)
+ message("*** kobuki FOUND")
+else(kobuki_FOUND)
+ message("*** kobuki NOT FOUND")
+endif(kobuki_FOUND)
+
+if(kobuki_core_FOUND)
+ message("*** kobuki_core FOUND")
+else(kobuki_core_FOUND)
+ message("*** kobuki_core NOT FOUND")
+endif(kobuki_core_FOUND)
+]]
+list(APPEND DEPS ros-kinetic-kobuki ros-kinetic-kobuki-core)
diff --git a/Deps/ros/kobuki-sim/CMakeLists.txt b/Deps/ros/kobuki-sim/CMakeLists.txt
@@ -0,0 +1,11 @@
+#[[find_package(catkin QUIET COMPONENTS
+	      kobuki_gazebo
+	    )
+
+if(kobuki_gazebo_FOUND)
+ message("*** kobuki_gazebo FOUND")
+else()
+ message("*** kobuki_gazebo NOT FOUND")
+endif()
+]]
+list(APPEND DEPS ros-kinetic-kobuki-gazebo)
diff --git a/Deps/ros/laser/CMakeLists.txt b/Deps/ros/laser/CMakeLists.txt
@@ -0,0 +1,19 @@
+
+#[[find_package(catkin QUIET COMPONENTS
+	      rplidar_ros
+	      urg_node
+	    )
+
+if(rplidar_ros_FOUND)
+ message("*** rplidar FOUND")
+else()
+ message("*** RPLIDAR NOT FOUND")
+endif()
+
+if(urg_node_FOUND)
+ message("*** HOKUYO FOUND")
+else()
+ message("*** HOKUYO NOT FOUND")
+endif()
+]]
+list(APPEND DEPS ros-kinetic-rplidar-ros ros-kinetic-urg-node)
diff --git a/buildpresets.cmake b/buildpresets.cmake
@@ -158,7 +158,6 @@ if (build_drivers)
 		build_component(turtlebot ON)
 	build_component(giraffeServer ON)
 	build_component(kinect2server ON)
-	build_component(kobuki_driver ON)
 	build_component(naoserver ON)
 	build_component(openni1Server ON)
 	build_component(openniServer ON)

diff --git a/cmake/cpack_metainfo/drivers.cmake b/cmake/cpack_metainfo/drivers.cmake
@@ -14,6 +14,12 @@ SET(CPACK_COMPONENT_CAMERASERVER_DESCRIPTION
 "Generic server for RGB cameras. 
  Manual Page http://jderobot.org/index.php/Drivers#cameraserver
  Home page https://jderobot.org")
+
+ SET(CPACK_DEBIAN_CAMERASERVER-PYTHON_PACKAGE_DEPENDS "jderobot-config-python, jderobot-interfaces")
+SET(CPACK_COMPONENT_BASIC-COMPONENT-PYTHON_DESCRIPTION  
+"Example of tool Python
+ Manual Page http://jderobot.org/
+ Home page https://jderobot.org")
 
 SET(CPACK_DEBIAN_EMSENSORDRIVER_PACKAGE_DEPENDS " jderobot-interfaces")
 SET(CPACK_COMPONENT_EMSENSORDRIVER_DESCRIPTION  
@@ -33,12 +39,6 @@ SET(CPACK_COMPONENT_GAZEBOSERVER_DESCRIPTION
  Manual Page http://jderobot.org/index.php/Drivers (sections 3-9)
  Home page https://jderobot.org")
 
-SET(CPACK_DEBIAN_LASER-SERVER_PACKAGE_DEPENDS "jderobot-easyice, jderobot-viewer, jderobot-util, jderobot-interfaces, jderobot-logger, jderobot-ns, jderobot-colorspaces")
-SET(CPACK_COMPONENT_LASER-SERVER_DESCRIPTION  
-"Server for Hokuyo and RPLidar lasers. 
- Manual Page http://jderobot.org/index.php/Drivers#Laser_Server
- Home page https://jderobot.org")
-
 SET(CPACK_DEBIAN_OPENNISERVER_PACKAGE_DEPENDS "jderobot-easyice, jderobot-geometry, jderobot-util, jderobot-interfaces, jderobot-logger, jderobot-ns, jderobot-colorspaces")
 SET(CPACK_COMPONENT_OPENNISERVER_DESCRIPTION  
 "Server for RGBD cameras (ASUS Xtion, Microsoft Kinect, Orbecc, ...) 
@@ -51,12 +51,6 @@ SET(CPACK_COMPONENT_PCLRGBDSERVER_DESCRIPTION
  Manual Page 
  Home page https://jderobot.org")
 
-SET(CPACK_DEBIAN_KOBUKI-DRIVER_PACKAGE_DEPENDS "jderobot-easyice,  jderobot-interfaces, jderobot-colorspaces")
-SET(CPACK_COMPONENT_KOBUKI-DRIVER_DESCRIPTION  
-"Driver for the Yujin Robot Kobuki
- Manual page http://jderobot.org/index.php/Drivers#kobuki_driver
- Home page https://jderobot.org")
-
 SET(CPACK_DEBIAN_MAVLINKSERVER_PACKAGE_DEPENDS "jderobot-easyice,  jderobot-interfaces, jderobot-colorspaces")
 SET(CPACK_COMPONENT_MAVLINKSERVER_DESCRIPTION  
 "Driver for MAVLink based air drones and planes

diff --git a/cmake/cpackit.cmake b/cmake/cpackit.cmake
@@ -64,7 +64,6 @@ SET (CPACK_MONOLITHIC_INSTALL OFF)
 #include(cmake/cpack_metainfo/gazeboserver.cmake)
 #include(cmake/cpack_metainfo/giraffeclient.cmake)
 #include(cmake/cpack_metainfo/kobukiviewer.cmake)
-#include(cmake/cpack_metainfo/laser-server.cmake)
 #include(cmake/cpack_metainfo/namingservice.cmake)
 #include(cmake/cpack_metainfo/navigatorcamera.cmake)
 #include(cmake/cpack_metainfo/openniserver.cmake)

diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh
@@ -65,7 +65,7 @@ sudo apt-get install -y nodejs
 
 sudo apt install -y sophus
 
-sudo apt-get install -y kobukilib ardronelib libgoogle-glog-dev
+sudo apt-get install -y ardronelib libgoogle-glog-dev
 
 
 

diff --git a/scripts/metapackages/jderobot-drivers.info.in b/scripts/metapackages/jderobot-drivers.info.in
@@ -8,7 +8,7 @@ Section: net
 Priority: extra
 Size: 0
 Installed-Size: 0
-Depends: jderobot-ardrone-server, jderobot-cameraserver, jderobot-gazeboserver, jderobot-laser-server, jderobot-mavlinkserver, jderobot-openni1server, jderobot-openniserver, jderobot-pclrgbdserver,jderobot-evicamdriver
+Depends: jderobot-ardrone-server, jderobot-cameraserver, jderobot-gazeboserver, jderobot-mavlinkserver, jderobot-openni1server, jderobot-openniserver, jderobot-pclrgbdserver,jderobot-evicamdriver, jderobot-cameraserver-python 
 Maintainer: Francisco Perez <f.perez475@gmail.com>
 Homepage: http://jderobot.org
 Description: Metapackage that gathers all the drivers of JdeRobot framework.

diff --git a/src/drivers/kobuki_driver/CMakeLists.txt b/src/drivers/kobuki_driver/CMakeLists.txt
diff --git a/src/drivers/kobuki_driver/actuators/motors.cpp b/src/drivers/kobuki_driver/actuators/motors.cpp
diff --git a/src/drivers/kobuki_driver/actuators/motors.h b/src/drivers/kobuki_driver/actuators/motors.h
diff --git a/src/drivers/kobuki_driver/kobuki_driver.cfg b/src/drivers/kobuki_driver/kobuki_driver.cfg
Original file line number	Diff line number	Diff line change
Expand Up		@@ -65,7 +65,7 @@ sudo apt-get install -y nodejs

		sudo apt install -y sophus

		sudo apt-get install -y kobukilib ardronelib libgoogle-glog-dev
		sudo apt-get install -y ardronelib libgoogle-glog-dev



Expand Down