Skip to content

Commit 88bed79

Browse files
brindoschbrindosch
authored
impl options explanation, uiLock (#343)
* update schemas * update * killed upstream change * min prio is now 100 * reset watchdog regularly * update * fix * update
1 parent 0414e3c commit 88bed79

34 files changed

+879
-399
lines changed

‎assets/firmware/arduino/adalight_lightberry_ws2801/LightberryHDUSB1.1.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,4 +270,4 @@ void setup()
270270
void loop()
271271
{
272272
// Not used. See note in setup() function.
273-
}
273+
}

‎assets/webconfig/content/colors.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<h2 class="page-header"><i class="fa fa-photo fa-fw"></i><span data-i18n="main_menu_colors_conf_token">Image Processing</span></h2>
66
<div class="introd">
77
<h4 data-i18n="conf_colors_label_intro">Color calibration, smoothing (color transistions) and detection of blackbars.</h4>
8-
</div>
98
<hr />
9+
</div>
1010
<div id='editor_container'/>
1111
<button class="btn btn-success" id='btn_submit' data-i18n="general_button_savesettings">Save Settings</button>
1212
</div>

‎assets/webconfig/content/dashboard.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
<h2 class="page-header"><i class="fa fa-dashboard fa-fw"></i><span data-i18n="main_menu_dashboard_token">Dashboard</span></h2>
55
<div class="introd">
66
<h4 data-i18n="dashboard_label_intro">The dashboard give you a quick overview about the status of Hyperion and show you the latest news of the Hyperion Blog.</h4>
7+
<hr />
78
</div>
8-
<hr>
9+
<div class="row">
910
<div class="col-md-6 col-xxl-4">
1011
<div class="panel panel-default">
1112
<div class="panel-heading">
@@ -69,7 +70,7 @@ <h4 data-i18n="dashboard_label_intro">The dashboard give you a quick overview a
6970
</div>
7071
</div>
7172
</div>
72-
73+
</div>
7374
</div>
7475
<!-- /.col-lg-12 -->
7576
</div>

‎assets/webconfig/content/effects.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<h2 class="page-header"><i class="fa fa-spinner fa-fw"></i><span data-i18n="main_menu_effect_conf_token">Effects</span></h2>
55
<div class="introd">
66
<h4 data-i18n="conf_effects_label_intro">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)</h4>
7+
<hr />
78
</div>
8-
<hr>
99
<div id='editor_container'></div>
1010
<button class="btn btn-success" id='btn_submit' data-i18n="general_button_savesettings">Save Settings</button>
1111
</div>

‎assets/webconfig/content/effects_configurator.html‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,24 @@
44
<h2 class="page-header"><i class="fa fa-cogs fa-fw"></i><span data-i18n="main_menu_effectsconfigurator_token">Effects Configurator</span></h2>
55
<div class="introd">
66
<h4 data-i18n="effectsconfigurator_label_intro">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.</h4>
7-
</div>
87
<hr />
8+
</div>
9+
<div class="row">
10+
<div class="col-xxl-6">
911
<div class="panel panel-default" >
1012
<div class="panel-heading">
1113
<label for="effectslist" data-i18n="effectsconfigurator_label_chooseeff">Choose Base-Effect:</label>
1214
<select id="effectslist" class="form-control" style="color:black;width:auto;margin-left:10px;display:inline-block" />
1315
</div>
1416
<div class="panel-body">
15-
<div class="form-group row">
16-
<label for="name-input" class="col-xs-2 col-form-label" data-i18n="effectsconfigurator_label_effectname">Effect name:</label>
17-
<div class="col-xs-10">
18-
<input class="form-control" type="text" id="name-input">
19-
</div>
20-
</div>
17+
<table>
18+
<tbody>
19+
<tr>
20+
<td class="ltd"><label for="name-input" data-i18n="effectsconfigurator_label_effectname">Effect name:</label></td>
21+
<td class="itd"><input class="form-control" type="text" id="name-input" /></td>
22+
</tr>
23+
</tbody>
24+
</table>
2125
<div id="editor_container" />
2226
</div>
2327
<div class="panel-footer" id="eff_footer">
@@ -27,13 +31,17 @@ <h4 data-i18n="effectsconfigurator_label_intro">Create out of the base effects
2731
<button class="btn btn-primary pull-right" id='btn_write' data-i18n="effectsconfigurator_button_saveeffect">Save Effect</button>
2832
</div>
2933
</div>
34+
</div>
35+
<div class="col-xxl-6">
3036
<div class="panel panel-default" >
3137
<div class="panel-heading">
3238
<label for="effectsdellist" data-i18n="effectsconfigurator_label_deleffect">Delete Effect:</label>
3339
<select id="effectsdellist" class="form-control" style="color:black;width:auto;margin-left:10px;display:inline-block" />
3440
<button class="btn btn-primary pull-right" id='btn_delete' data-i18n="effectsconfigurator_button_deleffect">Delete Effect</button>
3541
</div>
3642
</div>
43+
</div>
44+
</div>
3745
</div>
3846
</div>
3947
</div>

