Merge branch 'master' into add_x11

Author: poljvd

CMakeLists.txt

@@ -13,6 +13,9 @@ message(STATUS "ENABLE_DISPMANX = " ${ENABLE_DISPMANX})
 option(ENABLE_SPIDEV   "Enable the SPIDEV device" ON)
 message(STATUS "ENABLE_SPIDEV   = " ${ENABLE_SPIDEV})
 
+option(ENABLE_WS2812BPWM   "Enable the WS2812b-PWM device" OFF)
+message(STATUS "ENABLE_WS2812BPWM = " ${ENABLE_WS2812BPWM})
+
 option(ENABLE_V4L2 "Enable the V4L2 grabber" ON)
 message(STATUS "ENABLE_V4L2 = " ${ENABLE_V4L2})
 
@@ -22,6 +25,13 @@ message(STATUS "ENABLE_X11 = " ${ENABLE_X11})
 option(ENABLE_TINKERFORGE "Enable the TINKERFORGE device" ON)
 message(STATUS "ENABLE_TINKERFORGE = " ${ENABLE_TINKERFORGE})
 
+option(ENABLE_PROTOBUF "Enable PROTOBUF server" ON)
+message(STATUS "ENABLE_PROTOBUF = " ${ENABLE_PROTOBUF})
+
+if(ENABLE_V4L2 AND NOT ENABLE_PROTOBUF)
+	message(FATAL_ERROR "V4L2 grabber requires PROTOBUF. Disable V4L2 or enable PROTOBUF")
+endif(ENABLE_V4L2 AND NOT ENABLE_PROTOBUF)
+
 # Createt the configuration file
 # configure a header file to pass some of the CMake settings
 # to the source code
@@ -57,12 +67,14 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall")
 # Configure the use of QT4
 find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED QUIET)
 
-# add protocol buffers (make sure to find the static version)
-set(CMAKE_FIND_LIBRARY_SUFFIXES_OLD ${CMAKE_FIND_LIBRARY_SUFFIXES})
-set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-find_package(Protobuf REQUIRED)
-set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_OLD})
-set(CMAKE_FIND_LIBRARY_SUFFIXES_OLD)
+if (ENABLE_PROTOBUF)
+	# add protocol buffers (make sure to find the static version)
+	set(CMAKE_FIND_LIBRARY_SUFFIXES_OLD ${CMAKE_FIND_LIBRARY_SUFFIXES})
+	set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+	find_package(Protobuf REQUIRED)
+	set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_OLD})
+	set(CMAKE_FIND_LIBRARY_SUFFIXES_OLD)
+endif (ENABLE_PROTOBUF)
 
 #add libusb and pthreads
 find_package(libusb-1.0 REQUIRED)

HyperionConfig.h.in

@@ -9,5 +9,11 @@
 // Define to enable the spi-device
 #cmakedefine ENABLE_SPIDEV
 
+// Define to enable the ws2812b-pwm-device
+#cmakedefine ENABLE_WS2812BPWM
+
 // Define to enable the spi-device
 #cmakedefine ENABLE_TINKERFORGE
+
+// Define to enable PROTOBUF server
+#cmakedefine ENABLE_PROTOBUF

bin/install_hyperion.sh

@@ -34,13 +34,13 @@ fi
 echo 'Downloading hyperion'
 if [ $IS_OPENELEC -eq 1 ]; then
 	# OpenELEC has a readonly file system. Use alternative location
-	curl --get https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.tar.gz | tar -C /storage -xz
-	curl --get https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.deps.openelec-rpi.tar.gz | tar -C /storage/hyperion/bin -xz
+	curl -L --get https://raw.githubusercontent.com/tvdzwan/hyperion/master/deploy/hyperion.tar.gz | tar -C /storage -xz
+	curl -L --get https://raw.githubusercontent.com/tvdzwan/hyperion/master/deploy/hyperion.deps.openelec-rpi.tar.gz | tar -C /storage/hyperion/bin -xz
 
 	# modify the default config to have a correct effect path
 	sed -i 's:/opt:/storage:g' /storage/hyperion/config/hyperion.config.json
 else
