From fc59df9976bc62270eee427e1b5e68e3ee41ba24 Mon Sep 17 00:00:00 2001 From: brindosch Date: Tue, 26 Apr 2016 12:27:59 +0200 Subject: [PATCH] preperation for next release and cleanup Former-commit-id: dc829ea7671584d4aaf982cadba329998a824593 --- ISSUE_TEMPLATE | 13 +- PULL_REQUEST_TEMPLATE | 2 + README.md | 6 +- bin/create_all_releases.sh | 10 +- bin/install_hyperion.sh | 117 ++--- bin/remove_hyperion.sh | 25 +- bin/scripts/install_hyperion_beta.sh | 288 +++++++++++ bin/service/hyperion.init.sh | 2 +- bin/service/hyperion.initctl.sh | 2 +- bin/service/hyperion.systemd.sh | 2 +- config/hyperion.config.json | 133 +++-- config/hyperion_x86.config.json | 453 ------------------ ...mingboard_prerelease.tar.gz.REMOVED.git-id | 1 - ...n.deps.openelec-imx6.tar.gz.REMOVED.git-id | 1 - ...on.deps.openelec-rpi.tar.gz.REMOVED.git-id | 1 - ...deps.openelec-x32x64.tar.gz.REMOVED.git-id | 1 - deploy/hyperion_imx6.tar.gz.REMOVED.git-id | 1 - deploy/hyperion_rpi.tar.gz.REMOVED.git-id | 1 - deploy/hyperion_wetek.tar.gz.REMOVED.git-id | 1 - deploy/hyperion_x32x64.tar.gz.REMOVED.git-id | 1 - doc/calibration/Gamma/000000.png | Bin 6159 -> 0 bytes doc/calibration/Gamma/3F3F3F.png | Bin 10670 -> 0 bytes doc/calibration/Gamma/7F7F7F.png | Bin 10669 -> 0 bytes doc/calibration/Gamma/BFBFBF.png | Bin 10670 -> 0 bytes doc/calibration/Gamma/FFFFFF.png | Bin 8642 -> 0 bytes doc/calibration/Gamma/HGradient_1.png | Bin 10866 -> 0 bytes doc/calibration/Gamma/HGradient_2.png | Bin 10862 -> 0 bytes doc/calibration/Gamma/VGradient_1.png | Bin 12174 -> 0 bytes doc/calibration/Gamma/VGradient_2.png | Bin 12032 -> 0 bytes doc/calibration/RGB/blue_00007F.png | Bin 10668 -> 0 bytes doc/calibration/RGB/blue_0000FF.png | Bin 8642 -> 0 bytes doc/calibration/RGB/cyan_007F7F.png | Bin 10668 -> 0 bytes doc/calibration/RGB/cyan_00FFFF.png | Bin 8642 -> 0 bytes doc/calibration/RGB/green_007F00.png | Bin 10668 -> 0 bytes doc/calibration/RGB/green_00FF00.png | Bin 8641 -> 0 bytes doc/calibration/RGB/magenta_7F007F.png | Bin 10668 -> 0 bytes doc/calibration/RGB/magenta_FF00FF.png | Bin 8642 -> 0 bytes doc/calibration/RGB/red_7F0000.png | Bin 10668 -> 0 bytes doc/calibration/RGB/red_FF0000.png | Bin 8641 -> 0 bytes doc/calibration/RGB/yellow_7F7F00.png | Bin 10668 -> 0 bytes doc/calibration/RGB/yellow_FFFF00.png | Bin 7964 -> 0 bytes 41 files changed, 438 insertions(+), 623 deletions(-) create mode 100644 bin/scripts/install_hyperion_beta.sh delete mode 100644 config/hyperion_x86.config.json delete mode 100644 deploy/hummingboard_prerelease.tar.gz.REMOVED.git-id delete mode 100644 deploy/hyperion.deps.openelec-imx6.tar.gz.REMOVED.git-id delete mode 100644 deploy/hyperion.deps.openelec-rpi.tar.gz.REMOVED.git-id delete mode 100644 deploy/hyperion.deps.openelec-x32x64.tar.gz.REMOVED.git-id delete mode 100644 deploy/hyperion_imx6.tar.gz.REMOVED.git-id delete mode 100644 deploy/hyperion_rpi.tar.gz.REMOVED.git-id delete mode 100644 deploy/hyperion_wetek.tar.gz.REMOVED.git-id delete mode 100644 deploy/hyperion_x32x64.tar.gz.REMOVED.git-id delete mode 100644 doc/calibration/Gamma/000000.png delete mode 100644 doc/calibration/Gamma/3F3F3F.png delete mode 100644 doc/calibration/Gamma/7F7F7F.png delete mode 100644 doc/calibration/Gamma/BFBFBF.png delete mode 100644 doc/calibration/Gamma/FFFFFF.png delete mode 100644 doc/calibration/Gamma/HGradient_1.png delete mode 100644 doc/calibration/Gamma/HGradient_2.png delete mode 100644 doc/calibration/Gamma/VGradient_1.png delete mode 100644 doc/calibration/Gamma/VGradient_2.png delete mode 100644 doc/calibration/RGB/blue_00007F.png delete mode 100644 doc/calibration/RGB/blue_0000FF.png delete mode 100644 doc/calibration/RGB/cyan_007F7F.png delete mode 100644 doc/calibration/RGB/cyan_00FFFF.png delete mode 100644 doc/calibration/RGB/green_007F00.png delete mode 100644 doc/calibration/RGB/green_00FF00.png delete mode 100644 doc/calibration/RGB/magenta_7F007F.png delete mode 100644 doc/calibration/RGB/magenta_FF00FF.png delete mode 100644 doc/calibration/RGB/red_7F0000.png delete mode 100644 doc/calibration/RGB/red_FF0000.png delete mode 100644 doc/calibration/RGB/yellow_7F7F00.png delete mode 100644 doc/calibration/RGB/yellow_FFFF00.png diff --git a/ISSUE_TEMPLATE b/ISSUE_TEMPLATE index e8f12f0a..b43a2f97 100644 --- a/ISSUE_TEMPLATE +++ b/ISSUE_TEMPLATE @@ -1,8 +1,9 @@ -**Please provide some information that we could help as fast as possible. -Please check the wiki in case your problem is already known/feature requested.** +BEFORE YOU OPEN A NEW ISSUE! -**1.** Used hardware and sofware (Wetek,RPi1,Rpi2,... Ubuntu 14.04(64bit),OSX,OpenELEC,OSMC,XBian,...) -**2.** Your LED device and additional hardware (if used) (WS2801,APA102,WS2812B,... connected through (direct,arduino uno,...)) -**3.** Please upload your Hyperion log to pastebin.com and insert the link. Have a look at the wiki how you get one. -**4.** Please upload your "Hyperion Configuration File" to pastebin.com and insert the link. +Search at our wiki: wiki.hyperion-project.org +Our FAQ: https://hyperion-project.org/wiki/FAQ-Frequently-Asked-Questions +And have a look at our forum: forum.hyperion-project.org +If you need help please open a new thread their! +WE PROVIDE NO SUPPORT AT GITHUB! +All misleading issues will be closed without a announcement! diff --git a/PULL_REQUEST_TEMPLATE b/PULL_REQUEST_TEMPLATE index 747a065c..8e947083 100644 --- a/PULL_REQUEST_TEMPLATE +++ b/PULL_REQUEST_TEMPLATE @@ -3,3 +3,5 @@ IMPORTANT: Please don´t commit to master, we will test your changes first at th **2.** If this changes affect the .conf file. Please provide the changed section **3.** Reference a issue (optional) +Note: For further discussions use our forum: forum.hyperion-project.org + diff --git a/README.md b/README.md index 0e1a5cb7..e8ead57c 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ HYPERION ======== -Hyperion is an opensource 'AmbiLight' implementation controlled using the RaspBerry Pi running [Raspbmc](http://www.raspbmc.com). The main features of Hyperion are: +Hyperion is an opensource 'AmbiLight' implementation supported by many devices. The main features of Hyperion are: * Low CPU load. For a led string of 50 leds the CPU usage will typically be below 1.5% on a non-overclocked Pi. * Json interface which allows easy integration into scripts. * A command line utility allows easy testing and configuration of the color transforms (Transformation settings are not preserved over a restart at the moment...). * Priority channels are not coupled to a specific led data provider which means that a provider can post led data and leave without the need to maintain a connection to Hyperion. This is ideal for a remote application (like our Android app). * HyperCon. A tool which helps generate a Hyperion configuration file. -* XBMC-checker which checks the playing status of XBMC and decides whether or not to capture the screen. +* Kodi-checker which checks the playing status of Kodi and decides whether or not to capture the screen. * Black border detector. * A scriptable effect engine. * Generic software architecture to support new devices and new algorithms easily. -More information can be found on the [wiki](https://github.com/tvdzwan/hyperion/wiki) or the [Hyperion topic](http://forum.stmlabs.com/showthread.php?tid=11053) on the Raspbmc forum. +More information can be found on the [wiki](wiki.hyperion-project.org) or the [Hyperion webpage/forum](www.hyperion-project.org). The source is released under MIT-License (see http://opensource.org/licenses/MIT). diff --git a/bin/create_all_releases.sh b/bin/create_all_releases.sh index 9f969cef..b3e5579a 100644 --- a/bin/create_all_releases.sh +++ b/bin/create_all_releases.sh @@ -1,8 +1,8 @@ #!/bin/sh # create all directly for release with -DCMAKE_BUILD_TYPE=Release -Wno-dev # Create the x64 build -mkdir build-x32x64 -cd build-x32x64 +mkdir build-x86x64 +cd build-x86x64 cmake -DENABLE_DISPMANX=OFF -DENABLE_X11=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev .. make -j 4 cd .. @@ -17,14 +17,14 @@ cd .. # Create the RPI build mkdir build-rpi cd build-rpi -cmake -DCMAKE_TOOLCHAIN_FILE="../Toolchain-rpi.cmake" -DIMPORT_PROTOC=../build-x32x64/protoc_export.cmake -DENABLE_WS2812BPWM=ON -DENABLE_WS281XPWM=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev .. +cmake -DCMAKE_TOOLCHAIN_FILE="../Toolchain-rpi.cmake" -DIMPORT_PROTOC=../build-x86x64/protoc_export.cmake -DENABLE_WS2812BPWM=ON -DENABLE_WS281XPWM=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev .. make -j 4 cd .. # Create the WETEK build mkdir build-wetek cd build-wetek -cmake -DCMAKE_TOOLCHAIN_FILE="../Toolchain-rpi.cmake" -DIMPORT_PROTOC=../build-x32x64/protoc_export.cmake -DENABLE_DISPMANX=OFF -DENABLE_FB=ON -DENABLE_AMLOGIC=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev .. +cmake -DCMAKE_TOOLCHAIN_FILE="../Toolchain-rpi.cmake" -DIMPORT_PROTOC=../build-x86x64/protoc_export.cmake -DENABLE_DISPMANX=OFF -DENABLE_FB=ON -DENABLE_AMLOGIC=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev .. make -j 4 cd .. @@ -35,7 +35,7 @@ cd .. #make -j 4 #cd .. -bin/create_release.sh . x32x64 +bin/create_release.sh . x86x64 #bin/create_release.sh . x32 bin/create_release.sh . rpi bin/create_release.sh . wetek diff --git a/bin/install_hyperion.sh b/bin/install_hyperion.sh index 9cf8f8fb..2d657caf 100755 --- a/bin/install_hyperion.sh +++ b/bin/install_hyperion.sh @@ -9,14 +9,6 @@ if [ "$1" = "HyperConInstall" ] || [ "$2" = "HyperConInstall" ]; then HCInstall=1 else HCInstall=0 fi -if [ "$1" = "WS281X" ] || [ "$2" = "WS281X" ]; then - PWM=1 -else PWM=0 -fi -if [ "$1" = "USB" ] || [ "$2" = "USB" ]; then - USB=1 -else USB=0 -fi #Check if HyperCon is logged in as root if [ $(id -u) != 0 ] && [ $HCInstall -eq 1 ]; then @@ -34,24 +26,30 @@ fi #Welcome message echo '*******************************************************************************' echo 'This script will install/update Hyperion and it´s services' -echo 'Version 0.1' +echo 'Created by brindosch - hyperion-project.org - the official Hyperion source.' echo '*******************************************************************************' -# Find out if we are on OpenElec / OSMC +# Find out if we are on OpenElec / OSMC / Raspbian OS_OPENELEC=`grep -m1 -c OpenELEC /etc/issue` OS_OSMC=`grep -m1 -c OSMC /etc/issue` +OS_RASPBIAN=`grep -m1 -c 'Raspbian\|RetroPie' /etc/issue` -# Find out if its an imx6 device +# Find out which device this script runs on CPU_RPI=`grep -m1 -c 'BCM2708\|BCM2709\|BCM2710' /proc/cpuinfo` CPU_IMX6=`grep -m1 -c i.MX6 /proc/cpuinfo` CPU_WETEK=`grep -m1 -c Amlogic /proc/cpuinfo` CPU_X32X64=`uname -m | grep 'x86_32\|i686\|x86_64' | wc -l` -#CPU_X32=`uname -m | grep 'x86_32\|i686' | wc -l` # Check that we have a known configuration if [ $CPU_RPI -ne 1 ] && [ $CPU_IMX6 -ne 1 ] && [ $CPU_WETEK -ne 1 ] && [ $CPU_X32X64 -ne 1 ]; then echo '---> Critical Error: CPU information does not match any known releases -> abort' exit 1 fi + +#Check which RPi we are one (in case) +RPI_1=`grep -m1 -c BCM2708 /proc/cpuinfo` +RPI_2=`grep -m1 -c BCM2709 /proc/cpuinfo` +RPI_3=`grep -m1 -c BCM2710 /proc/cpuinfo` + #Check, if year equals 1970 DATE=$(date +"%Y") if [ "$DATE" -le "2015" ]; then @@ -67,7 +65,7 @@ USE_SERVICE=`which /usr/sbin/service | wc -l` # Make sure that the boblight daemon is no longer running BOBLIGHT_PROCNR=$(pidof boblightd | wc -l) if [ $BOBLIGHT_PROCNR -eq 1 ]; then - echo '---> Critical Error: Found running instance of boblight. Please stop boblight via XBMC menu before installing hyperion -> abort' + echo '---> Critical Error: Found running instance of boblight. Please stop boblight via Kodi menu before installing hyperion -> abort' exit 1 fi @@ -92,7 +90,7 @@ if [ $OS_OPENELEC -ne 1 ]; then fi #Check, if dtparam=spi=on is in place (not for OPENELEC) -if [ $PWM -ne 1 ] && [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -ne 1 ]; then +if [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -ne 1 ]; then SPIOK=`grep '^\dtparam=spi=on' /boot/config.txt | wc -l` if [ $SPIOK -ne 1 ]; then echo '---> Raspberry Pi found, but SPI is not ready, we write "dtparam=spi=on" to /boot/config.txt' @@ -102,7 +100,7 @@ if [ $PWM -ne 1 ] && [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -ne 1 ]; then fi #Check, if dtparam=spi=on is in place (just for OPENELEC) -if [ $PWM -ne 1 ] && [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ]; then +if [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ]; then SPIOK=`grep '^\dtparam=spi=on' /flash/config.txt | wc -l` if [ $SPIOK -ne 1 ]; then mount -o remount,rw /flash @@ -113,27 +111,6 @@ if [ $PWM -ne 1 ] && [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ]; then fi fi -#Check, if dtoverlay=pwm is in place (not for OPENELEC) -#if [ $PWM -eq 1 ] && [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -ne 1 ]; then -# PWMOK=`grep '^\dtoverlay=pwm' /boot/config.txt | wc -l` -# if [ $PWMOK -ne 1 ]; then -# echo '---> Raspberry Pi found, but PWM is not ready, we write "dtoverlay=pwm" to /boot/config.txt' -# sed -i '$a dtoverlay=pwm' /boot/config.txt -# PWMREBOOTMESSAGE="echo Please reboot your Raspberry Pi, we inserted dtoverlay=pwm to /boot/config.txt" -# fi -#fi - -#Check, if dtoverlay=pwm is in place (just for OPENELEC) -if [ $PWM -eq 1 ] && [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ]; then - PWMOK=`grep '^\dtoverlay=pwm' /flash/config.txt | wc -l` - if [ $PWMOK -ne 1 ]; then - mount -o remount,rw /flash - echo '---> Raspberry Pi with OpenELEC found, but PWM is not ready, we write "dtoverlay=pwm" to /flash/config.txt' - sed -i '$a dtoverlay=pwm' /flash/config.txt - mount -o remount,ro /flash - PWMREBOOTMESSAGE="echo Please reboot your OpenELEC, we inserted dtoverlay=pwm to /flash/config.txt" - fi -fi #Backup the .conf files, if present echo '---> Backup Hyperion configuration(s), if present' rm -f /tmp/*.json 2>/dev/null @@ -143,10 +120,22 @@ else cp -v /opt/hyperion/config/*.json /tmp 2>/dev/null fi # Select the appropriate release -HYPERION_ADDRESS=https://raw.githubusercontent.com/tvdzwan/hyperion/master/deploy -if [ $CPU_RPI -eq 1 ]; then - HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi.tar.gz +HYPERION_ADDRESS=https://sourceforge.net/projects/hyperion-project/files/release +if [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ] && [ $RPI_1 -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi_oe.tar.gz OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz +elif [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ] && [ $RPI_2 -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi2_oe.tar.gz + OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz +elif [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ] && [ $RPI_3 -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi3_oe.tar.gz + OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz +elif [ $CPU_RPI -eq 1 ] && [ $RPI_1 -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi.tar.gz +elif [ $CPU_RPI -eq 1 ] && [ $RPI_2 -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi2.tar.gz +elif [ $CPU_RPI -eq 1 ] && [ $RPI_3 -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi3.tar.gz elif [ $CPU_IMX6 -eq 1 ]; then HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_imx6.tar.gz OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-imx6.tar.gz @@ -154,11 +143,8 @@ elif [ $CPU_WETEK -eq 1 ]; then HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_wetek.tar.gz OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz elif [ $CPU_X32X64 -eq 1 ]; then - HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_x32x64.tar.gz - OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-x32x64.tar.gz -#elif [ $CPU_X32 -eq 1 ]; then -# HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_x32.tar.gz -# OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-x32x64.tar.gz + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_x86x64.tar.gz + OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-x86x64.tar.gz else echo "---> Critical Error: Target platform unknown -> abort" exit 1 @@ -189,9 +175,6 @@ else ln -fs /opt/hyperion/bin/hyperion-v4l2 /usr/bin/hyperion-v4l2 ln -fs /opt/hyperion/bin/hyperion-dispmanx /usr/bin/hyperion-dispmanx 2>/dev/null ln -fs /opt/hyperion/bin/hyperion-x11 /usr/bin/hyperion-x11 2>/dev/null - -# Copy a link to the hyperion configuration file to /etc (-s for people who replaced the symlink with their config) - ln -s /opt/hyperion/config/hyperion.config.json /etc/hyperion.config.json 2>/dev/null fi # Restore backup of .conf files, if present @@ -229,29 +212,13 @@ elif [ $USE_SYSTEMD -eq 1 ]; then rm /etc/init.d/hyperion 2>/dev/null cp -n /opt/hyperion/init.d/hyperion.systemd.sh /etc/systemd/system/hyperion.service systemctl -q enable hyperion.service - if [ $PWM -eq 1 ] && [ $OS_OSMC -eq 1 ]; then - echo '---> Modify systemd script for OSMC usage (PWM Support)' - # Wait until kodi is sarted (for xbmc checker) and FIX user in case it is wrong (need root for access to pwm!)! - sed -i '/After = mediacenter.service/d' /etc/systemd/system/hyperion.service - sed -i '/Unit/a After = mediacenter.service' /etc/systemd/system/hyperion.service - sed -i 's/User=osmc/User=root/g' /etc/systemd/system/hyperion.service - sed -i 's/Group=osmc/Group=root/g' /etc/systemd/system/hyperion.service - systemctl -q daemon-reload - elif [ $USB -eq 1 ] && [ $OS_OSMC -eq 1 ]; then - echo '---> Modify systemd script for OSMC usage (USB Support)' - # Wait until kodi is sarted (for xbmc checker) and FIX user in case it is wrong (need root for access to USB!)! - sed -i '/After = mediacenter.service/d' /etc/systemd/system/hyperion.service - sed -i '/Unit/a After = mediacenter.service' /etc/systemd/system/hyperion.service - sed -i 's/User=osmc/User=root/g' /etc/systemd/system/hyperion.service - sed -i 's/Group=osmc/Group=root/g' /etc/systemd/system/hyperion.service - systemctl -q daemon-reload - elif [ $OS_OSMC -eq 1 ]; then + if [ $OS_OSMC -eq 1 ]; then echo '---> Modify systemd script for OSMC usage' - # Wait until kodi is sarted (for xbmc checker) and replace user (for remote control through osmc) + # Wait until kodi is sarted (for kodi checker) sed -i '/After = mediacenter.service/d' /etc/systemd/system/hyperion.service sed -i '/Unit/a After = mediacenter.service' /etc/systemd/system/hyperion.service - sed -i 's/User=root/User=osmc/g' /etc/systemd/system/hyperion.service - sed -i 's/Group=root/Group=osmc/g' /etc/systemd/system/hyperion.service + sed -i 's/User=osmc/User=root/g' /etc/systemd/system/hyperion.service + sed -i 's/Group=osmc/Group=root/g' /etc/systemd/system/hyperion.service systemctl -q daemon-reload fi elif [ $USE_SERVICE -eq 1 ]; then @@ -262,10 +229,17 @@ elif [ $USE_SERVICE -eq 1 ]; then update-rc.d hyperion defaults 98 02 fi +#chown the /config/ dir and all configs inside for hypercon config upload for non-root logins +if [ $OS_OSMC -eq 1 ]; then + chown -R osmc:osmc /opt/hyperion/config +elif [ $OS_RASPBIAN -eq 1 ]; then + chown -R pi:pi /opt/hyperion/config +fi + # Start the hyperion daemon echo '---> Starting Hyperion' if [ $OS_OPENELEC -eq 1 ]; then - /storage/.config/autostart.sh + /storage/.config/autostart.sh > /dev/null 2>&1 & elif [ $USE_INITCTL -eq 1 ]; then /sbin/initctl start hyperion elif [ $USE_SERVICE -eq 1 ]; then @@ -285,16 +259,15 @@ echo 'Please get a new HyperCon version to benefit from the latest features!' echo 'Create a new config file, if you encounter problems!' $HINTMESSAGE $REBOOTMESSAGE -$PWMREBOOTMESSAGE echo '*******************************************************************************' ## Force reboot and prevent prompt if spi is added during a HyperCon Install -if ( [ "$HCInstall" = "1" ] && [ "$CPU_RPI" = "1" ] ) && ( [ "$SPIOK" = "0" ] || [ "$PWMOK" = "0" ] ); then - echo "Rebooting now, we added dtparam=spi=on and/or dtoverlay=pwm to config.txt" +if [ $HCInstall -eq 1 ] && [ $CPU_RPI -eq 1 ] && [ $SPIOK -ne 1 ]; then + echo "Rebooting now, we added dtparam=spi=on to config.txt" reboot exit 0 fi #Prompt for reboot, if spi added to config.txt -if ( [ "$CPU_RPI" = "1" ] ) && ( [ "$SPIOK" = "0" ] || [ "$PWMOK" = "0" ] ); then +if [ $CPU_RPI -eq 1 ] && [ $SPIOK -ne 1 ]; then while true do echo -n "---> Do you want to reboot your Raspberry Pi now? (y or n) :" diff --git a/bin/remove_hyperion.sh b/bin/remove_hyperion.sh index 8ce5fd38..fafd0f99 100644 --- a/bin/remove_hyperion.sh +++ b/bin/remove_hyperion.sh @@ -21,6 +21,7 @@ fi echo '*******************************************************************************' echo 'This script will remove Hyperion and it´s services' echo '-----> Please BACKUP your hyperion.config.json if necessary <-----' +echo 'Created by brindosch - hyperion-project.org - the official Hyperion source.' echo '*******************************************************************************' #Skip the prompt if HyperCon Remove @@ -49,6 +50,9 @@ USE_SYSTEMD=`grep -m1 -c systemd /proc/1/comm` USE_INITCTL=`which /sbin/initctl | wc -l` USE_SERVICE=`which /usr/sbin/service | wc -l` +# set count for forwarder +SERVICEC=1 + # Stop hyperion daemon if it is running echo '---> Stop Hyperion, if necessary' if [ $OS_OPENELEC -eq 1 ]; then @@ -59,12 +63,19 @@ elif [ $USE_SERVICE -eq 1 ]; then /usr/sbin/service hyperion stop 2>/dev/null elif [ $USE_SYSTEMD -eq 1 ]; then service hyperion stop 2>/dev/null + while [ $SERVICEC -le 20 ]; do + service hyperion_fw$SERVICEC stop 2>/dev/null + ((SERVICEC++)) + done fi +#reset count +SERVICEC=`which /usr/sbin/service | wc -l` + #Disabling and delete service files if [ $USE_INITCTL -eq 1 ]; then echo '---> Delete and disable Hyperion initctl script' - rm -v /etc/init/hyperion.conf 2>/dev/null + rm -v /etc/init/hyperion* 2>/dev/null initctl reload-configuration elif [ $OS_OPENELEC -eq 1 ]; then # Remove Hyperion from OpenELEC autostart.sh @@ -75,12 +86,20 @@ elif [ $USE_SYSTEMD -eq 1 ]; then # Delete and disable Hyperion systemd script echo '---> Delete and disable Hyperion systemd script' systemctl disable hyperion.service - rm -v /etc/systemd/system/hyperion.service 2>/dev/null + while [ $SERVICEC -le 20 ]; do + systemctl -q disable hyperion_fw$SERVICEC.service 2>/dev/null + ((SERVICEC++)) + done + rm -v /etc/systemd/system/hyperion* 2>/dev/null elif [ $USE_SERVICE -eq 1 ]; then # Delete and disable Hyperion init.d script echo '---> Delete and disable Hyperion init.d script' update-rc.d -f hyperion remove - rm /etc/init.d/hyperion 2>/dev/null + while [ $SERVICEC -le 20 ]; do + update-rc.d -f hyperion_fw$SERVICEC remove 2>/dev/null + ((SERVICEC++)) + done + rm /etc/init.d/hyperion* 2>/dev/null fi # Delete Hyperion binaries diff --git a/bin/scripts/install_hyperion_beta.sh b/bin/scripts/install_hyperion_beta.sh new file mode 100644 index 00000000..d67c4419 --- /dev/null +++ b/bin/scripts/install_hyperion_beta.sh @@ -0,0 +1,288 @@ +#!/bin/sh +# Script for downloading and installing the latest Hyperion release + +# Make sure /sbin is on the path (for service to find sub scripts) +PATH="/sbin:$PATH" + +#Check which arguments are used +if [ "$1" = "HyperConInstall" ] || [ "$2" = "HyperConInstall" ]; then + HCInstall=1 +else HCInstall=0 +fi + +#Check if HyperCon is logged in as root +if [ $(id -u) != 0 ] && [ $HCInstall -eq 1 ]; then + echo '---> Critical Error: Please connect as user "root" through HyperCon' + echo '---> We need admin privileges to install/update your Hyperion! -> abort' + exit 1 +fi + +#Check, if script is running as root +if [ $(id -u) != 0 ]; then + echo '---> Critical Error: Please run the script as root (sudo sh ./install_hyperion.sh) -> abort' + exit 1 +fi + +#Welcome message +echo '*******************************************************************************' +echo 'This script will install/update Hyperion and it´s services' +echo 'Created by brindosch - hyperion-project.org - the official Hyperion source.' +echo '*******************************************************************************' + +# Find out if we are on OpenElec / OSMC / Raspbian +OS_OPENELEC=`grep -m1 -c OpenELEC /etc/issue` +OS_OSMC=`grep -m1 -c OSMC /etc/issue` +OS_RASPBIAN=`grep -m1 -c 'Raspbian\|RetroPie' /etc/issue` + +# Find out which device this script runs on +CPU_RPI=`grep -m1 -c 'BCM2708\|BCM2709\|BCM2710' /proc/cpuinfo` +CPU_IMX6=`grep -m1 -c i.MX6 /proc/cpuinfo` +CPU_WETEK=`grep -m1 -c Amlogic /proc/cpuinfo` +CPU_X32X64=`uname -m | grep 'x86_32\|i686\|x86_64' | wc -l` +# Check that we have a known configuration +if [ $CPU_RPI -ne 1 ] && [ $CPU_IMX6 -ne 1 ] && [ $CPU_WETEK -ne 1 ] && [ $CPU_X32X64 -ne 1 ]; then + echo '---> Critical Error: CPU information does not match any known releases -> abort' + exit 1 +fi + +#Check which RPi we are one (in case) +RPI_1=`grep -m1 -c BCM2708 /proc/cpuinfo` +RPI_2=`grep -m1 -c BCM2709 /proc/cpuinfo` +RPI_3=`grep -m1 -c BCM2710 /proc/cpuinfo` + +#Check, if year equals 1970 +DATE=$(date +"%Y") +if [ "$DATE" -le "2015" ]; then + echo "---> Critical Error: Please update your systemtime (Year of your system: ${DATE}) -> abort" + exit 1 +fi + +# check which init script we should use +USE_SYSTEMD=`grep -m1 -c systemd /proc/1/comm` +USE_INITCTL=`which /sbin/initctl | wc -l` +USE_SERVICE=`which /usr/sbin/service | wc -l` + +# Make sure that the boblight daemon is no longer running +BOBLIGHT_PROCNR=$(pidof boblightd | wc -l) +if [ $BOBLIGHT_PROCNR -eq 1 ]; then + echo '---> Critical Error: Found running instance of boblight. Please stop boblight via Kodi menu before installing hyperion -> abort' + exit 1 +fi + +# Stop hyperion daemon if it is running +echo '---> Stop Hyperion, if necessary' +if [ $OS_OPENELEC -eq 1 ]; then + killall hyperiond 2>/dev/null +elif [ $USE_INITCTL -eq 1 ]; then + /sbin/initctl stop hyperion 2>/dev/null +elif [ $USE_SERVICE -eq 1 ]; then + /usr/sbin/service hyperion stop 2>/dev/null +elif [ $USE_SYSTEMD -eq 1 ]; then + service hyperion stop 2>/dev/null + #many people installed with the official script and this just uses service, if both registered -> dead + /usr/sbin/service hyperion stop 2>/dev/null +fi + +#Install dependencies for Hyperion +if [ $OS_OPENELEC -ne 1 ]; then + echo '---> Install/Update Hyperion dependencies (This may take a while)' + apt-get -qq update && apt-get -qq --yes install libqtcore4 libqtgui4 libqt4-network libusb-1.0-0 ca-certificates +fi + +#Check, if dtparam=spi=on is in place (not for OPENELEC) +if [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -ne 1 ]; then + SPIOK=`grep '^\dtparam=spi=on' /boot/config.txt | wc -l` + if [ $SPIOK -ne 1 ]; then + echo '---> Raspberry Pi found, but SPI is not ready, we write "dtparam=spi=on" to /boot/config.txt' + sed -i '$a dtparam=spi=on' /boot/config.txt + REBOOTMESSAGE="echo Please reboot your Raspberry Pi, we inserted dtparam=spi=on to /boot/config.txt" + fi +fi + +#Check, if dtparam=spi=on is in place (just for OPENELEC) +if [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ]; then + SPIOK=`grep '^\dtparam=spi=on' /flash/config.txt | wc -l` + if [ $SPIOK -ne 1 ]; then + mount -o remount,rw /flash + echo '---> Raspberry Pi with OpenELEC found, but SPI is not ready, we write "dtparam=spi=on" to /flash/config.txt' + sed -i '$a dtparam=spi=on' /flash/config.txt + mount -o remount,ro /flash + REBOOTMESSAGE="echo Please reboot your OpenELEC, we inserted dtparam=spi=on to /flash/config.txt" + fi +fi + +#Backup the .conf files, if present +echo '---> Backup Hyperion configuration(s), if present' +rm -f /tmp/*.json 2>/dev/null +if [ $OS_OPENELEC -eq 1 ]; then + cp -v /storage/.config/*.json /tmp 2>/dev/null +else cp -v /opt/hyperion/config/*.json /tmp 2>/dev/null +fi + +# Select the appropriate release +HYPERION_ADDRESS=https://sourceforge.net/projects/hyperion-project/files/beta +if [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ] && [ $RPI_1 -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi_oe.tar.gz + OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz +elif [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ] && [ $RPI_2 -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi2_oe.tar.gz + OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz +elif [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ] && [ $RPI_3 -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi3_oe.tar.gz + OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz +elif [ $CPU_RPI -eq 1 ] && [ $RPI_1 -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi.tar.gz +elif [ $CPU_RPI -eq 1 ] && [ $RPI_2 -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi2.tar.gz +elif [ $CPU_RPI -eq 1 ] && [ $RPI_3 -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_rpi3.tar.gz +elif [ $CPU_IMX6 -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_imx6.tar.gz + OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-imx6.tar.gz +elif [ $CPU_WETEK -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_wetek.tar.gz + OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-rpi.tar.gz +elif [ $CPU_X32X64 -eq 1 ]; then + HYPERION_RELEASE=$HYPERION_ADDRESS/hyperion_x86x64.tar.gz + OE_DEPENDECIES=$HYPERION_ADDRESS/hyperion.deps.openelec-x86x64.tar.gz +else + echo "---> Critical Error: Target platform unknown -> abort" + exit 1 +fi + +# Get and extract the Hyperion binaries and effects +echo '---> Downloading the appropriate Hyperion release' +if [ $OS_OPENELEC -eq 1 ]; then + # OpenELEC has a readonly file system. Use alternative location + echo '---> Downloading Hyperion OpenELEC release' + curl -# -L --get $HYPERION_RELEASE | tar -C /storage -xz + echo '---> Downloading Hyperion OpenELEC dependencies' + curl -# -L --get $OE_DEPENDECIES | tar -C /storage/hyperion/bin -xz + #set the executen bit (failsave) + chmod +x -R /storage/hyperion/bin + # modify the default config to have a correct effect path + sed -i 's:/opt:/storage:g' /storage/hyperion/config/hyperion.config.json + + # /storage/.config is available as samba share. A symbolic link would not be working + false | cp -i /storage/hyperion/config/hyperion.config.json /storage/.config/hyperion.config.json 2>/dev/null +else + wget -nv $HYPERION_RELEASE -O - | tar -C /opt -xz + #set the executen bit (failsave) + chmod +x -R /opt/hyperion/bin + # 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 + ln -fs /opt/hyperion/bin/hyperion-v4l2 /usr/bin/hyperion-v4l2 + ln -fs /opt/hyperion/bin/hyperion-dispmanx /usr/bin/hyperion-dispmanx 2>/dev/null + ln -fs /opt/hyperion/bin/hyperion-x11 /usr/bin/hyperion-x11 2>/dev/null +fi + +# Restore backup of .conf files, if present +echo '---> Restore Hyperion configuration(s), if present' +if [ $OS_OPENELEC -eq 1 ]; then + mv -v /tmp/*.json /storage/.config/ 2>/dev/null +else mv -v /tmp/*.json /opt/hyperion/config/ 2>/dev/null +fi + +# Copy the service control configuration to /etc/int (-n to respect user modified scripts) +if [ $USE_INITCTL -eq 1 ]; then + echo '---> Installing initctl script' + cp -n /opt/hyperion/init.d/hyperion.initctl.sh /etc/init/hyperion.conf 2>/dev/null + initctl reload-configuration +elif [ $OS_OPENELEC -eq 1 ]; then + #modify all old installs with a logfile output + sed -i 's|/dev/null|/storage/logfiles/hyperion.log|g' /storage/.config/autostart.sh + # only add to start script if hyperion is not present yet + if [ `cat /storage/.config/autostart.sh 2>/dev/null | grep hyperiond | wc -l` -eq 0 ]; then + echo '---> Adding Hyperion to OpenELEC autostart.sh' + echo "/storage/hyperion/bin/hyperiond.sh /storage/.config/hyperion.config.json > /storage/logfiles/hyperion.log 2>&1 &" >> /storage/.config/autostart.sh + chmod +x /storage/.config/autostart.sh + fi + # only add hyperion-x11 to startup, if not found and x32x64 detected + if [ $CPU_X32X64 -eq 1 ] && [ `cat /storage/.config/autostart.sh 2>/dev/null | grep hyperion-x11 | wc -l` -eq 0 ]; then + echo '---> Adding Hyperion-x11 to OpenELEC autostart.sh' + echo "DISPLAY=:0.0 LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/storage/hyperion/bin /storage/hyperion/bin/hyperion-x11 /storage/logfiles/hyperion.log 2>&1 &" >> /storage/.config/autostart.sh + fi +elif [ $USE_SYSTEMD -eq 1 ]; then + echo '---> Installing systemd script' + #place startup script for systemd and activate + #Problem with systemd to enable symlinks - Bug? Workaround cp -n (overwrite never) + #Bad workaround for Jessie (systemd) users that used the official script for install + update-rc.d -f hyperion remove 2>/dev/null + rm /etc/init.d/hyperion 2>/dev/null + cp -n /opt/hyperion/init.d/hyperion.systemd.sh /etc/systemd/system/hyperion.service + systemctl -q enable hyperion.service + if [ $OS_OSMC -eq 1 ]; then + echo '---> Modify systemd script for OSMC usage' + # Wait until kodi is sarted (for kodi checker) + sed -i '/After = mediacenter.service/d' /etc/systemd/system/hyperion.service + sed -i '/Unit/a After = mediacenter.service' /etc/systemd/system/hyperion.service + sed -i 's/User=osmc/User=root/g' /etc/systemd/system/hyperion.service + sed -i 's/Group=osmc/Group=root/g' /etc/systemd/system/hyperion.service + systemctl -q daemon-reload + fi +elif [ $USE_SERVICE -eq 1 ]; then + echo '---> Installing startup script in init.d' + # place startup script in init.d and add it to upstart (-s to respect user modified scripts) + ln -s /opt/hyperion/init.d/hyperion.init.sh /etc/init.d/hyperion 2>/dev/null + chmod +x /etc/init.d/hyperion + update-rc.d hyperion defaults 98 02 +fi + +#chown the /config/ dir and all configs inside for hypercon config upload for non-root logins +if [ $OS_OSMC -eq 1 ]; then + chown -R osmc:osmc /opt/hyperion/config +elif [ $OS_RASPBIAN -eq 1 ]; then + chown -R pi:pi /opt/hyperion/config +fi + +# Start the hyperion daemon +echo '---> Starting Hyperion' +if [ $OS_OPENELEC -eq 1 ]; then + /storage/.config/autostart.sh > /dev/null 2>&1 & +elif [ $USE_INITCTL -eq 1 ]; then + /sbin/initctl start hyperion +elif [ $USE_SERVICE -eq 1 ]; then + /usr/sbin/service hyperion start +elif [ $USE_SYSTEMD -eq 1 ]; then + service hyperion start +fi + +#Hint for the user with path to config +if [ $OS_OPENELEC -eq 1 ];then + HINTMESSAGE="echo Path to your configuration -> /storage/.config/hyperion.config.json" +else HINTMESSAGE="echo Path to your configuration -> /opt/hyperion/config/hyperion.config.json" +fi +echo '*******************************************************************************' +echo 'Hyperion Installation/Update finished!' +echo 'Please get a new HyperCon version to benefit from the latest features!' +echo 'Create a new config file, if you encounter problems!' +$HINTMESSAGE +$REBOOTMESSAGE +echo '*******************************************************************************' +## Force reboot and prevent prompt if spi is added during a HyperCon Install +if [ $HCInstall -eq 1 ] && [ $CPU_RPI -eq 1 ] && [ $SPIOK -ne 1 ]; then + echo "Rebooting now, we added dtparam=spi=on to config.txt" + reboot + exit 0 +fi +#Prompt for reboot, if spi added to config.txt +if [ $CPU_RPI -eq 1 ] && [ $SPIOK -ne 1 ]; then + while true + do + echo -n "---> Do you want to reboot your Raspberry Pi now? (y or n) :" + read CONFIRM + case $CONFIRM in + y|Y|YES|yes|Yes) break ;; + n|N|no|NO|No) + echo "---> No reboot - you entered \"$CONFIRM\"" + exit + ;; + *) echo "-> Please enter only y or n" + esac + done + echo "---> You entered \"$CONFIRM\". Rebooting now..." + reboot +fi + +exit 0 \ No newline at end of file diff --git a/bin/service/hyperion.init.sh b/bin/service/hyperion.init.sh index ca3f8d14..3ed78f5b 100644 --- a/bin/service/hyperion.init.sh +++ b/bin/service/hyperion.init.sh @@ -13,7 +13,7 @@ ### END INIT INFO DAEMON=hyperiond -DAEMONOPTS="/etc/hyperion.config.json" +DAEMONOPTS="/opt/hyperion/config/hyperion.config.json" DAEMON_PATH="/usr/bin" NAME=$DAEMON diff --git a/bin/service/hyperion.initctl.sh b/bin/service/hyperion.initctl.sh index 773c6e61..58f6f79f 100644 --- a/bin/service/hyperion.initctl.sh +++ b/bin/service/hyperion.initctl.sh @@ -8,4 +8,4 @@ stop on (runlevel [!2345]) respawn -exec /usr/bin/hyperiond /etc/hyperion.config.json \ No newline at end of file +exec /usr/bin/hyperiond /opt/hyperion/config/hyperion.config.json \ No newline at end of file diff --git a/bin/service/hyperion.systemd.sh b/bin/service/hyperion.systemd.sh index c3c66255..b3503c7c 100644 --- a/bin/service/hyperion.systemd.sh +++ b/bin/service/hyperion.systemd.sh @@ -6,7 +6,7 @@ Type=simple User=root Group=root UMask=007 -ExecStart=/opt/hyperion/bin/hyperiond /etc/hyperion.config.json +ExecStart=/opt/hyperion/bin/hyperiond /opt/hyperion/config/hyperion.config.json ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure TimeoutStopSec=10 diff --git a/config/hyperion.config.json b/config/hyperion.config.json index 62c7d70e..5d549075 100644 --- a/config/hyperion.config.json +++ b/config/hyperion.config.json @@ -1,16 +1,17 @@ // Automatically generated configuration file for 'Hyperion daemon' -// Generated by: HyperCon (The Hyperion deamon configuration file builder +// Generated by: HyperCon (The Hyperion deamon configuration file builder) +// Created with HyperCon V1.02.0 (30.04.2016) { /// Device configuration contains the following fields: /// * 'name' : The user friendly name of the device (only used for display purposes) /// * 'type' : The type of the device or leds (known types for now are - /// APA102, Adalight, AmbiLed, Atmo, Hyperion-USBASP-WS2801, Hyperion-USBASP-WS2812, Lightberry, Lightpack, LPD6803, LPD8806, Multi-Lightpack, P9813, Paintpack, PhilipsHUE, PiBlaster, SEDU, file, ThinkerForge, TPM2, WS2801, WS2812b, None) + /// ---------SPI---------, APA102, WS2801, P9813, LPD6803, LPD8806, ---------PWM---------, WS2812b (just RPi1), WS281X (RPi1, RPi2, RPi3), --------OTHER--------, PhilipsHUE, AtmoOrb, PiBlaster, Tinkerforge, FadeCandy, RawHID (USB), UDP, SEDU, TPM2, USBASP-WS2801, USBASP-WS2812, ------3rd PARTY------, Adalight, AdalightAPA102, AmbiLed, Atmo, Lightpack, Multi-Lightpack, Paintpack, Test (file), None) /// * [device type specific configuration] /// * 'colorOrder' : The order of the color bytes ('rgb', 'rbg', 'bgr', etc.). "device" : { - "name" : "MyPi", + "name" : "MyHyperionConfig", "type" : "ws2801", "output" : "/dev/spidev0.0", "rate" : 1000000, @@ -20,18 +21,31 @@ /// Color manipulation configuration used to tune the output colors to specific surroundings. /// The configuration contains a list of color-transforms. Each transform contains the /// following fields: - /// * 'id' : The unique identifier of the color transformation (eg 'device_1') /// * 'leds' : The indices (or index ranges) of the leds to which this color transform applies - /// (eg '0-5, 9, 11, 12-17'). The indices are zero based. /// * 'hsv' : The manipulation in the Hue-Saturation-Value color domain with the following + /// * 'channelAdjustment' + /// * 'id' : The unique identifier of the channel adjustments (eg 'device_1') + /// * 'leds' : The indices (or index ranges) of the leds to which this channel adjustment applies + /// (eg '0-5, 9, 11, 12-17'). The indices are zero based. + /// * 'pureRed'/'pureGreen'/'pureBlue' : The manipulation in the Red-Green-Blue color domain with the + /// following tuning parameters for each channel: + /// * 'temperature' + /// * 'id' : The unique identifier of the temperature (eg 'device_1') + /// * 'leds' : The indices (or index ranges) of the leds to which this temperature applies + /// (eg '0-5, 9, 11, 12-17'). The indices are zero based. + /// * 'red'/'green'/'blue' : The temperature manipulation in the Red-Green-Blue color domain with the + /// following tuning parameters for each channel: + /// * 'transform' + /// * 'id' : The unique identifier of the color transformation (eg 'device_1') + /// * 'leds' : The indices (or index ranges) of the leds to which this color transform applies + /// (eg '0-5, 9, 11, 12-17'). The indices are zero based. + /// * 'hsv' : The manipulation in the Hue-Saturation-Value color domain with the following /// tuning parameters: /// - 'saturationGain' The gain adjustement of the saturation - /// - 'valueGain' The gain adjustement of the value + /// - 'luminanceGain' The gain adjustement of the luminance /// * 'red'/'green'/'blue' : The manipulation in the Red-Green-Blue color domain with the /// following tuning parameters for each channel: /// - 'threshold' The minimum required input value for the channel to be on /// (else zero) /// - 'gamma' The gamma-curve correction factor - /// - 'blacklevel' The lowest possible value (when the channel is black) - /// - 'whitelevel' The highest possible value (when the channel is white) /// /// Next to the list with color transforms there is also a smoothing option. /// * 'smoothing' : Smoothing of the colors in the time-domain with the following tuning @@ -42,16 +56,28 @@ /// - 'updateDelay' The delay of the output to leds (in periods of smoothing) "color" : { - "correction" : + "channelAdjustment" : [ { "id" : "default", "leds" : "*", - "correctionValues" : + "pureRed" : { - "red" : 255, - "green" : 255, - "blue" : 255 + "redChannel" : 255, + "greenChannel" : 0, + "blueChannel" : 0 + }, + "pureGreen" : + { + "redChannel" : 0, + "greenChannel" : 255, + "blueChannel" : 0 + }, + "pureBlue" : + { + "redChannel" : 0, + "greenChannel" : 0, + "blueChannel" : 255 } } ], @@ -62,75 +88,40 @@ "leds" : "*", "temperatureValues" : { - "red" : 255, - "green" : 255, - "blue" : 255 + "red" : 255, + "green" : 255, + "blue" : 255 } } ], - "channelAdjustment" : - [ - { - "id" : "default", - "leds" : "*", - "pureRed" : - { - "redChannel" : 255, - "greenChannel" : 0, - "blueChannel" : 0 - }, - "pureGreen" : - { - "redChannel" : 0, - "greenChannel" : 255, - "blueChannel" : 0 - }, - "pureBlue" : - { - "redChannel" : 0, - "greenChannel" : 0, - "blueChannel" : 255 - } - } - ], "transform" : [ { "id" : "default", "leds" : "*", - "hsv" : - { - "saturationGain" : 1.0000, - "valueGain" : 1.0000 - }, "hsl" : { - "saturationGain" : 1.0000, - "luminanceGain" : 1.0000 + "saturationGain" : 1.0000, + "luminanceGain" : 1.0000 }, "red" : { - "threshold" : 0.0000, - "gamma" : 1.0000, - "blacklevel" : 0.0000, - "whitelevel" : 1.0000 + "threshold" : 0.0000, + "gamma" : 2.5000 }, "green" : { - "threshold" : 0.0000, - "gamma" : 1.0000, - "blacklevel" : 0.0000, - "whitelevel" : 1.0000 + "threshold" : 0.0000, + "gamma" : 2.5000 }, "blue" : { - "threshold" : 0.0000, - "gamma" : 1.0000, - "blacklevel" : 0.0000, - "whitelevel" : 1.0000 + "threshold" : 0.0000, + "gamma" : 2.5000 } } ], + "smoothing" : { "type" : "linear", @@ -164,7 +155,7 @@ /// * color : Set static color after boot -> set effect to "" (empty) and input the values [R,G,B] and set duration_ms NOT to 0 (use 1) instead /// * effect : The effect selected as 'boot sequence' /// * duration_ms : The duration of the selected effect (0=endless) - /// * priority : The priority of the selected effect/static color (default=0) + /// * priority : The priority of the selected effect/static color (default=990) HINT: lower value result in HIGHER priority! "effects" : { "paths" : @@ -190,20 +181,21 @@ // "forwarder" : // { // "proto" : ["127.0.0.1:19447"], -// "json" : ["127.0.0.1:19446"] +// "json" : ["127.0.0.1:19446"] // }, /// The configuration for the frame-grabber, contains the following items: /// * width : The width of the grabbed frames [pixels] /// * height : The height of the grabbed frames [pixels] /// * frequency_Hz : The frequency of the frame grab [Hz] - /// * priority : The priority + /// * priority : The priority of the frame-gabber (Default=890) HINT: lower value result in HIGHER priority! + /// * ATTENTION : Power-of-Two resolution is not supported and leads to unexpected behaviour! "framegrabber" : { - "width" : 80, - "height" : 45, + "width" : 64, + "height" : 64, "frequency_Hz" : 10.0, - "priority" : 900 + "priority" : 890 }, /// The configuration of the Kodi connection used to enable and disable the frame-grabber. Contains the following fields: @@ -242,10 +234,11 @@ }, /// The configuration of the boblight server which enables the boblight remote interface - /// * port : Port at which the boblight server is started + /// * port : Port at which the boblight server is started + /// * priority: Priority of the boblight server (Default=900) HINT: lower value result in HIGHER priority! // "boblightServer" : // { -// "port" : 19333, +// "port" : 19333, // "priority" : 900 // }, @@ -257,7 +250,7 @@ /// * height : V4L2 height to set [default=-1] /// * frameDecimation : Frame decimation factor [default=2] /// * sizeDecimation : Size decimation factor [default=8] - /// * priority : Hyperion priority channel [default=800] + /// * priority : Hyperion priority channel [default=900] /// * mode : 3D mode to use 2D/3DSBS/3DTAB (note: no autodetection) [default="2D"] /// * cropLeft : Cropping from the left [default=0] /// * cropRight : Cropping from the right [default=0] @@ -275,7 +268,7 @@ // "height" : -1, // "frameDecimation" : 2, // "sizeDecimation" : 8, -// "priority" : 800, +// "priority" : 900, // "mode" : "2D", // "cropLeft" : 0, // "cropRight" : 0, diff --git a/config/hyperion_x86.config.json b/config/hyperion_x86.config.json deleted file mode 100644 index a17801b9..00000000 --- a/config/hyperion_x86.config.json +++ /dev/null @@ -1,453 +0,0 @@ -// Automatically generated configuration file for 'Hyperion daemon' -// Generated by: HyperCon (The Hyperion deamon configuration file builder - -{ - /// Device configuration contains the following fields: - /// * 'name' : The user friendly name of the device (only used for display purposes) - /// * 'type' : The type of the device or leds (known types for now are 'ws2801', 'ldp8806', - /// 'lpd6803', 'sedu', 'adalight', 'lightpack', 'file' and 'none') - /// * 'output' : The output specification depends on selected device. This can for example be the - /// device specifier, device serial number, or the output file name - /// * 'rate' : The baudrate of the output to the device - /// * 'colorOrder' : The order of the color bytes ('rgb', 'rbg', 'bgr', etc.). - "device" : - { - "name" : "MyPi", - "type" : "adalight", - "output" : "/dev/ttyUSB0", - "rate" : 115200, - "colorOrder" : "rgb" - }, - - /// Configuration for message forwarding to other hyperions - /// protobuffer and json remote interface are forwarded to configured hosts - /// 'proto' is mostly used for video streams and 'json' for effects - /// - /// ** pay attention which port you use. use correct ports for protols ** - /// - /// * 'proto' : list of host in form of : - /// * 'json' : list of host in form of : -/// "forwarder" : -/// { -/// "proto" : [ "127.0.0.1:19445","192.168.178.88:19445" ], -/// "json" : [ "127.0.0.1:19444","192.168.178.88:19444" ] -/// }, - - - /// Color manipulation configuration used to tune the output colors to specific surroundings. - /// The configuration contains a list of color-transforms. Each transform contains the - /// following fields: - /// * 'id' : The unique identifier of the color transformation (eg 'device_1') /// * 'leds' : The indices (or index ranges) of the leds to which this color transform applies - /// (eg '0-5, 9, 11, 12-17'). The indices are zero based. /// * 'hsv' : The manipulation in the Hue-Saturation-Value color domain with the following - /// tuning parameters: - /// - 'saturationGain' The gain adjustement of the saturation - /// - 'valueGain' The gain adjustement of the value - /// * 'red'/'green'/'blue' : The manipulation in the Red-Green-Blue color domain with the - /// following tuning parameters for each channel: - /// - 'threshold' The minimum required input value for the channel to be on - /// (else zero) - /// - 'gamma' The gamma-curve correction factor - /// - 'blacklevel' The lowest possible value (when the channel is black) - /// - 'whitelevel' The highest possible value (when the channel is white) - /// - /// Next to the list with color transforms there is also a smoothing option. - /// * 'smoothing' : Smoothing of the colors in the time-domain with the following tuning - /// parameters: - /// - 'type' The type of smoothing algorithm ('linear' or 'none') - /// - 'time_ms' The time constant for smoothing algorithm in milliseconds - /// - 'updateFrequency' The update frequency of the leds in Hz - "color" : - { - "transform" : - [ - { - "id" : "default", - "leds" : "*", - "hsv" : - { - "saturationGain" : 1.0000, - "valueGain" : 1.0000 - }, - "red" : - { - "threshold" : 0.0000, - "gamma" : 1.0000, - "blacklevel" : 0.0000, - "whitelevel" : 1.0000 - }, - "green" : - { - "threshold" : 0.0000, - "gamma" : 1.0000, - "blacklevel" : 0.0000, - "whitelevel" : 1.0000 - }, - "blue" : - { - "threshold" : 0.0000, - "gamma" : 1.0000, - "blacklevel" : 0.0000, - "whitelevel" : 1.0000 - } - } - ], - "smoothing" : - { - "type" : "none", - "time_ms" : 200, - "updateFrequency" : 20.0000 - } - }, - - /// The configuration for each individual led. This contains the specification of the area - /// averaged of an input image for each led to determine its color. Each item in the list - /// contains the following fields: - /// * index: The index of the led. This determines its location in the string of leds; zero - /// being the first led. - /// * hscan: The fractional part of the image along the horizontal used for the averaging - /// (minimum and maximum inclusive) - /// * vscan: The fractional part of the image along the vertical used for the averaging - /// (minimum and maximum inclusive) - "leds" : - [ - { - "index" : 0, - "hscan" : { "minimum" : 0.4375, "maximum" : 0.5000 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 1, - "hscan" : { "minimum" : 0.3750, "maximum" : 0.4375 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 2, - "hscan" : { "minimum" : 0.3125, "maximum" : 0.3750 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 3, - "hscan" : { "minimum" : 0.2500, "maximum" : 0.3125 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 4, - "hscan" : { "minimum" : 0.1875, "maximum" : 0.2500 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 5, - "hscan" : { "minimum" : 0.1250, "maximum" : 0.1875 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 6, - "hscan" : { "minimum" : 0.0625, "maximum" : 0.1250 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 7, - "hscan" : { "minimum" : 0.0000, "maximum" : 0.0625 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 8, - "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 9, - "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 }, - "vscan" : { "minimum" : 0.8571, "maximum" : 1.0000 } - }, - { - "index" : 10, - "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 }, - "vscan" : { "minimum" : 0.7143, "maximum" : 0.8571 } - }, - { - "index" : 11, - "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 }, - "vscan" : { "minimum" : 0.5714, "maximum" : 0.7143 } - }, - { - "index" : 12, - "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 }, - "vscan" : { "minimum" : 0.4286, "maximum" : 0.5714 } - }, - { - "index" : 13, - "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 }, - "vscan" : { "minimum" : 0.2857, "maximum" : 0.4286 } - }, - { - "index" : 14, - "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 }, - "vscan" : { "minimum" : 0.1429, "maximum" : 0.2857 } - }, - { - "index" : 15, - "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.1429 } - }, - { - "index" : 16, - "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 17, - "hscan" : { "minimum" : 0.0000, "maximum" : 0.0625 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 18, - "hscan" : { "minimum" : 0.0625, "maximum" : 0.1250 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 19, - "hscan" : { "minimum" : 0.1250, "maximum" : 0.1875 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 20, - "hscan" : { "minimum" : 0.1875, "maximum" : 0.2500 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 21, - "hscan" : { "minimum" : 0.2500, "maximum" : 0.3125 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 22, - "hscan" : { "minimum" : 0.3125, "maximum" : 0.3750 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 23, - "hscan" : { "minimum" : 0.3750, "maximum" : 0.4375 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 24, - "hscan" : { "minimum" : 0.4375, "maximum" : 0.5000 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 25, - "hscan" : { "minimum" : 0.5000, "maximum" : 0.5625 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 26, - "hscan" : { "minimum" : 0.5625, "maximum" : 0.6250 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 27, - "hscan" : { "minimum" : 0.6250, "maximum" : 0.6875 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 28, - "hscan" : { "minimum" : 0.6875, "maximum" : 0.7500 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 29, - "hscan" : { "minimum" : 0.7500, "maximum" : 0.8125 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 30, - "hscan" : { "minimum" : 0.8125, "maximum" : 0.8750 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 31, - "hscan" : { "minimum" : 0.8750, "maximum" : 0.9375 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 32, - "hscan" : { "minimum" : 0.9375, "maximum" : 1.0000 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 33, - "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 } - }, - { - "index" : 34, - "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 }, - "vscan" : { "minimum" : 0.0000, "maximum" : 0.1429 } - }, - { - "index" : 35, - "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 }, - "vscan" : { "minimum" : 0.1429, "maximum" : 0.2857 } - }, - { - "index" : 36, - "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 }, - "vscan" : { "minimum" : 0.2857, "maximum" : 0.4286 } - }, - { - "index" : 37, - "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 }, - "vscan" : { "minimum" : 0.4286, "maximum" : 0.5714 } - }, - { - "index" : 38, - "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 }, - "vscan" : { "minimum" : 0.5714, "maximum" : 0.7143 } - }, - { - "index" : 39, - "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 }, - "vscan" : { "minimum" : 0.7143, "maximum" : 0.8571 } - }, - { - "index" : 40, - "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 }, - "vscan" : { "minimum" : 0.8571, "maximum" : 1.0000 } - }, - { - "index" : 41, - "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 42, - "hscan" : { "minimum" : 0.9375, "maximum" : 1.0000 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 43, - "hscan" : { "minimum" : 0.8750, "maximum" : 0.9375 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 44, - "hscan" : { "minimum" : 0.8125, "maximum" : 0.8750 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 45, - "hscan" : { "minimum" : 0.7500, "maximum" : 0.8125 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 46, - "hscan" : { "minimum" : 0.6875, "maximum" : 0.7500 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 47, - "hscan" : { "minimum" : 0.6250, "maximum" : 0.6875 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 48, - "hscan" : { "minimum" : 0.5625, "maximum" : 0.6250 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - }, - { - "index" : 49, - "hscan" : { "minimum" : 0.5000, "maximum" : 0.5625 }, - "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 } - } - ], - - /// The black border configuration, contains the following items: - /// * enable : true if the detector should be activated - /// * threshold : Value below which a pixel is regarded as black (value between 0.0 and 1.0) - "blackborderdetector" : - { - "enable" : true, - "threshold" : 0.01 - }, - - /// The configuration of the effect engine, contains the following items: - /// * paths : An array with absolute location(s) of directories with effects - /// * bootsequence : The effect selected as 'boot sequence' - /// * effect : name of the effect you want to start. Set to empty if no effect wanted - /// * color : switch to static color after effect is done - /// * duration_ms : duration of boot effect in ms. 0 means effect stays forever - /// * priority : priority of boot effect and static color - "effects" : - { - "paths" : - [ - "/home/dincs/projects/hyperion/effects" - ] - }, - - "bootsequence" : - { - "color" : [0,0,0], - "effect" : "Rainbow swirl fast", - "duration_ms" : 3000, - "priority" : 990 - }, - - /// The configuration for the frame-grabber, contains the following items: - /// * width : The width of the grabbed frames [pixels] - /// * height : The height of the grabbed frames [pixels] - /// * frequency_Hz : The frequency of the frame grab [Hz] -/// "framegrabber" : -/// { -/// "width" : 64, -/// "height" : 64, -/// "frequency_Hz" : 10.0, -/// "priority" : 900 -/// }, - - /// The configuration of the XBMC connection used to enable and disable the frame-grabber. Contains the following fields: - /// * xbmcAddress : The IP address of the XBMC-host - /// * xbmcTcpPort : The TCP-port of the XBMC-server - /// * grabVideo : Flag indicating that the frame-grabber is on(true) during video playback - /// * grabPictures : Flag indicating that the frame-grabber is on(true) during picture show - /// * grabAudio : Flag indicating that the frame-grabber is on(true) during audio playback - /// * grabMenu : Flag indicating that the frame-grabber is on(true) in the XBMC menu - /// * grabScreensaver : Flag indicating that the frame-grabber is on(true) when XBMC is on screensaver - /// * enable3DDetection : Flag indicating that the frame-grabber should switch to a 3D compatible modus if a 3D video is playing -// "xbmcVideoChecker" : -// { -// "xbmcAddress" : "127.0.0.1", -// "xbmcTcpPort" : 9090, -// "grabVideo" : true, -// "grabPictures" : true, -// "grabAudio" : true, -// "grabMenu" : false, -// "grabScreensaver" : true, -// "enable3DDetection" : true -// }, - - /// The configuration of the Json server which enables the json remote interface - /// * port : Port at which the json server is started - "jsonServer" : - { - "port" : 19444 - }, - - /// The configuration of the Proto server which enables the protobuffer remote interface - /// * port : Port at which the protobuffer server is started - "protoServer" : - { - "port" : 19445 - }, - - /// The configuration of the boblight server which enables the boblight remote interface - /// * port : Port at which the boblight server is started -// "boblightServer" : -// { -// "port" : 19333, -// "priority" : 900 -// }, - - "endOfJson" : "endOfJson" -} diff --git a/deploy/hummingboard_prerelease.tar.gz.REMOVED.git-id b/deploy/hummingboard_prerelease.tar.gz.REMOVED.git-id deleted file mode 100644 index 25e27e13..00000000 --- a/deploy/hummingboard_prerelease.tar.gz.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -63b2cc4bf190a0c0c996be6db30fcf03109c9625 \ No newline at end of file diff --git a/deploy/hyperion.deps.openelec-imx6.tar.gz.REMOVED.git-id b/deploy/hyperion.deps.openelec-imx6.tar.gz.REMOVED.git-id deleted file mode 100644 index bebbc1ba..00000000 --- a/deploy/hyperion.deps.openelec-imx6.tar.gz.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -198ac3d44bac13ba993069454397ad8c201d37b9 \ No newline at end of file diff --git a/deploy/hyperion.deps.openelec-rpi.tar.gz.REMOVED.git-id b/deploy/hyperion.deps.openelec-rpi.tar.gz.REMOVED.git-id deleted file mode 100644 index 1f708387..00000000 --- a/deploy/hyperion.deps.openelec-rpi.tar.gz.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -a628a0f8dea4332995fe4f32860a114a9b48ea4b \ No newline at end of file diff --git a/deploy/hyperion.deps.openelec-x32x64.tar.gz.REMOVED.git-id b/deploy/hyperion.deps.openelec-x32x64.tar.gz.REMOVED.git-id deleted file mode 100644 index 00d28a05..00000000 --- a/deploy/hyperion.deps.openelec-x32x64.tar.gz.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -dcef2212c5d493fed074dc5b1e222ad9cb6098e8 \ No newline at end of file diff --git a/deploy/hyperion_imx6.tar.gz.REMOVED.git-id b/deploy/hyperion_imx6.tar.gz.REMOVED.git-id deleted file mode 100644 index 0a91a093..00000000 --- a/deploy/hyperion_imx6.tar.gz.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -53710fe42ce52c16b82464e0e01ca6ee6df6912c \ No newline at end of file diff --git a/deploy/hyperion_rpi.tar.gz.REMOVED.git-id b/deploy/hyperion_rpi.tar.gz.REMOVED.git-id deleted file mode 100644 index 66cb6d93..00000000 --- a/deploy/hyperion_rpi.tar.gz.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -89463afae2a82b597e5728ccac952669cc5efad3 \ No newline at end of file diff --git a/deploy/hyperion_wetek.tar.gz.REMOVED.git-id b/deploy/hyperion_wetek.tar.gz.REMOVED.git-id deleted file mode 100644 index 358d9c54..00000000 --- a/deploy/hyperion_wetek.tar.gz.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -2a0699eb2d8b7b44ceee890fa106714fca2b15d0 \ No newline at end of file diff --git a/deploy/hyperion_x32x64.tar.gz.REMOVED.git-id b/deploy/hyperion_x32x64.tar.gz.REMOVED.git-id deleted file mode 100644 index d92319c2..00000000 --- a/deploy/hyperion_x32x64.tar.gz.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -b0ef7e5348fb3710b3e5083a3249fac33b8119a8 \ No newline at end of file diff --git a/doc/calibration/Gamma/000000.png b/doc/calibration/Gamma/000000.png deleted file mode 100644 index f4c092619af0630387ac55a95f30ad3fbef7fe59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6159 zcmeAS@N?(olHy`uVBq!ia0y~yU~gbxV6os}0*a(>3=;uTjKx9jP7LeL$-D$|SkfJR z9T^xl_H+M9WCij$3p^r=85sBugD~Uq{1qt-4B|^XT^vIy;@%!)VM%xN zb!1@J*w6hZkrl}2EbxddW?8eRH*=T@_ zrVwyu7|jddU>GeNz`-zDT7rXNwE6%C1H)+HFj_c_=7rI`z%W`bjMfXI9VkdaFq#)e z^TKFe7|ja|qs?PTA{gyEgTrC8UKp(xM(c&qdSSF)7@croU>F@Xfs_QJLx|vT7;Phg zgJHCd1P+GL!eO*<7#&lEq=C`AFq#)e^TKFe7+s(>x?&BO3r713;G%#k{e{G5%pXL! U^cOEzJ_s_@)78&qol`;+0GFSwH~;_u diff --git a/doc/calibration/Gamma/7F7F7F.png b/doc/calibration/Gamma/7F7F7F.png deleted file mode 100644 index dcf7a3f6b28f027378dddd766bf800223e55e43f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10669 zcmeI0F-yZh7>2*lT5W8L9Rw8xN8K_ynt0Miut;%n5sQP1gV@DIDB>ar`b&cT03nLt zAUG%pZjK7o#lgWM-hKBA+@CtxO}u`v`SB9h z^Qe+v?A{ixeooEdt?Xm>wYQn)#7nb@zq#I3cfNExi6&7XHE$O z(SD#qR0fby888Pg1LlA^zyd4?>jLY7ut(A+fCX591>Xa(01L1H3*<;7jg|s3RkZ?Q z6P1DUg37=iNoBwsybPEF<^T(@K&I+@02W{Y7GOchk$e+yUhp~)Ca4aa7gPqq1eM|6 Z=5QW;1<&QMzkNSbb2FsNEt4f%M}NI-`J4a% diff --git a/doc/calibration/Gamma/BFBFBF.png b/doc/calibration/Gamma/BFBFBF.png deleted file mode 100644 index f61f729782206196a590f3b48ea45ed1c5033652..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10670 zcmeAS@N?(olHy`uVBq!ia0y~yU~gbxV6os}1B$%3e9#$4F%}28J29*~C-V}>VM%xN zb!1@J*w6hZkrl}2EbxddW?8eRRa4?LPmf&C*tv zU>I#9frDYRa2PEdM#oekX<#%jjOK;WyfB&FVdQ&MBb@0N|6ZPXGV_ diff --git a/doc/calibration/Gamma/FFFFFF.png b/doc/calibration/Gamma/FFFFFF.png deleted file mode 100644 index 8e5dc2d55055cb8640b0427d7b11ab86fe3f7f6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8642 zcmeH~y-EW?6ot>481uIlA|i`|0Usa%3+=LDCA&qUL{V(SfUq{AkS67#Hdb2NnKFe0 z^8&hPVIyK;VWIXG=`6Q!jt^mVis3K=!@%&}JKvnIH|uuZ$pf$h-)jLA5s+Taj+vEk zxHWCU>a^-L3|{8G%_JSV4Hp<*6q5G1ndgrEoenVh$YDJl_4k3&cHp_2-QCf9#frFi(^Pd z+}oQMvu-;GI0Wwe|NneuyV;kc%X}wnx%AaifNA$F$^G|_Z_Ab6|8HKE&9h&x&()M) zTc=%Hf91{My2GpfR=>add3X8WXL`n`zK74Py>eT$czucaw|Tq2?r7nA$W;?>&-)9O2a>+Yl;TTy2mR`Y%T=41Ev=dZbE z-}h_p%M94;z;-*3FoCBSTkL(1;A_V07uUX_KP{kMP5zRH@1^4Djdt0}*>PP?}L z%A3Xi4zK!K{r>Lf-RXay=^3B;9zM7B%5Bl&^(E%t=I#Ezr|{akz0Z4X%kO^l&HOL9 z`J0ve>azT~{pok!{#k$iUD#V$d&~H(_3z;WxGd&3U%2@W>tQyS=N=%DV5BU7gmy`+ooKGZI(xk9ED@XPy1#@Bd@3{ytvu z-+JA*zwQ4k%b%_Lcy)JteH|mv%RsQhl2HP}QgC7bg&Yuc2sA)tl~@wMA`A^2qsl-b zF&ZG?^e~!2z`-z@Wx&BOS~!4%VYG071jA_IFj_c_=7rI`FxqGwZAAmSV58j%P*E`2 zMuHTGqa7%4IE=QDz`-zDIDms;v~UI#9frDYRaDW8EXyGtgIE?0n(Y!D^$UHjXGCJXs04WGY+enab l80|oT!-2>)l1GJ29rMfYY;z3x`!YcqJzf1=);T3K0RU*(asB`R diff --git a/doc/calibration/Gamma/VGradient_1.png b/doc/calibration/Gamma/VGradient_1.png deleted file mode 100644 index 974b087ef7454249403e1702c24e085911a00a87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12174 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 X*)y(~!q+}o)ZF!KPS)ie1#kTqOf8>x diff --git a/doc/calibration/RGB/blue_00007F.png b/doc/calibration/RGB/blue_00007F.png deleted file mode 100644 index 8ca29242b821769a765051bb71fcb2bd1524c72a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10668 zcmeAS@N?(olHy`uVBq!ia0y~yU~gbxV6os}1B$%3e9#$4F%}28J29*~C-V}>VM%xN zb!1@J*w6hZkrl}2EbxddW?8eRU>F@_hU5w& c2bnoLPgg&ebxsLQ0Cvpx7XSbN diff --git a/doc/calibration/RGB/blue_0000FF.png b/doc/calibration/RGB/blue_0000FF.png deleted file mode 100644 index 727f8cf35baf6657a93ec2ad3364adb02e41ea8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8642 zcmeAS@N?(olHy`uVBq!ia0y~yU~gbxV6os}0*a(>3=;uTjKx9jP7LeL$-D$|SkfJR z9T^xl_H+M9WCij$3p^r=85sBugD~Uq{1qt-42t2NE{-7;ac^%JGBy}6967-Lf8Ob) zmbBf`j}*_Bu>o~4Fl^sj&j_L)XfaEH=!O@riIu{z%=Km_R*jlO*WvsFq&mXiwjUX7%eJCs|ip#7_B0K&6CmQ!D#bfw0Qt3 z4n~^?qs;?QIv8ypj5ZHI>0q>ZFxor-CWF!D!D#aUR2+;p4@R2@pmZ?WJQ!^rfYQNe z^I)`j089p>&4bbA0jM|_Z61s^4?yW)w0SVvJOHJG(dGfYn+Gi0_*Y%z%rD<;u^bcu Mp00i_>zopr08hi$bN~PV diff --git a/doc/calibration/RGB/cyan_007F7F.png b/doc/calibration/RGB/cyan_007F7F.png deleted file mode 100644 index 334e191b3e73a336013559f51ad4b42bd5db85b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10668 zcmeAS@N?(olHy`uVBq!ia0y~yU~gbxV6os}1B$%3e9#$4F%}28J29*~C-V}>VM%xN zb!1@J*w6hZkrl}2EbxddW?8eRU>GeNAi*$N zIE)q!qj_O8FN}_5#80|Yl3WCu#5+oc(J5b3=;uTjKx9jP7LeL$-D$|SkfJR z9T^xl_H+M9WCij$3p^r=85sBugD~Uq{1qt-42t2NE{-7;ac^%JGBPOe9N5rUfBu6) zW8KMM{@CJkKurt`2l9W5f*Jda7BGSs9ugP8d=;JyFfGJp0;V~cr9gB;3nMRxb~x0) z2BH-b9hgD%1cOoSqd~{OFq&)_7)G-Uus9kmE=G&W(Q0C}iX3eoj5du%Ta}=4V6CgVCnZXfG0&3`TpVM%xN zb!1@J*w6hZkrl}2EbxddW?8eRU>F@_hU5w& c2bnoFVdQ&MBb@0AtPd*Z=?k diff --git a/doc/calibration/RGB/green_00FF00.png b/doc/calibration/RGB/green_00FF00.png deleted file mode 100644 index 01e18f1254ff8bbdc9879e0696d210cb8018aa43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8641 zcmeI!u}Z^G7zN;S+geR+6hu&pLj)f{(ZR7PktTyhsuUcw7KFN0$l|1_=-{M_yQ3gf z`vM|5h>La#M~Z!whE!3@j86(wxe#r0HZ! z%;Zel_2~fBM!yW_fyRYKC3~P_!k)}JBEVM%xN zb!1@J*w6hZkrl}2EbxddW?8eRt z;Pfz>LcqZ=nq|PjFj_c(gJHCAfCR&6;V@b_jOK;WyudJ8FO1d;45Mu%a3UDZ3!`~q zG%rBXz-V3=%?qP>VKgs{jx>%Ay#jN==$IR|!0SCiqe*qi}qirN`FpL%skYE@s z97YR=(Y!F47e>caM^`2=jP{)&1;J<=2@(#Y9Vl=(jJA=$!7$o^0tdrr;V@b_kX})G a%-Fe5jw^Sgn(_xw@OirWxvX3=;uTjKx9jP7LeL$-D$|SkfJR z9T^xl_H+M9WCij$3p^r=85sBugD~Uq{1qt-42t2NE{-7;ac^%JGBPOe9N5rUfBu6) zW8KMM{@C<$Kurt`2l9W5f*Jda7BGSs9ugP8d=;JyFfGJp0;V~cr9gB;3nMRxb~x0) z2BH-b9hgD%1cOoSqd~{OFq&)_7)G-Uus9kmE=G&W(Q0C}iX3eoj5du%Ta}=4V6CgVCnZXfG0&3`TpmdK II;Vst0FI>9KmY&$ diff --git a/doc/calibration/RGB/red_7F0000.png b/doc/calibration/RGB/red_7F0000.png deleted file mode 100644 index 7dc59c7d11ec3b2317e768af5324e3214156dff2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10668 zcmeAS@N?(olHy`uVBq!ia0y~yU~gbxV6os}1B$%3e9#$4F%}28J29*~C-V}>VM%xN zb!1@J*w6hZkrl}2EbxddW?8eRU>F@_hU5w& c2bno3=;uTjKx9jP7LeL$-D$|SkfJR z9T^xl_H+M9WCij$3p^r=85sBugD~Uq{1qt-42of%E{-7;ac^%JGBPOe9N5rUfBu6) zW8KMM{@8S&9tMU7`~QNhWMGJwya1+Ecrw7W5Ss~@=46%v(G4w(ydc`)Py-u?R!DSU z2GJ7?7BGTn4~bFjqd~{OFq&+DIdL@0j20K8MJ1?O7_BBotH{yj!D!QHv}rWjGy;_a zqfMjHo)j<{jP@c&n?|7GV083gbmRn-4n~^?qs;?QIv8ypj5ZH|$zZg3Fxor-6$hiu zgVE*zC>@M84@R2@pmZ?WJQ!^r0F%LJ^I)`j04fd!sCi&e%(&(}XTJO6Q{O?Z@O1Ta JS?83{1OQ{u)Xo3^ diff --git a/doc/calibration/RGB/yellow_7F7F00.png b/doc/calibration/RGB/yellow_7F7F00.png deleted file mode 100644 index 0296764528b0606bb360452f27ad9cca22f022e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10668 zcmeAS@N?(olHy`uVBq!ia0y~yU~gbxV6os}1B$%3e9#$4F%}28J29*~C-V}>VM%xN zb!1@J*w6hZkrl}2EbxddW?8eRU>GeNAi*$N zIE)q!qj_O8FN}_5#80|Yl3WCu#5+oc(J5b3=;uTjKx9jP7LeL$-D$|SkfJR z9T^xl_H+M9WCij$3p^r=85sBugD~Uq{1qt-400PiT^vIy;@%!#$je|Lz`XI@{x8$n z<+r3fDrX03VPM#63#L@QfvE{Mm_f8d5AdCjWXh#v4 z21Wy6G!RC6%cC7daCI=+TLuQhXdsLR!sw8}Xm1%@BBBi$Jh;cMqnWu?`}+)OkhG_( KpUXO@geCyAOIi;A