‎assets/webconfig/content/grabber.html‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,40 @@
55
<h2 class="page-header"><i class="fa fa-camera fa-fw"></i><span data-i18n="main_menu_grabber_conf_token">Capturing Hardware</span></h2>
66
<div class="introd">
77
<h4 data-i18n="conf_grabber_label_intro">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).</h4>
8+
<hr />
9+
</div>
10+
<div class="row">
11+
<div class="col-lg-6">
12+
<div class="panel panel-default">
13+
<div class="panel-heading"><i class="fa fa-camera fa-fw"></i><span data-i18n="edt_conf_fg_heading_title">Kodi Watch</span></div>
14+
<div class="panel-body">
15+
<div id='editor_container_fg'/>
16+
</div>
17+
<div class="panel-footer">
18+
<button class="btn btn-success" id='btn_submit_fg' data-i18n="general_button_savesettings">Save Settings</button>
19+
</div>
20+
</div>
21+
</div>
22+
<div class="col-lg-6">
23+
<div id="opt_expl_fg"></div>
24+
</div>
25+
</div>
26+
<div class="row">
27+
<div class="col-lg-6">
28+
<div class="panel panel-default">
29+
<div class="panel-heading"><i class="fa fa-camera fa-fw"></i><span data-i18n="edt_conf_v4l2_heading_title">Kodi Watch</span></div>
30+
<div class="panel-body">
31+
<div id='editor_container_v4l2'/>
32+
</div>
33+
<div class="panel-footer">
34+
<button class="btn btn-success" id='btn_submit_v4l2' data-i18n="general_button_savesettings">Save Settings</button>
35+
</div>
36+
</div>
37+
</div>
38+
<div class="col-lg-6">
39+
<div id="opt_expl_v4l2"></div>
40+
</div>
841
</div>
9-
<hr />
10-
<div id='editor_container'/>
11-
<button class="btn btn-success" id='btn_submit' data-i18n="general_button_savesettings">Save Settings</button>
1242
</div>
1343
</div>
1444
</div>

‎assets/webconfig/content/kodiconf.html‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,28 @@
44
<h2 class="page-header"><i class="fa fa-play-circle-o fa-fw"></i><span data-i18n="conf_kodi_label_title">Kodi Watch</span></h2>
55
<div class="introd">
66
<h4 data-i18n="conf_kodi_label_intro">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.</h4>
7+
<hr />
78
</div>
8-
<hr />
99
<div class="alert alert-info" role="alert">
1010
<strong>HINT 1:</strong> In any case you need to enable the remote control for Kodi. Please checkout Wiki for instructions. LINK<br>
1111
<strong>HINT 2:</strong> If you just use a USB-Grabber you could enable the Kodi Watch for this separately at the USB-Grabber page.
1212
</div>
13-
<div id='editor_container'/>
14-
<button class="btn btn-success" id='btn_submit' data-i18n="general_button_savesettings">Save Settings</button>
13+
<div class="row">
14+
<div class="col-lg-6">
15+
<div class="panel panel-default">
16+
<div class="panel-heading"><i class="fa fa-play-circle-o fa-fw"></i><span data-i18n="conf_kodi_label_title">Kodi Watch</span></div>
17+
<div class="panel-body">
18+
<div id='editor_container'/>
19+
</div>
20+
<div class="panel-footer">
21+
<button class="btn btn-success" id='btn_submit' data-i18n="general_button_savesettings">Save Settings</button>
22+
</div>
23+
</div>
24+
</div>
25+
<div class="col-lg-6">
26+
<div id="opt_expl"></div>
27+
</div>
28+
</div>
1529
</div>
1630
</div>
1731
</div>

0 commit comments

Comments
 (0)