Merge branch 'Phidgets'

Author: Birger Johansson

Scripts/CMake/FindPHIDGETS.cmake

@@ -0,0 +1,53 @@
+# Ikaros-project.org
+#
+# Find the Phidgets includes and library
+#
+# This module defines
+# PHIDGETS_INCLUDE_DIR
+# PHIDGETS_LIBRARIES
+# PHIDGETS_FOUND
+
+# Checking OS
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+
+find_library(PHIDGETS_LIBRARY Phidget21)
+
+if (PHIDGETS_INCLUDE_DIR1)
+	set(PHIDGETS_INCLUDE_DIR
+	${PHIDGETS_INCLUDE_DIR1}
+	)
+endif (PHIDGETS_INCLUDE_DIR1)
+
+if (PHIDGETS_LIBRARY)
+	set(PHIDGETS_LIBRARIES
+	${PHIDGETS_LIBRARY}
+	)
+
+endif (PHIDGETS_LIBRARY)
+
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	find_path(PHIDGETS_INCLUDE_DIR
+    NAMES
+      phidget21.h
+    PATHS
+		/usr/local/include
+		/usr/include
+  	)
+  	
+	find_library(PHIDGETS_LIBRARIES
+    NAMES
+    	phidget21
+    PATHS
+    	/usr/local/lib
+    	/usr/lib
+	)
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
+if (PHIDGETS_LIBRARIES)
+	message(STATUS "Found Phidget:")
+	message(STATUS " - Includes: ${PHIDGETS_INCLUDE_DIR}")
+	message(STATUS " - Libraries: ${PHIDGETS_LIBRARIES}")
+	set(PHIDGETS_FOUND "YES" )
+endif (PHIDGETS_LIBRARIES)

Source/Modules/IOModules/FileInput/InputVideoFile/CMakeLists.txt

@@ -22,5 +22,9 @@ if(FFMPEG_FOUND)
     ) 
 
 else()
-	MESSAGE( STATUS "FFMpeg is not found. This module is not included into the build." )
+	message( "" )
+	message(STATUS "Ikaros:" )
+	message(STATUS "FFMpeg is not found. This module is not included into the build." )
+	message(STATUS "Visit www.ikaros-project.org for information of module dependencies." )
+	message( "" )
 endif(FFMPEG_FOUND)

Source/Modules/IOModules/Network/YARPPort/CMakeLists.txt

@@ -25,5 +25,9 @@ if(YARP_FOUND AND ACE_FOUND)
     ) 
 
 else()
-	message(STATUS "Ikaros: YARP or ACE is not found. YARPPort module is not included into the build." )
+	message( "" )
+	message(STATUS "Ikaros:" )
+	message(STATUS "YARP or ACE is not found. YARPPort module is not included into the build." )
+	message(STATUS "Visit www.ikaros-project.org for information of module dependencies." )
+	message( "" )
 endif(YARP_FOUND AND ACE_FOUND)

Source/Modules/RobotModules/CMakeLists.txt

@@ -3,6 +3,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_subdirectory(Dynamixel)
 add_subdirectory(Epuck)
 add_subdirectory(SSC32)
+add_subdirectory(Phidgets)
 
 set(SOURCE ${SOURCE} PARENT_SCOPE)
 set(MODULES_INCLUDS ${MODULES_INCLUDS} PARENT_SCOPE)

Source/Modules/RobotModules/Phidgets/CMakeLists.txt

@@ -0,0 +1,33 @@
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+
+# Phidgets
+find_package(PHIDGETS)
+
+# if all libraries found add source file, include dirs and libraries
+if(PHIDGETS_FOUND)
+
+	set(SOURCE
+	${SOURCE}
+	${CMAKE_CURRENT_SOURCE_DIR}/Phidgets.cc
+	PARENT_SCOPE
+	)
+
+	set(MODULES_INCLUDS
+	${MODULES_INCLUDS}
+	${PHIDGETS_INCLUDE_DIRS}
+	PARENT_SCOPE
+   	)
+   	set(MODULES_LIBS
+	${MODULES_LIBS}
+	${PHIDGETS_LIBRARIES}
+	PARENT_SCOPE
+    ) 
+
+else()
+	message(STATUS "" )
+	message(STATUS "Ikaros" )
+	message(STATUS "Phidgets libs not found. Phidgets module is not included into the build." )
+	message(STATUS "Visit www.ikaros-project.org for information of module dependencies." )
+	message(STATUS "" )
+endif(PHIDGETS_FOUND)

Source/Modules/RobotModules/Phidgets/Examples/Phidgets_test.ikc

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<group title="Phidgets Example">
+	
+
+		<module
+			class = "Phidgets"
+			name = "PhidgetsInstance"
+			serial  = "172795"
+			info  = "true"
+            sensitivify = "0" 
+            ratiometric = "true"
+    
+		/>
+		
+
+		<view name="View">
+			<object class="BarGraph" module="PhidgetsInstance" source="ANALOG_OUTPUTS" x="0" y="0" />
+			<object class="BarGraph" module="PhidgetsInstance" source="DIGITAL_OUTPUTS" x="1" y="0" />
+            <object class="BarGraph" module="PhidgetsInstance" source="ATTACHED" x="0" y="1" />
+		</view>
+
+</group>
+