Merge branch 'master' of https://github.com/tvdzwan/hyperion

Former-commit-id: 8f277454a9ddce23fd3d3ca57436283d7a4c3b75

CompileHowto.txt

@@ -1,6 +1,6 @@
 # Install the required tools and dependencies
 sudo apt-get update
-sudo apt-get install git cmake build-essential libprotobuf-dev libQt4-dev libusb-1.0-0-dev protobuf-compiler
+sudo apt-get install git cmake build-essential libprotobuf-dev libQt4-dev libusb-1.0-0-dev protobuf-compiler python-dev
 
 # RPI ONLY: when you build on the rapberry pi and inlcude the dispmanx grabber (which is the default) 
 # you also need the firmware including headers installed. This downloads the firmware from the raspberrypi github

bin/install_hyperion.new.sh

@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# Script for downloading and installing the latest Hyperion release
-
-# Find out if we are on XBian
-IS_XBIAN=`cat /etc/issue | grep XBian | wc -l`
-
-# Make sure that the boblight daemon is no longer running
-BOBLIGHT_PROCNR=$(ps -e | grep "boblight" | wc -l)
-if [ $BOBLIGHT_PROCNR -eq 1 ];
-then
-	echo 'Found running instance of boblight. Please stop boblight via XBMC menu before installing hyperion'
-	exit
-fi
-
-# Stop hyperion daemon if it is running
-/sbin/initctl stop hyperion
-
-# Get and extract the Hyperion binaries and effects to /opt
-wget https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.tar.gz -O - | tar -C /opt -xz
-
-# create links to the binaries
-ln -fs /opt/hyperion/bin/hyperiond /usr/bin/hyperiond
-ln -fs /opt/hyperion/bin/hyperion-remote /usr/bin/hyperion-remote
-
-# create link to the gpio changer (gpio->spi)
-if [ $IS_XBIAN -eq 0 ]; then
-	ln -fs /opt/hyperion/bin/gpio2spi /usr/bin/gpio2spi
-fi
-
-# Copy a link to the hyperion configuration file to /etc
-ln -s /opt/hyperion/config/hyperion.config.json /etc/hyperion.config.json
-
-# Copy the service control configuration to /etc/int
-if [ $IS_XBIAN -eq 0 ]; then
-	wget -N https://raw.github.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
-fi
-
-# Start the hyperion daemon
-/sbin/initctl start hyperion

bin/install_hyperion.sh

@@ -16,28 +16,26 @@ fi
 # Stop hyperion daemon if it is running
 /sbin/initctl stop hyperion
 
-# Get the Hyperion executable
+# Get and extract the Hyperion binaries and effects to /opt
-wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperiond -P /usr/bin/
+wget https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.tar.gz -O - | tar -C /opt -xz
-chmod +x /usr/bin/hyperiond
 
-# Get the Hyperion command line utility
+# create links to the binaries
-wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion-remote -P /usr/bin/
+ln -fs /opt/hyperion/bin/hyperiond /usr/bin/hyperiond
-chmod +x /usr/bin/hyperion-remote
+ln -fs /opt/hyperion/bin/hyperion-remote /usr/bin/hyperion-remote
 
-# Copy the gpio changer (gpio->spi) to the /usr/bin
+# create link to the gpio changer (gpio->spi)
 if [ $IS_XBIAN -eq 0 ]; then
-	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/gpio2spi -P /usr/bin/
+	ln -fs /opt/hyperion/bin/gpio2spi /usr/bin/gpio2spi
-	chmod +x /usr/bin/gpio2spi
 fi
 
-# Copy the hyperion configuration file to /etc
+# Copy a link to the hyperion configuration file to /etc
-wget -N github.com/tvdzwan/hyperion/raw/master/config/hyperion.config.json -P /etc/
+ln -s /opt/hyperion/config/hyperion.config.json /etc/hyperion.config.json
 
 # Copy the service control configuration to /etc/int
 if [ $IS_XBIAN -eq 0 ]; then
-	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion.conf -P /etc/init/
+	wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.conf -P /etc/init/
 else
-	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion.xbian.conf -O /etc/init/hyperion.conf
+	wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.xbian.conf -O /etc/init/hyperion.conf
 fi
 
 # Start the hyperion daemon

bin/update_hyperion.sh

@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# Script for downloading and installing the latest Hyperion release
-
-# Find out if we are on XBian
-IS_XBIAN=`cat /etc/issue | grep XBian | wc -l`
-
-# Make sure that the boblight daemon is no longer running
-BOBLIGHT_PROCNR=$(ps -e | grep "boblight" | wc -l)
-if [ $BOBLIGHT_PROCNR -eq 1 ];
-then
-	echo 'Found running instance of boblight. Please stop boblight via XBMC menu before installing hyperion'
-	exit
-fi
-
-# Stop hyperion daemon if it is running
-/sbin/initctl stop hyperion
-
-# Get the Hyperion executable
-wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperiond -P /usr/bin/
-chmod +x /usr/bin/hyperiond
-
-# Get the Hyperion command line utility
-wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion-remote -P /usr/bin/
-chmod +x /usr/bin/hyperion-remote
-
-# Copy the gpio changer (gpio->spi) to the /usr/bin
-if [ $IS_XBIAN -eq 0 ]; then
-	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/gpio2spi -P /usr/bin/
-	chmod +x /usr/bin/gpio2spi
-fi
-
-# Copy the service control configuration to /etc/int
-if [ $IS_XBIAN -eq 0 ]; then
-	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion.conf -P /etc/init/
-else
-	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion.xbian.conf -P /etc/init/ -O hyperion.conf
-fi
-
-# Start the hyperion daemon
-/sbin/initctl start hyperion

deploy/hyperiond.REMOVED.git-id

@@ -1 +0,0 @@
-cb10b0acda414c8d57cd1cc1bf49c48c142ec6b8

effects/strobe.py

@@ -14,7 +14,7 @@ sleepTime = 1.0 / frequency
 
 # Initialize the led data
 blackLedsData = bytearray(hyperion.ledCount * (  0,  0,  0))
-whiteLedsData = bytearray(hyperion.ledCount * colo)
+whiteLedsData = bytearray(hyperion.ledCount * color)
 
 # Start the write data loop
 while not hyperion.abort():