-	wget https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.tar.gz -O - | tar -C /opt -xz
+	wget https://raw.githubusercontent.com/tvdzwan/hyperion/master/deploy/hyperion.tar.gz -O - | tar -C /opt -xz
 fi
 
 # create links to the binaries
@@ -68,9 +68,9 @@ fi
 if [ $USE_INITCTL -eq 1 ]; then
 	echo 'Installing initctl script'
 	if [ $IS_RASPBMC -eq 1 ]; then
-		wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.conf -P /etc/init/
+		wget -N https://raw.githubusercontent.com/tvdzwan/hyperion/master/deploy/hyperion.conf -P /etc/init/
 	else
-		wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.xbian.conf -O /etc/init/hyperion.conf
+		wget -N https://raw.githubusercontent.com/tvdzwan/hyperion/master/deploy/hyperion.xbian.conf -O /etc/init/hyperion.conf
 	fi
 elif [ $USE_SERVICE -eq 1 ]; then
 	echo 'Installing startup script in init.d'

cmake/Findlibusb-1.0.cmake

@@ -87,6 +87,7 @@ else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
 	  message(STATUS " - Libraries: ${LIBUSB_1_LIBRARIES}")
 	endif (NOT libusb_1_FIND_QUIETLY)
   else (LIBUSB_1_FOUND)
+	unset(LIBUSB_1_LIBRARY CACHE)
 	if (libusb_1_FIND_REQUIRED)
 	  message(FATAL_ERROR "Could not find libusb")
 	endif (libusb_1_FIND_REQUIRED)

cmake/qt4/Qt4ConfigDependentSettings.cmake

@@ -270,6 +270,16 @@ if(Q_WS_X11)
 
 endif()
 
+if(Q_WS_QWS)
+  set(CMAKE_THREAD_PREFER_PTHREADS 1)
+  find_package(Threads)
+  if(CMAKE_USE_PTHREADS_INIT)
+    set(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${CMAKE_THREAD_LIBS_INIT})
+  endif()
+
+  set (QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${CMAKE_DL_LIBS})
+
+endif()
 
 if(Q_WS_WIN)
   set(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} imm32 winmm)

config/hyperion.config.json

@@ -80,7 +80,8 @@
 		{
 			"type"            : "none",
 			"time_ms"         : 200,
-			"updateFrequency" : 20.0000
+			"updateFrequency" : 20.0000,
+			"updateDelay"     : 0
 		}
 	},
 

deploy/hummingboard_prerelease.tar.gz

@@ -4,6 +4,7 @@
 	"args" :
 	{
 		"speed" : 1.0,
-		"fadeFactor" : 0.7
+		"fadeFactor" : 0.7,
+		"color" : [255,0,0]
 	}
 }

deploy/hyperion.tar.gz

@@ -2,9 +2,10 @@
 import time 
 import colorsys
 
-# Get the rotation time
+# Get the parameters
 speed = float(hyperion.args.get('speed', 1.0))
 fadeFactor = float(hyperion.args.get('fadeFactor', 0.7))
+color = hyperion.args.get('color', (255,0,0))
 
 # Check parameters
 speed = max(0.0001, speed)
@@ -13,7 +14,9 @@
 # Initialize the led data
 width = 25
 imageData = bytearray(width * (0,0,0))
-imageData[0] = 255
+imageData[0] = color[0]
+imageData[1] = color[1]
+imageData[2] = color[2]
 
 # Calculate the sleep time and rotation increment
 increment = 1
@@ -41,9 +44,13 @@
 		# Fade the old data
 		for j in range(width):
 			imageData[3*j] = int(fadeFactor * imageData[3*j])
+			imageData[3*j+1] = int(fadeFactor * imageData[3*j+1])
+			imageData[3*j+2] = int(fadeFactor * imageData[3*j+2])
 
 		# Insert new data
-		imageData[3*position] = 255
+		imageData[3*position] = color[0]
+		imageData[3*position+1] = color[1]
+		imageData[3*position+2] = color[2]
 
 	# Sleep for a while
 	time.sleep(sleepTime)