Merge branch 'bbilger-master'

Author: tvdzwan

.gitignore

@@ -1,3 +1,5 @@
 /*.user
 /build
 /build-x86
+.DS_Store
+

CMakeLists.txt

@@ -16,6 +16,9 @@ message(STATUS "ENABLE_SPIDEV = " ${ENABLE_SPIDEV})
 option(ENABLE_V4L2 "Enable the V4L2 grabber" ON)
 message(STATUS "ENABLE_V4L2 = " ${ENABLE_V4L2})
 
+option(ENABLE_TINKERFORGE "Enable the TINKERFORGE device" OFF)
+message(STATUS "ENABLE_TINKERFORGE = " ${ENABLE_TINKERFORGE})
+
 # Createt the configuration file
 # configure a header file to pass some of the CMake settings
 # to the source code
@@ -62,6 +65,10 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES_OLD)
 find_package(libusb-1.0 REQUIRED)
 find_package(Threads REQUIRED)
 
+if (ENABLE_TINKERFORGE)
+	#find_package(libtinkerforge-1.0 REQUIRED)
+endif (ENABLE_TINKERFORGE)
+
 include(${QT_USE_FILE})
 add_definitions(${QT_DEFINITIONS})
 # TODO[TvdZ]: This linking directory should only be added if we are cross compiling

HyperionConfig.h.in

@@ -8,3 +8,6 @@
 
 // Define to enable the spi-device
 #cmakedefine ENABLE_SPIDEV
+
+// Define to enable the spi-device
+#cmakedefine ENABLE_TINKERFORGE

dependencies/build/CMakeLists.txt

@@ -1,5 +1,6 @@
 
-add_subdirectory(jsoncpp)
 add_subdirectory(getoptPlusPlus)
-add_subdirectory(serial)
 add_subdirectory(hidapi)
+add_subdirectory(jsoncpp)
+add_subdirectory(serial)
+add_subdirectory(tinkerforge)

dependencies/build/tinkerforge/CMakeLists.txt

@@ -0,0 +1,14 @@
+project(tinkerforge)
+
+# define the current source/header path
+set(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/dependencies/include/tinkerforge)
+set(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/dependencies/build/tinkerforge)
+
+include_directories(${CURRENT_HEADER_DIR})
+
+add_library(tinkerforge
+		${CURRENT_HEADER_DIR}/bricklet_led_strip.h
+		${CURRENT_HEADER_DIR}/ip_connection.h
+
+		${CURRENT_SOURCE_DIR}/bricklet_led_strip.c
+		${CURRENT_SOURCE_DIR}/ip_connection.c)