Merge branch 'master' into add_x11

Author: poljvd

.gitignore

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

CMakeLists.txt

@@ -19,10 +19,13 @@ message(STATUS "ENABLE_V4L2 = " ${ENABLE_V4L2})
 option(ENABLE_X11 "Enable the X11 grabber" ON)
 message(STATUS "ENABLE_X11 = " ${ENABLE_X11})
 
+option(ENABLE_TINKERFORGE "Enable the TINKERFORGE device" ON)
+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
-configure_file ("${PROJECT_SOURCE_DIR}/HyperionConfig.h.in" "${PROJECT_BINARY_DIR}/HyperionConfig.h")
+configure_file("${PROJECT_SOURCE_DIR}/HyperionConfig.h.in" "${PROJECT_BINARY_DIR}/HyperionConfig.h")
 include_directories("${PROJECT_BINARY_DIR}")
 
 # Add project specific cmake modules (find, etc)
@@ -65,6 +68,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

CompileHowto.txt

@@ -19,8 +19,8 @@ cd "$HYPERION_DIR/build"
 
 # run cmake to generate make files on the rsapberry pi
 cmake ..
-# or if you are not compiling on the raspberry pi and need to disable the Disppmanx grabber
-cmake -DENABLE_DISPMANX=OFF ..
+# or if you are not compiling on the raspberry pi and need to disable the Dispmanx grabber and support for spi devices
+cmake -DENABLE_DISPMANX=OFF -DENABLE_SPIDEV=OFF ..
 
 # run make to build Hyperion
 make

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

bin/hyperion.init.sh

@@ -7,22 +7,27 @@ DAEMON=hyperiond
 DAEMONOPTS="/etc/hyperion.config.json"
 DAEMON_PATH="/usr/bin"
 
-NAME=$DEAMON
+NAME=$DAEMON
 DESC="Hyperion ambilight server"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
-
 case "$1" in
 start)
-	printf "%-50s" "Starting $NAME..."
-	cd $DAEMON_PATH
-	PID=`$DAEMON $DAEMONOPTS > /dev/null 2>&1 & echo $!`
-	#echo "Saving PID" $PID " to " $PIDFILE
-        if [ -z $PID ]; then
-            printf "%s\n" "Fail"
+        if [ $(pgrep -l $NAME |wc -l) = 1 ]
+        then
+                printf  "%-50s\n" "Already running..."
+                exit 1
         else
-            echo $PID > $PIDFILE
-            printf "%s\n" "Ok"
+                printf "%-50s" "Starting $NAME..."
+                cd $DAEMON_PATH
+                PID=`$DAEMON $DAEMONOPTS > /dev/null 2>&1 & echo $!`
+                #echo "Saving PID" $PID " to " $PIDFILE
+                if [ -z $PID ]; then
+                    printf "%s\n" "Fail"
+                else
+                    echo $PID > $PIDFILE
+                    printf "%s\n" "Ok"
+                fi
         fi
 ;;
 status)
@@ -39,24 +44,31 @@ status)
         fi
 ;;
 stop)
-        printf "%-50s" "Stopping $NAME"
-            PID=`cat $PIDFILE`
-            cd $DAEMON_PATH
-        if [ -f $PIDFILE ]; then
-            kill -HUP $PID
-            printf "%s\n" "Ok"
-            rm -f $PIDFILE
+        if [ -f $PIDFILE ]
+        then
+                printf "%-50s" "Stopping $NAME"
+                    PID=`cat $PIDFILE`
+                    cd $DAEMON_PATH
+                if [ -f $PIDFILE ]; then
+                    kill -HUP $PID
+                    printf "%s\n" "Ok"
+                    rm -f $PIDFILE
+                else
+                    printf "%s\n" "pidfile not found"
+                fi
         else
-            printf "%s\n" "pidfile not found"
+                printf "%-50s\n" "No PID file $NAME not running?"
         fi
 ;;
 
 restart)
-  	$0 stop
-  	$0 start
+        $0 stop
+        $0 start
 ;;
 
 *)
         echo "Usage: $0 {status|start|stop|restart}"
         exit 1
 esac
+
+exit 0

config/hyperion_x86.config.json

@@ -14,7 +14,7 @@
 	{
 		"name"       : "MyPi",
 		"type"       : "adalight",
-		"output"     : "/dev/ttyUSB0",
+        "output"     : "/dev/ttyUSB0",
 		"rate"       : 115200,
 		"colorOrder" : "rgb"
 	},
@@ -363,7 +363,7 @@
 	{
 		"paths" : 
 		[
-			"/opt/hyperion/effects"
+			"/home/dincs/projects/hyperion/effects"
 		]
 	},
 

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/getoptPlusPlus/getoptpp.cc

@@ -280,7 +280,6 @@ void PresettableUniquelySwitchable::preset() {
 template<>
 PODParameter<string>::PODParameter(char shortOption, const char *longOption,
 	   const char* description) : CommonParameter<PresettableUniquelySwitchable>(shortOption, longOption, description) {
-   preset();
 }
 
 

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)