From adfe2a4b23f5cad2c340fdab44bae5a957bd5e53 Mon Sep 17 00:00:00 2001 From: redPanther Date: Tue, 13 Sep 2016 11:51:16 +0200 Subject: [PATCH] effects included in hyperiond binary as qtResource (#237) * implement effects included in hyperiond binary * cleanup * remove install of effects dir. People who wants to develop effects has to copy them from github effect params for initial effects can be changed in config permanently and other effect params can be changed via json (currently only temporarily) * fix schema of fadecandy webui fix display of specific led options * add leddevice write support * cleanup * webui: tune hue code * when use json effect definition from putsiede hyperiond but want to use py script from inside hyperiond use ad a : e.g. fade.py needs a fade.py near the json file, but :fade.py is taken from resource inside hyperiond * add ability to di * add abiloty to diable effcts via hyperion config * use effect name instead of script in active effects and prio register * finally solve open file handle during effect is playing. Now script is read before, then file closed and then t is run by python * fix some webui things - led config tabs - inital loading screen optimize qrc file generation fix compile warning in hyperion.cpp * cleanup * more cleanup --- assets/webconfig/content/leds.html | 67 +- assets/webconfig/css/hyperion.css | 13 + assets/webconfig/index.html | 1 + assets/webconfig/js/content_index.js | 2 + assets/webconfig/js/content_leds.js | 41 +- assets/webconfig/js/hyperion.js | 2 +- assets/webconfig/remote/css/index.css | 609 ----- assets/webconfig/remote/index.html | 69 - .../remote/js/app/api/ChromeLocalStorage.js | 37 - .../remote/js/app/api/ChromeNetwork.js | 57 - .../remote/js/app/api/ChromeTcpSocket.js | 307 --- .../remote/js/app/api/LocalStorage.js | 49 - assets/webconfig/remote/js/app/api/Network.js | 57 - assets/webconfig/remote/js/app/api/Socket.js | 68 - .../webconfig/remote/js/app/api/WebSocket.js | 229 -- .../js/app/controllers/AppController.js | 534 ----- .../remote/js/app/data/ServerControl.js | 201 -- assets/webconfig/remote/js/app/main.js | 150 -- assets/webconfig/remote/js/app/main_chrome.js | 108 - .../remote/js/app/models/Settings.js | 124 - assets/webconfig/remote/js/app/utils/Tools.js | 56 - .../remote/js/app/views/EffectsView.js | 64 - .../webconfig/remote/js/app/views/MainView.js | 402 ---- .../remote/js/app/views/ServerList.js | 199 -- .../remote/js/app/views/SettingsView.js | 259 --- .../webconfig/remote/js/app/views/Slider.js | 134 -- .../remote/js/app/views/TransformView.js | 375 --- assets/webconfig/remote/js/background.js | 17 - assets/webconfig/remote/js/vendor/require.js | 2054 ----------------- assets/webconfig/remote/js/vendor/stapes.js | 594 ----- .../webconfig/remote/js/vendor/tinycolor.js | 1107 --------- assets/webconfig/remote/manifest.json | 32 - assets/webconfig/remote/manifest.webapp | 14 - assets/webconfig/remote/res/colorwheel.png | Bin 498530 -> 0 bytes assets/webconfig/remote/res/fontello.ttf | Bin 7876 -> 0 bytes assets/webconfig/remote/res/fontello.woff | Bin 4772 -> 0 bytes assets/webconfig/remote/res/icon_128.png | Bin 17722 -> 0 bytes bin/create_release.sh | 2 - bin/install_hyperion.sh | 5 +- config/hyperion.config.json.commented | 6 + config/hyperion.config.json.default | 2 - include/effectengine/ActiveEffectDefinition.h | 1 + include/effectengine/EffectEngine.h | 5 +- libsrc/effectengine/CMakeLists.txt | 11 +- libsrc/effectengine/Effect.cpp | 21 +- libsrc/effectengine/Effect.h | 8 +- libsrc/effectengine/EffectEngine.cpp | 91 +- libsrc/effectengine/EffectEngine.qrc | 5 - libsrc/effectengine/EffectEngine.qrc.in | 6 + libsrc/hyperion/Hyperion.cpp | 3 +- libsrc/hyperion/hyperion.schema.json | 4 + libsrc/jsonserver/JsonClientConnection.cpp | 1 + .../leddevice/schemas/schema-fadecandy.json | 2 + src/hyperiond/CMakeLists.txt | 1 - 54 files changed, 205 insertions(+), 8001 deletions(-) delete mode 100644 assets/webconfig/remote/css/index.css delete mode 100644 assets/webconfig/remote/index.html delete mode 100644 assets/webconfig/remote/js/app/api/ChromeLocalStorage.js delete mode 100644 assets/webconfig/remote/js/app/api/ChromeNetwork.js delete mode 100644 assets/webconfig/remote/js/app/api/ChromeTcpSocket.js delete mode 100644 assets/webconfig/remote/js/app/api/LocalStorage.js delete mode 100644 assets/webconfig/remote/js/app/api/Network.js delete mode 100644 assets/webconfig/remote/js/app/api/Socket.js delete mode 100644 assets/webconfig/remote/js/app/api/WebSocket.js delete mode 100644 assets/webconfig/remote/js/app/controllers/AppController.js delete mode 100644 assets/webconfig/remote/js/app/data/ServerControl.js delete mode 100644 assets/webconfig/remote/js/app/main.js delete mode 100644 assets/webconfig/remote/js/app/main_chrome.js delete mode 100644 assets/webconfig/remote/js/app/models/Settings.js delete mode 100644 assets/webconfig/remote/js/app/utils/Tools.js delete mode 100644 assets/webconfig/remote/js/app/views/EffectsView.js delete mode 100644 assets/webconfig/remote/js/app/views/MainView.js delete mode 100644 assets/webconfig/remote/js/app/views/ServerList.js delete mode 100644 assets/webconfig/remote/js/app/views/SettingsView.js delete mode 100644 assets/webconfig/remote/js/app/views/Slider.js delete mode 100644 assets/webconfig/remote/js/app/views/TransformView.js delete mode 100644 assets/webconfig/remote/js/background.js delete mode 100644 assets/webconfig/remote/js/vendor/require.js delete mode 100644 assets/webconfig/remote/js/vendor/stapes.js delete mode 100644 assets/webconfig/remote/js/vendor/tinycolor.js delete mode 100644 assets/webconfig/remote/manifest.json delete mode 100644 assets/webconfig/remote/manifest.webapp delete mode 100644 assets/webconfig/remote/res/colorwheel.png delete mode 100644 assets/webconfig/remote/res/fontello.ttf delete mode 100644 assets/webconfig/remote/res/fontello.woff delete mode 100644 assets/webconfig/remote/res/icon_128.png delete mode 100644 libsrc/effectengine/EffectEngine.qrc create mode 100644 libsrc/effectengine/EffectEngine.qrc.in diff --git a/assets/webconfig/content/leds.html b/assets/webconfig/content/leds.html index bbe6165b..fc07e36f 100644 --- a/assets/webconfig/content/leds.html +++ b/assets/webconfig/content/leds.html @@ -44,49 +44,40 @@