From 88bed79c07456fb0a896b04090c7ee12e9abe5e6 Mon Sep 17 00:00:00 2001 From: brindosch Date: Wed, 21 Dec 2016 18:24:03 +0100 Subject: [PATCH] impl options explanation, uiLock (#343) * update schemas * update * killed upstream change * min prio is now 100 * reset watchdog regularly * update * fix * update --- .../LightberryHDUSB1.1.ino | 2 +- assets/webconfig/content/colors.html | 2 +- assets/webconfig/content/dashboard.html | 5 +- assets/webconfig/content/effects.html | 2 +- .../content/effects_configurator.html | 22 +- assets/webconfig/content/grabber.html | 36 +- assets/webconfig/content/kodiconf.html | 20 +- assets/webconfig/content/leds.html | 332 ++++++++++-------- assets/webconfig/content/logging.html | 2 +- assets/webconfig/content/network.html | 84 ++++- assets/webconfig/content/remote.html | 15 +- assets/webconfig/content/support.html | 2 +- assets/webconfig/content/update.html | 2 +- assets/webconfig/content/webconfig.html | 2 +- assets/webconfig/css/hyperion.css | 193 +++++----- assets/webconfig/i18n/de.json | 64 +++- assets/webconfig/i18n/en.json | 66 +++- assets/webconfig/index.html | 31 +- .../js/content_effectsconfigurator.js | 6 +- assets/webconfig/js/content_grabber.js | 27 +- assets/webconfig/js/content_index.js | 29 +- assets/webconfig/js/content_kodi.js | 7 +- assets/webconfig/js/content_leds.js | 8 +- assets/webconfig/js/content_logging.js | 2 +- assets/webconfig/js/content_network.js | 61 +++- assets/webconfig/js/content_remote.js | 34 +- assets/webconfig/js/hyperion.js | 18 +- assets/webconfig/js/lib/jsoneditor.js | 75 ++-- assets/webconfig/js/ui_utils.js | 97 ++++- effects/candle.json | 2 +- effects/schema/candle.schema.json | 14 +- libsrc/hyperion/ImageProcessor.cpp | 2 +- libsrc/hyperion/hyperion.schema.json | 8 +- libsrc/jsonserver/JsonClientConnection.cpp | 6 +- 34 files changed, 879 insertions(+), 399 deletions(-) diff --git a/assets/firmware/arduino/adalight_lightberry_ws2801/LightberryHDUSB1.1.ino b/assets/firmware/arduino/adalight_lightberry_ws2801/LightberryHDUSB1.1.ino index 9dfb1da2..0f14b0e2 100644 --- a/assets/firmware/arduino/adalight_lightberry_ws2801/LightberryHDUSB1.1.ino +++ b/assets/firmware/arduino/adalight_lightberry_ws2801/LightberryHDUSB1.1.ino @@ -270,4 +270,4 @@ void setup() void loop() { // Not used. See note in setup() function. -} +} diff --git a/assets/webconfig/content/colors.html b/assets/webconfig/content/colors.html index 46c8557c..51c8c730 100644 --- a/assets/webconfig/content/colors.html +++ b/assets/webconfig/content/colors.html @@ -5,8 +5,8 @@

Image Processing

Color calibration, smoothing (color transistions) and detection of blackbars.

-
+
diff --git a/assets/webconfig/content/dashboard.html b/assets/webconfig/content/dashboard.html index bc4e4dd6..b8b837f0 100644 --- a/assets/webconfig/content/dashboard.html +++ b/assets/webconfig/content/dashboard.html @@ -4,8 +4,9 @@

Dashboard

The dashboard give you a quick overview about the status of Hyperion and show you the latest news of the Hyperion Blog.

+
-
+
@@ -69,7 +70,7 @@
- +
diff --git a/assets/webconfig/content/effects.html b/assets/webconfig/content/effects.html index beff7e8f..4f3002e9 100644 --- a/assets/webconfig/content/effects.html +++ b/assets/webconfig/content/effects.html @@ -4,8 +4,8 @@

Effects

Setting up a booteffect/color that is visible after Hyperion startup. Configure a background effect/color which is active, when all capture sources are disabled (also temporarily via Kodi Watch)

+
-
diff --git a/assets/webconfig/content/effects_configurator.html b/assets/webconfig/content/effects_configurator.html index 4a4e4a57..f7530777 100644 --- a/assets/webconfig/content/effects_configurator.html +++ b/assets/webconfig/content/effects_configurator.html @@ -4,20 +4,24 @@

Effects Configurator

Create out of the base effects new effects that are tuned to your liking. Depending on Effect there are options like color, speed, direction and more available.

-
+ +
+
-
-
+ + + + + + + +
+
+
@@ -34,6 +40,8 @@
+
+ diff --git a/assets/webconfig/content/grabber.html b/assets/webconfig/content/grabber.html index a3adf492..0b72c94a 100644 --- a/assets/webconfig/content/grabber.html +++ b/assets/webconfig/content/grabber.html @@ -5,10 +5,40 @@

Capturing Hardware

Hyperion supports two ways on how to get captured pictures for processing and output. The platform grabber which captures internal at the device you are running Hyperion on (best qualitiy) and the USB Grabber which gathers from a connected device the necessary pictures (more calibration work and configuration).

+
+
+
+
+
+
Kodi Watch
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
Kodi Watch
+
+
+
+
+ +
+
+
+
+
+
-
-
-
diff --git a/assets/webconfig/content/kodiconf.html b/assets/webconfig/content/kodiconf.html index f62458d9..9106f650 100644 --- a/assets/webconfig/content/kodiconf.html +++ b/assets/webconfig/content/kodiconf.html @@ -4,14 +4,28 @@

Kodi Watch

The Kodi Watcher enables you to enable and disable the screencapture depending on Kodi state. This is not limited to the same machine, you could observe also a Kodi on any other device at your network.

+
-
-
- +
+
+
+
Kodi Watch
+
+
+
+
+ +
+
+
+
+
+
+
diff --git a/assets/webconfig/content/leds.html b/assets/webconfig/content/leds.html index d4c4e458..6ae1e6bd 100644 --- a/assets/webconfig/content/leds.html +++ b/assets/webconfig/content/leds.html @@ -32,8 +32,9 @@

LED Hardware

The LED controller of youre choice is your way to output the led data via Raspberry PI GPIO, USB or network! Choose one, define your led layout and enjoy the light!

+
-
+