diff --git a/bin/update_hyperion.sh b/bin/update_hyperion.sh deleted file mode 100755 index 0ed3d3fa..00000000 --- a/bin/update_hyperion.sh +++ /dev/null @@ -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 https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperiond -P /usr/bin/ -chmod +x /usr/bin/hyperiond - -# Get the Hyperion command line utility -wget -N https://raw.github.com/tvdzwan/hyperion/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 https://raw.github.com/tvdzwan/hyperion/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 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 -P /etc/init/ -O hyperion.conf -fi - -# Start the hyperion daemon -/sbin/initctl start hyperion diff --git a/config/hyperion.config.json b/config/hyperion.config.json index c232cac0..3ed2b855 100644 --- a/config/hyperion.config.json +++ b/config/hyperion.config.json @@ -364,7 +364,8 @@ "/opt/hyperion/effects" ] }, - "Bootsequence" : + + "bootsequence" : { "effect" : "Rainbow swirl fast", "duration_ms" : 3000 diff --git a/deploy/hyperion.tar.gz b/deploy/hyperion.tar.gz deleted file mode 100644 index c2b7cea9..00000000 Binary files a/deploy/hyperion.tar.gz and /dev/null differ diff --git a/deploy/hyperion.tar.gz.REMOVED.git-id b/deploy/hyperion.tar.gz.REMOVED.git-id new file mode 100644 index 00000000..bf091ef6 --- /dev/null +++ b/deploy/hyperion.tar.gz.REMOVED.git-id @@ -0,0 +1 @@ +e7d6f548d20e8a1dd817e4200fbedff8f7b042f9 \ No newline at end of file diff --git a/include/effectengine/EffectEngine.h b/include/effectengine/EffectEngine.h index bf33ef3a..bea45576 100644 --- a/include/effectengine/EffectEngine.h +++ b/include/effectengine/EffectEngine.h @@ -35,9 +35,6 @@ public slots: /// Run the specified effect on the given priority channel and optionally specify a timeout int runEffect(const std::string &effectName, const Json::Value & args, int priority, int timeout = -1); - /// Run the specified effect on the given priority channel and optionally specify a timeout - int runEffectScript(const std::string &script, const Json::Value & args, int priority, int timeout = -1); - /// Clear any effect running on the provided channel void channelCleared(int priority); @@ -47,6 +44,10 @@ public slots: private slots: void effectFinished(Effect * effect); +private: + /// Run the specified effect on the given priority channel and optionally specify a timeout + int runEffectScript(const std::string &script, const Json::Value & args, int priority, int timeout = -1); + private: Hyperion * _hyperion; diff --git a/include/hyperion/Hyperion.h b/include/hyperion/Hyperion.h index b4fc0f1c..cb092c2e 100644 --- a/include/hyperion/Hyperion.h +++ b/include/hyperion/Hyperion.h @@ -157,13 +157,6 @@ public slots: /// @param timout The timeout of the effect (after the timout, the effect will be cleared) int setEffect(const std::string & effectName, const Json::Value & args, int priority, int timeout = -1); - /// Run the specified effect script on the given priority channel and optionally specify a timeout - /// @param script path of the effect script - /// @param args arguments of the effect script - /// @param priority The priority channel of the effect - /// @param timout The timeout of the effect (after the timout, the effect will be cleared) - int setEffectScript(const std::string &script, const Json::Value &args, int priority, int timeout); - public: static LedDevice * createDevice(const Json::Value & deviceConfig); static ColorOrder createColorOrder(const Json::Value & deviceConfig); diff --git a/libsrc/hyperion/Hyperion.cpp b/libsrc/hyperion/Hyperion.cpp index af71daae..2874ffbb 100644 --- a/libsrc/hyperion/Hyperion.cpp +++ b/libsrc/hyperion/Hyperion.cpp @@ -502,11 +502,6 @@ int Hyperion::setEffect(const std::string &effectName, const Json::Value &args, return _effectEngine->runEffect(effectName, args, priority, timeout); } -int Hyperion::setEffectScript(const std::string &script, const Json::Value &args, int priority, int timeout) -{ - return _effectEngine->runEffectScript(script, args, priority, timeout); -} - void Hyperion::update() { // Update the muxer, cleaning obsolete priorities diff --git a/src/hyperiond/hyperiond.cpp b/src/hyperiond/hyperiond.cpp index c0b50cb1..3f46c712 100644 --- a/src/hyperiond/hyperiond.cpp +++ b/src/hyperiond/hyperiond.cpp @@ -107,7 +107,11 @@ int main(int argc, char** argv) // if (retVal == 0) if (hyperion.setEffect(effectName, priority, duration_ms) == 0) { - std::cout << "Boot sequence created and started" << std::endl; + std::cout << "Boot sequence(" << effectName << ") created and started" << std::endl; + } + else + { + std::cout << "Failed to start boot sequence: " << effectName << std::endl; } }