frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Webn (#2) (#358)

Browse Source 
* upd

* upd

* typo

* update ieff

* typo

* ..

* try

* ..

* rm enum

* .

* .

* split initialeff

* upd schema

* ..

* upd

* .

* .

* .

* update

* update
This commit is contained in:
brindosch 2017-01-04 10:55:10 +01:00 committed by redPanther
parent 2906ec041a
commit c433504b81
37 changed files with 884 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
assets/webconfig/content/effects.html
View File

@ -6,8 +6,54 @@
<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>
<hr />
</div>
<div id='editor_container'></div>
<button class="btn btn-success" id='btn_submit' data-i18n="general_button_savesettings">Save Settings</button>
<div class="row">
<div class="col-lg-6">
<div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-spinner fa-fw"></i><span data-i18n="edt_conf_effp_heading_title">Effect Paths</span></div>
<div class="panel-body">
<div id='editor_container_effects'/>
</div>
<div class="panel-footer">
<button class="btn btn-success" id='btn_submit_effects' data-i18n="general_button_savesettings">Save Settings</button>
</div>
</div>
</div>
<div class="col-lg-6">
<div id="opt_expl_effects"></div>
</div>
</div>
<div class="row">
<div class="col-lg-6">
<div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-spinner fa-fw"></i><span data-i18n="edt_conf_fge_heading_title">Kodi Watch</span></div>
<div class="panel-body">
<div id='editor_container_foregroundEffect'/>
</div>
<div class="panel-footer">
<button class="btn btn-success" id='btn_submit_foregroundEffect' data-i18n="general_button_savesettings">Save Settings</button>
</div>
</div>
</div>
<div class="col-lg-6">
<div id="opt_expl_foregroundEffect"></div>
</div>
</div>
<div class="row">
<div class="col-lg-6">
<div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-spinner fa-fw"></i><span data-i18n="edt_conf_bge_heading_title">Kodi Watch</span></div>
<div class="panel-body">
<div id='editor_container_backgroundEffect'/>
</div>
<div class="panel-footer">
<button class="btn btn-success" id='btn_submit_backgroundEffect' data-i18n="general_button_savesettings">Save Settings</button>
</div>
</div>
</div>
<div class="col-lg-6">
<div id="opt_expl_backgroundEffect"></div>
</div>
</div>
</div>
</div>
</div>

20
assets/webconfig/content/general.html
View File

@ -1,13 +1,27 @@
<div class="container-fluid">
<div class="row">
<div class="col-lg-12">
<h2 class="page-header"><i class="fa fa-play-wrench-o fa-fw"></i><span data-i18n="conf_general_label_title">General</span></h2>
<h2 class="page-header"><i class="fa fa-wrench fa-fw"></i><span data-i18n="conf_general_label_title">General</span></h2>
<div class="introd">
<h4 data-i18n="conf_general_label_intro"></h4>
</div>
<hr />
<div id='editor_container'/>
<button class="btn btn-success" id='btn_submit' data-i18n="general_button_savesettings">Save Settings</button>
<div class="row">
<div class="col-lg-6">
<div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-wrench fa-fw"></i><span data-i18n="edt_conf_gen_heading_title">General</span></div>
<div class="panel-body">
<div id='editor_container'/>
</div>
<div class="panel-footer">
<button class="btn btn-success" id='btn_submit' data-i18n="general_button_savesettings">Save Settings</button>
</div>
</div>
</div>
<div class="col-lg-6">
<div id="opt_expl"></div>
</div>
</div>
</div>
</div>
</div>

3
assets/webconfig/content/grabber.html
View File

@ -22,8 +22,7 @@
<div class="col-lg-6">
<div id="opt_expl_fg"></div>
</div>
</div>
<div class="row">
<div class="col-lg-6">
<div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-camera fa-fw"></i><span data-i18n="edt_conf_v4l2_heading_title">Kodi Watch</span></div>

18
assets/webconfig/content/webconfig.html
View File

@ -6,8 +6,22 @@
<h4 data-i18n="conf_webconfig_label_intro">Webinterface settings. Edit wisely</h4>
<hr />
</div>
<div id='editor_container'/>
<button class="btn btn-success" id='btn_submit' data-i18n="general_button_savesettings">Save Settings</button>
<div class="row">
<div class="col-lg-6">
<div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-wrench fa-fw"></i><span data-i18n="edt_conf_webc_heading_title">webconfig</span></div>
<div class="panel-body">
<div id='editor_container'/>
</div>
<div class="panel-footer">
<button class="btn btn-success" id='btn_submit' data-i18n="general_button_savesettings">Save Settings</button>
</div>
</div>
</div>
<div class="col-lg-6">
<div id="opt_expl_webconfig"></div>
</div>
</div>
</div>
</div>
</div>

6
assets/webconfig/css/hyperion.css
View File

@ -29,7 +29,8 @@ table.borderless td,table.borderless th{border: none !important;}
.navbar-brand{padding: 5px;padding-left:20px;height:60px;}
.sidebar{margin-top:61px;padding-top:20px;}
.dropdown{font-size:18px;}
@media (max-width: 767px) {.sidebar{margin-top:0px;padding-top:0px !important;} .introd{display:none}}
@media (max-width: 767px) {.sidebar{margin-top:0px;padding-top:0px !important;}}
@media (max-width: 1000px) {.introd{display:none}}
.page-header{margin-top:15px;}
/*Panels*/
@ -105,7 +106,8 @@ table.borderless td,table.borderless th{border: none !important;}
@media (min-width: 1500px) {
.col-xxl-1, .col-xxl-2, .col-xxl-3, .col-xxl-4, .col-xxl-5, .col-xxl-6, .col-xxl-7, .col-xxl-8, .col-xxl-9, .col-xxl-10, .col-xxl-11, .col-xxl-12 {
float: left;
padding:0 15px;
padding-left:15px;
padding-right:15px;
}
.col-xxl-12 {
width: 100%;

80
assets/webconfig/i18n/de.json
View File

@ -27,10 +27,15 @@
"general_comp_BOBLIGHTSERVER" : "Boblight Server",
"general_comp_GRABBER" : "Plattform Aufnahme",
"general_comp_V4L" : "USB Aufnahme",
"general_col_red" : "rot",
"general_col_green" : "grün",
"general_col_blue" : "blau",
"general_button_savesettings" : "Einstellungen speichern",
"general_btn_ok" : "OK",
"general_btn_abort" : "Abbrechen",
"general_btn_cancel" : "Abbrechen",
"general_btn_continue" : "Fortfahren",
"general_btn_save" : "Speichern",
"general_btn_saverestart" : "Speichern und neustarten",
"general_btn_restarthyperion" : "Hyperion neustarten",
"dashboard_label_intro" : "Das Dashboard zeigt dir Informationen zum Systemstatus, ob Updates verfügbar sind, den Komponentenstatus sowie die letzten Blog-Posts vom Hyperion Team.",
"dashboard_infobox_label_title" : "Information",
@ -62,8 +67,8 @@
"main_menu_input_selection_token" : "Eingabeauswahl",
"main_menu_logging_token" : "Protokoll",
"main_menu_webconfig_token" : "Web konfiguration",
"conf_general_label_title" : "All Einstellungen",
"conf_general_label_intro" : " ",
"conf_general_label_title" : "Allgemeine Einstellungen",
"conf_general_label_intro" : "Grundsätzliche Einstellungen zu Hyperion oder WebUI, die in keine andere Kategorie passen.",
"conf_helptable_option" : "Option",
"conf_helptable_expl" : "Erklärung",
"conf_effects_label_intro" : "Stelle einen Effekt oder Farbe ein, der beim Starten sichtbar sein soll. Stelle einen Hintergrundeffekt/Farbe ein der erst sichtbar wird, wenn alle Bildquellen abgeschaltet sind (Das gilt ebenfalls für temporäres abschalten mithilfe der Kodi Überwachung).",
@ -200,20 +205,28 @@
"infoDialog_leds_gap_text" : "Deine LED Lücke/Position ist größer als die Anzahl der LEDs, verringere die Lückenposition und/oder Lückenlänge!",
"InfoDialog_leds_validfail_title" : "JSON Überprüfung fehlgeschlagen!",
"infoDialog_effconf_deleted_title" : "Effekt entnfernt!",
"infoDialog_effconf_deleted_text" : "Der Effekt $1 wurde erfolgreich entfernt!",
"infoDialog_effconf_deleted_text" : "Der Effekt \"$1\" wurde erfolgreich entfernt!",
"infoDialog_effconf_created_title" : "Effekt erstellt!",
"infoDialog_effconf_created_text" : "Der Effekt $1 wurde erfolgreich erstellt!",
"infoDialog_effconf_invalidvalue_title" : "Fehlerhafte Werte!",
"infoDialog_effconf_invalidvalue_text" : "Es wurden unzulässige Werte eingetragen, überprüfe das rot markierte Feld und versuche es erneut!",
"infoDialog_effconf_created_text" : "Der Effekt \"$1\" wurde erfolgreich erstellt!",
"infoDialog_effconf_invalidvalue_title" : "Fehlerhafter Wert!",
"infoDialog_effconf_invalidvalue_text" : "Es wurde ein unzulässiger Wert eingetragen, überprüfe das rot markierte Feld und versuche es erneut!",
"InfoDialog_lang_title" : "Spracheinstellung",
"InfoDialog_lang_text" : "Sollte dir die Vorauswahl der automatischen Spracherkennung nicht gefallen, kannst du die Sprache hier manuell festlegen.",
"InfoDialog_access_title" : "Zugriffsstufe",
"InfoDialog_access_text" : "Abhängig von der Stufe hast du Zugriff auf mehr oder weniger Einstellungen. Empfohlen ist 'Standard'.",
"edt_general_heading_title" : "Allgemeine Einstellungen",
"edt_general_name_title" : "Name der Konfiguration",
"InfoDialog_nowrite_title" : "Fehler beim Schreibzugriff!",
"InfoDialog_nowrite_text" : "Hyperion hat keinen Schreibzugriff auf die aktuell geladene Konfiguration. Bitte korrigiere die Dateizugriffsrechte um fortzufahren.",
"InfoDialog_nowrite_foottext" : "Die Webkonfiguration wird automatisch wieder freigegeben, sobald das Problem behoben wurde!",
"infoDialog_wizrgb_title" : "Erfolg!",
"infoDialog_wizrgb_text" : "Deine RGB Byte Reihenfolge ist bereits richtig eingestellt.",
"wiz_rgb_title" : "RGB Byte Reihenfolge Assistent",
"wiz_rgb_intro1" : "Dieser Assisent wird dir dabei helfen die richtige Byte Reihenfolge für deine leds zu finden. Klicke auf Fortfahren um zu beginnen.",
"wiz_rgb_intro2" : "Wann benötigt man diesen Assistenten? Zur Erstkonfiguration oder wenn deine LEDs zb rot leuchten sollten, sie aber blau oder grün sind.",
"wiz_rgb_expl" : "Der Farbpunkt ändert alle x Sekunden die Farbe (rot, grün), zur selben Zeit ändern deine LEDs die Farbe ebenfalls. Beantworte die Fragen unten, um deine RGB Byte Reihenfolge zu überprüfen/korrigieren.",
"wiz_rgb_switchevery" : "Ändere Farbe alle...",
"wiz_rgb_q" : "Welche Farbe haben deine LEDs, wenn der Farbpunkt oben...",
"wiz_rgb_qrend" : "...rot ist?",
"wiz_rgb_qgend" : "...grün ist?",
"edt_dev_general_heading_title" : "Allgemeine Einstellungen",
"edt_dev_general_ledCount_title" : "Anzahl Hardware LEDs",
"edt_dev_general_colorOrder_title" : "RGB Byte Reihenfolge",
@ -268,7 +281,39 @@
"edt_conf_general_priority_expl" : "Die Priorität dieser Komponente.",
"edt_conf_general_port_title" : "Port",
"edt_conf_general_port_expl" : "Der genutzte Port.",
"edt_conf_enum_color" : "Farbe",
"edt_conf_enum_effect" : "Effekt",
"edt_conf_enum_multicolor_mean" : "Mehrfarbig",
"edt_conf_enum_unicolor_mean" : "Einfarbig",
"edt_conf_enum_rgb" : "RGB",
"edt_conf_enum_bgr" : "BGR",
"edt_conf_enum_rbg" : "RBG",
"edt_conf_enum_brg" : "BRG",
"edt_conf_enum_gbr" : "GBR",
"edt_conf_enum_grb" : "GRB",
"edt_conf_enum_linear" : "Linear",
"edt_conf_enum_PAL" : "PAL",
"edt_conf_enum_NTSC" : "NTSC",
"edt_conf_gen_heading_title" : "Allgemeine Einstellungen",
"edt_conf_gen_name_title" : "Name der Konfiguration",
"edt_conf_gen_name_expl" : "Der Name wird verwendet, um Hyperion besser zu identifizieren. (Hilfreich bei mehreren Instanzen)",
"edt_conf_gen_showOptHelp_title" : "Zeige Erklärungen",
"edt_conf_gen_showOptHelp_expl" : "Zeige alle verfügbaren Options-Erklärungen. Empfohlen für Anfänger",
"edt_conf_color_heading_title" : "Farbkalibrierung",
"edt_conf_color_channelAdjustment_header_title" : "Anpassung Farbkanäle",
"edt_conf_color_imageToLedMappingType" : "Bild2LED Zuordnungstyp",
"edt_conf_color_channelAdjustment_enable" : "Aktiviere Farbkanalanpassung",
"edt_conf_color_channelAdjustment_v4l_only" : "Nur für USB Aufnahme",
"edt_conf_color_id" : "ID",
"edt_conf_color_leds" : "LED index",
"edt_conf_color_black" : "Schwarz",
"edt_conf_color_white" : "Weiß",
"edt_conf_color_red" : "Rot",
"edt_conf_color_green" : "Grün",
"edt_conf_color_blue" : "Blau",
"edt_conf_color_cyan" : "Cyan",
"edt_conf_color_magenta" : "Magenta",
"edt_conf_color_yellow" : "Gelb",
"edt_conf_smooth_heading_title" : "Glättung",
"edt_conf_smooth_type_title" : "Art",
"edt_conf_smooth_type_expl" : "Algorithmus der Glättung.",
@ -355,6 +400,16 @@
"edt_conf_kodic_grabScreensaver_expl" : "Wenn aktiviert, ist die Aufnahme aktiv während Kodi pausiert (Video, Musik, Diashow).",
"edt_conf_kodic_enable3DDetection_title" : "Erkenne 3D",
"edt_conf_kodic_enable3DDetection_expl" : "Wenn aktiviert, erkenne und wende den passenden 3D Modus an. (kein MVC und nicht für USB Aufnahme)",
"edt_conf_fge_heading_title" : "Start Effekt/Farbe",
"edt_conf_fge_type_title" : "Typ",
"edt_conf_fge_type_expl" : "Wähle zwischen einem Effekt oder einer Farbe.",
"edt_conf_fge_color_title" : "Farbe",
"edt_conf_fge_color_expl" : "Sofern der Typ \"Farbe\" ist, stelle hier eine Farbe deiner Wahl sein.",
"edt_conf_fge_effect_title" : "Effekt",
"edt_conf_fge_effect_expl" : "Sofern der Typ \"Effekt\" ist, wähle hier einen Effekt deiner Wahl. (Gilt auch für selbst erstellte)",
"edt_conf_fge_duration_ms_title" : "Dauer",
"edt_conf_fge_duration_ms_expl" : "Dauer des Effekts/Farbe beim Hyperion Start.",
"edt_conf_bge_heading_title" : "Hintergrund Effekt/Farbe",
"edt_conf_fw_heading_title" : "Weiterleitung",
"edt_conf_fw_json_title" : "Liste von Json zielen",
"edt_conf_fw_json_expl" : "Ein Json Ziel pro Zeile. Bestehend aus IP:PORT (Beispiel: 127.0.0.1:19446)",
@ -372,6 +427,7 @@
"edt_conf_webc_heading_title" : "Web Konfiguration",
"edt_conf_webc_docroot_title" : "Verzeichnis",
"edt_conf_webc_docroot_expl" : "Lokaler Pfad zum WebUI Wurzelverzeichnis (Nur für WebUI Entwickler)",
"edt_conf_effp_heading_title" : "Effekt Pfade",
"edt_conf_effp_paths_title" : "Effekt Pfad(e)",
"edt_conf_effp_paths_itemtitle" : "Pfad",
"edt_conf_effp_disable_title" : "Deaktivierte Effekte",
@ -394,6 +450,11 @@
"edt_eff_storbe_header_title" : "Stroboskop",
"edt_eff_traces_header_title" : "Farbspuren",
"edt_eff_x-mas_header_title" : "Weihnachten",
"edt_eff_trails_header_title" : "Spuren",
"edt_eff_enum_all" : "Alle",
"edt_eff_enum_all-together" : "Alle zusammen",
"edt_eff_enum_list" : "LED Liste",
"edt_eff_count_title" : "Anzahl",
"edt_eff_color_title" : "Farbe",
"edt_eff_colorrandom_title" : "Zufällige Farbe",
"edt_eff_colorone_title" : "Farbe eins",
@ -428,7 +489,6 @@
"edt_eff_enableshutdown_title" : "Echtes herunterfahren",
"edt_eff_length_title" : "Länge",
"edt_eff_frequency_title" : "Frequenz",
"edt_eff_tails_header_title" : "Trails",
"edt_eff_min_len_title" : "Minimale Länge",
"edt_eff_max_len_title" : "Maximale Länge",
"edt_eff_height_title" : "Höhe",

78
assets/webconfig/i18n/en.json
View File

@ -27,10 +27,15 @@
"general_comp_BOBLIGHTSERVER" : "Boblight Server",
"general_comp_GRABBER" : "Platform Capture",
"general_comp_V4L" : "USB Capture",
"general_col_red" : "red",
"general_col_green" : "green",
"general_col_blue" : "blue",
"general_button_savesettings" : "Save settings",
"general_btn_ok" : "OK",
"general_btn_abort" : "Abort",
"general_btn_cancel" : "Cancel",
"general_btn_continue" : "Continue",
"general_btn_save" : "Save",
"general_btn_saverestart" : "Save and restart",
"general_btn_restarthyperion" : "Restart Hyperion",
"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.",
"dashboard_infobox_label_title" : "Information",
@ -62,8 +67,8 @@
"main_menu_input_selection_token" : "Input Selection",
"main_menu_logging_token" : "Log",
"main_menu_webconfig_token" : "Web configuration",
"conf_general_label_title" : "General setings",
"conf_general_label_intro" : " ",
"conf_general_label_title" : "General settings",
"conf_general_label_intro" : "Basic settings around Hyperion and WebUI that don't fit into another category.",
"conf_helptable_option" : "Option",
"conf_helptable_expl" : "Explanation",
"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)",
@ -200,20 +205,28 @@
"infoDialog_leds_gap_text" : "Your gap length/position is higher than your LED count, lower the gap length or gap position!",
"InfoDialog_leds_validfail_title" : "JSON Validation failed!",
"infoDialog_effconf_deleted_title" : "Effect deleted!",
"infoDialog_effconf_deleted_text" : "The effect $1 has been deleted successfully!",
"infoDialog_effconf_deleted_text" : "The effect \"$1\" has been deleted successfully!",
"infoDialog_effconf_created_title" : "Effect created!",
"infoDialog_effconf_created_text" : "The effect $1 has been created successfully!",
"infoDialog_effconf_invalidvalue_title" : "INVALID VALUE(S)",
"infoDialog_effconf_created_text" : "The effect \"$1\" has been created successfully!",
"infoDialog_effconf_invalidvalue_title" : "INVALID VALUE",
"infoDialog_effconf_invalidvalue_text" : "Please check for red marked input(s) and try again!",
"InfoDialog_lang_title" : "Language setting",
"InfoDialog_lang_text" : "If you don't like the result of the automatic language detection you could overwrite it here.",
"InfoDialog_access_title" : "Level setting",
"InfoDialog_access_text" : "Depending on settings level you could change more or less settings. Recommended is the default level.",
"edt_general_heading_title" : "General Settings",
"edt_general_name_title" : "Configuration name",
"InfoDialog_nowrite_title" : "write permission error!",
"InfoDialog_nowrite_text" : "Hyperion can't write to your current loaded configuration file. Please repair the file permissions to proceed.",
"InfoDialog_nowrite_foottext" : "The WebUI will be unlocked automatically after you solved the problem!",
"infoDialog_wizrgb_title" : "Success",
"infoDialog_wizrgb_text" : "Your RGB Byte Order is already well adjusted.",
"wiz_rgb_title" : "RGB Byte Order Wizard",
"wiz_rgb_intro1" : "This wizard will guide you through the finding process of the correct color order for your leds. Click on continue to begin.",
"wiz_rgb_intro2" : "When do you need this wizard? Example: You set the color red, but you get green or blue. You could also use it for first configuration.",
"wiz_rgb_expl" : "The color dot switches every x seconds the color (red, green), at the same time your leds switch the color too. Answer the questions at the bottom to check/correct your byte order.",
"wiz_rgb_switchevery" : "Switch color every...",
"wiz_rgb_q" : "Which color show your leds, when the color dot above shows...",
"wiz_rgb_qrend" : "...red?",
"wiz_rgb_qgend" : "...green?",
"edt_dev_general_heading_title" : "General Settings",
"edt_dev_general_name_title" : "Configuration name",
"edt_dev_general_ledCount_title" : "Count of all hardware LEDs",
@ -269,7 +282,39 @@
"edt_conf_general_priority_expl" : "The priority of this component",
"edt_conf_general_port_title" : "Port",
"edt_conf_general_port_expl" : "The port that is used.",
"edt_conf_enum_color" : "Color",
"edt_conf_enum_effect" : "Effect",
"edt_conf_enum_multicolor_mean" : "Multicolor",
"edt_conf_enum_unicolor_mean" : "Unicolor",
"edt_conf_enum_rgb" : "RGB",
"edt_conf_enum_bgr" : "BGR",
"edt_conf_enum_rbg" : "RBG",
"edt_conf_enum_brg" : "BRG",
"edt_conf_enum_gbr" : "GBR",
"edt_conf_enum_grb" : "GRB",
"edt_conf_enum_linear" : "Linear",
"edt_conf_enum_PAL" : "PAL",
"edt_conf_enum_NTSC" : "NTSC",
"edt_conf_gen_heading_title" : "General Settings",
"edt_conf_gen_name_title" : "Configuration name",
"edt_conf_gen_name_expl" : "A user defined name which is used to detect Hyperion. (Helpful with more than one Hyperion instance)",
"edt_conf_gen_showOptHelp_title" : "Show explanations",
"edt_conf_gen_showOptHelp_expl" : "Show all available explanations in each section. Highly recommended for beginners!",
"edt_conf_color_heading_title" : "Color Calibration",
"edt_conf_color_channelAdjustment_header_title" : "Color channel adjustments",
"edt_conf_color_imageToLedMappingType" : "Image2led mapping type",
"edt_conf_color_channelAdjustment_enable" : "Enable channel adjustment",
"edt_conf_color_channelAdjustment_v4l_only" : "Assign USB Capture only",
"edt_conf_color_id" : "ID",
"edt_conf_color_leds" : "LED index",
"edt_conf_color_black" : "black",
"edt_conf_color_white" : "white",
"edt_conf_color_red" : "red",
"edt_conf_color_green" : "green",
"edt_conf_color_blue" : "blue",
"edt_conf_color_cyan" : "cyan",
"edt_conf_color_magenta" : "magenta",
"edt_conf_color_yellow" : "yellow",
"edt_conf_smooth_heading_title" : "Smoothing",
"edt_conf_smooth_type_title" : "Type",
"edt_conf_smooth_type_expl" : "Type of smoothing.",
@ -356,6 +401,16 @@
"edt_conf_kodic_grabScreensaver_expl" : "If checked, the capturing is enabled during screensaver, else it's disabled.",
"edt_conf_kodic_enable3DDetection_title" : "Detect 3D",
"edt_conf_kodic_enable3DDetection_expl" : "Detect which 3D mode Kodi is running. (no MVC and not for USB capture)",
"edt_conf_fge_heading_title" : "Boot Effect/Color",
"edt_conf_fge_type_title" : "Type",
"edt_conf_fge_type_expl" : "Choose between a color of effect.",
"edt_conf_fge_color_title" : "Color",
"edt_conf_fge_color_expl" : "If type is \"Color\", set a color of your choice here.",
"edt_conf_fge_effect_title" : "Effect",
"edt_conf_fge_effect_expl" : "If type is \"Effect\", select a effect of your choice (Also self created effects).",
"edt_conf_fge_duration_ms_title" : "Duration",
"edt_conf_fge_duration_ms_expl" : "Duration of Effect/Color during Hyperion startup.",
"edt_conf_bge_heading_title" : "Background Effect/Color",
"edt_conf_fw_heading_title" : "Forwarder",
"edt_conf_fw_json_title" : "List of json clients",
"edt_conf_fw_json_expl" : "One json target per line. Contains IP:PORT (Example: 127.0.0.1:19446)",
@ -373,6 +428,7 @@
"edt_conf_webc_heading_title" : "Web Configuration",
"edt_conf_webc_docroot_title" : "Document Root",
"edt_conf_webc_docroot_expl" : "Local webinterface root path (just for webui developer)",
"edt_conf_effp_heading_title" : "Effekt Paths",
"edt_conf_effp_paths_title" : "Effect Path(s)",
"edt_conf_effp_paths_itemtitle" : "Path",
"edt_conf_effp_disable_title" : "Disabed Effects",
@ -395,6 +451,11 @@
"edt_eff_storbe_header_title" : "Strobe",
"edt_eff_traces_header_title" : "Color Traces",
"edt_eff_x-mas_header_title" : "X-Mas",
"edt_eff_trails_header_title" : "Trails",
"edt_eff_enum_all" : "All",
"edt_eff_enum_all-together" : "All together",
"edt_eff_enum_list" : "LED List",
"edt_eff_count_title" : "Count",
"edt_eff_color_title" : "Color",
"edt_eff_colorrandom_title" : "Random color",
"edt_eff_colorone_title" : "Color one",
@ -429,7 +490,6 @@
"edt_eff_enableshutdown_title" : "Real shutdown",
"edt_eff_length_title" : "Length",
"edt_eff_frequency_title" : "Frequency",
"edt_eff_tails_header_title" : "Trails",
"edt_eff_min_len_title" : "Minimal length",
"edt_eff_max_len_title" : "Maximal length",
"edt_eff_height_title" : "Height",

122
assets/webconfig/index.html
View File

@ -68,7 +68,7 @@
</head>
<body>
<div id="loading_overlay"></div>
<div id="loading_overlay" class="overlay"></div>
<div id="wrapper">
<!-- Navigation -->
@ -101,60 +101,25 @@
<!-- /.dropdown -->
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
<i class="fa fa-bell fa-fw"></i> <i class="fa fa-caret-down"></i>
<i class="fa fa-magic fa-fw"></i> <i class="fa fa-caret-down"></i>
</a>
<ul class="dropdown-menu dropdown-alerts">
<li>
<li id="btn_wizard_byteorder">
<a href="#">
<div>
<i class="fa fa-comment fa-fw"></i> New Comment
<span class="pull-right text-muted small">4 minutes ago</span>
<i class="fa fa-magic fa-fw"></i>
<span data-i18n="wiz_rgb_title"></span>
</div>
</a>
</li>
<li class="divider"></li>
<li>
<li id="btn_wizard_colorcalibration">
<a href="#">
<div>
<i class="fa fa-twitter fa-fw"></i> 3 New Followers
<span class="pull-right text-muted small">12 minutes ago</span>
<i class="fa fa-magic fa-fw"></i> Color Calibration Wizard
</div>
</a>
</li>
<li class="divider"></li>
<li>
<a href="#">
<div>
<i class="fa fa-envelope fa-fw"></i> Message Sent
<span class="pull-right text-muted small">4 minutes ago</span>
</div>
</a>
</li>
<li class="divider"></li>
<li>
<a href="#">
<div>
<i class="fa fa-tasks fa-fw"></i> New Task
<span class="pull-right text-muted small">4 minutes ago</span>
</div>
</a>
</li>
<li class="divider"></li>
<li>
<a href="#">
<div>
<i class="fa fa-upload fa-fw"></i> Server Rebooted
<span class="pull-right text-muted small">4 minutes ago</span>
</div>
</a>
</li>
<li class="divider"></li>
<li>
<a class="text-center" href="#">
<strong>See All Alerts</strong>
<i class="fa fa-angle-right"></i>
</a>
</li>
</ul>
<!-- /.dropdown-alerts -->
</li>
@ -250,6 +215,78 @@
</div>
</div>
<div id="wizard_modal" class="modal fade" role="dialog">
<div class="modal-dialog">
<div id="wizp1" class="modal-content">
<div class="modal-header">
<div class="modal-headertext"><i class="fa fa-magic fa-fw"></i><span data-i18n="wiz_rgb_title">RGB Byte Order Wizard</span></div>
</div>
<center>
<div class="modal-body">
<div class="modal-bodyicon" style="margin-bottom:20px;"><img src="img/hyperion/hyperionlogo.png" alt="Redefine ambient light!"></div>
<h4 class="modal-bodytitle" style="font-weight:bold;text-transform:uppercase;" data-i18n="wiz_rgb_title">RGB Byte Order Wizard</h4>
<p data-i18n="wiz_rgb_intro1"></p>
<p data-i18n="wiz_rgb_intro2" style="font-weight:bold;"></p>
</div>
</center>
<div class="modal-footer">
<center>
<div class="modal-footer-button"></div>
<button type="button" class="btn btn-primary" id="btn_wiz_cont" data-i18n="general_btn_continue">Continue</button>
<button type="button" class="btn btn-danger" id="btn_wiz_cancel" data-i18n="general_btn_cancel">Cancel</button>
</center>
</div>
</div>
<div id="wizp2" class="modal-content" style="display:none">
<div class="modal-header">
<div class="modal-headertext"><i class="fa fa-magic fa-fw"></i><span data-i18n="wiz_rgb_title">RGB Byte Order Wizard</span></div>
</div>
<center>
<div class="modal-body">
<img src="img/hyperion/hyperionlogo.png" alt="Redefine ambient light!" style="margin-bottom:20px">
<p data-i18n="wiz_rgb_expl" style="font-weight:bold">The color dot switches every x seconds the color (red, green), at the same time your leds switch too. Answer the questions at the bottom to check/correct your byte order.</p>
<div class="form-group">
<label data-i18n="wiz_rgb_switchevery">Switch every</label>
<div class="input-group" style="width:100px">
<select id="wiz_switchtime_select" class="form-control"></select>
<div class="input-group-addon" data-i18n="edt_append_s">s</div>
</div>
</div>
<canvas id="wiz_canv_color" width="100" height="100" style="border-radius:60px;background-color:red; display:block; margin: 10px 0;border:4px solid grey;"></canvas>
<label data-i18n="wiz_rgb_q">Which color show your leds, when the color dot above shows...</label>
<table class="table borderless" style="width:200px">
<tbody>
<tr>
<td class="ltd">
<label data-i18n="wiz_rgb_qrend">...red?</label>
</td>
<td class="itd">
<select id="wiz_r_select" class="form-control wselect"></select>
</td>
</tr>
<tr>
<td class="ltd">
<label data-i18n="wiz_rgb_qgend">...green?</label>
</td>
<td class="itd">
<select id="wiz_g_select" class="form-control wselect"></select>
</td>
</tr>
</tbody>
</table>
</div>
</center>
<div class="modal-footer">
<center>
<button type="button" class="btn btn-success" id="btn_wiz_save" data-i18n="general_btn_saverestart">Save and restart</button>
<button type="button" class="btn btn-primary" id="btn_wiz_checkok" data-i18n="general_btn_ok" style="display:none" data-dismiss="modal">Ok</button>
<button type="button" class="btn btn-danger" id="btn_wiz_abort" data-i18n="general_btn_cancel">Cancel</button>
</center>
</div>
</div>
</div>
</div>
<!-- Bootstrap Core JavaScript -->
<script src="/js/lib/bootstrap.min.js"></script>
@ -262,6 +299,7 @@
<script src="/js/lib/jquery-ui.min.js"></script>
<script src="/js/content_index.js"></script>
<script src="/js/localStorage.js"></script>
<script src="/js/wizard.js"></script>
</body>

111
assets/webconfig/js/content_effects.js
View File

@ -1,17 +1,114 @@
var conf_editor = null;
var olddEffects = [];
var editorReady = false;
var effects_editor = null;
var confFgEff = parsedConfJSON.foregroundEffect.effect;
var confBgEff = parsedConfJSON.backgroundEffect.effect;
var foregroundEffect_editor = null;
var backgroundEffect_editor = null;
$(hyperion).one("cmd-config-getschema", function(event) {
schema = parsedConfSchemaJSON.properties;
conf_editor = createJsonEditor('editor_container', {
effects : schema.effects,
initialEffect : schema.initialEffect
}, true);
effects_editor = createJsonEditor('editor_container_effects', {
effects : schema.effects
}, true, true);
$('#btn_submit').off().on('click',function() {
requestWriteConfig(conf_editor.getValue());
foregroundEffect_editor = createJsonEditor('editor_container_foregroundEffect', {
foregroundEffect : schema.foregroundEffect
}, true, true);
backgroundEffect_editor = createJsonEditor('editor_container_backgroundEffect', {
backgroundEffect : schema.backgroundEffect
}, true, true);
effects_editor.on('ready',function() {
editorReady = true;
});
foregroundEffect_editor.on('change',function() {
var type = foregroundEffect_editor.getEditor('root.foregroundEffect.type');
if(type.value == "color")
{
foregroundEffect_editor.getEditor('root.foregroundEffect.effect').disable();
foregroundEffect_editor.getEditor('root.foregroundEffect.color').enable();
}
else
{
foregroundEffect_editor.getEditor('root.foregroundEffect.effect').enable();
foregroundEffect_editor.getEditor('root.foregroundEffect.color').disable();
}
});
backgroundEffect_editor.on('change',function() {
var type = backgroundEffect_editor.getEditor('root.backgroundEffect.type');
if(type.value == "color")
{
backgroundEffect_editor.getEditor('root.backgroundEffect.effect').disable();
backgroundEffect_editor.getEditor('root.backgroundEffect.color').enable();
}
else
{
backgroundEffect_editor.getEditor('root.backgroundEffect.effect').enable();
backgroundEffect_editor.getEditor('root.backgroundEffect.color').disable();
}
});
$('#btn_submit_effects').off().on('click',function() {
requestWriteConfig(effects_editor.getValue());
});
$('#btn_submit_foregroundEffect').off().on('click',function() {
//requestWriteConfig(foregroundEffect_editor.getValue());
console.log(foregroundEffect_editor.getValue());
});
$('#btn_submit_backgroundEffect').off().on('click',function() {
//requestWriteConfig(backgroundEffect_editor.getValue());
console.log(backgroundEffect_editor.getValue());
});
if(showOptHelp)
{
$('#opt_expl_effects').html(createHelpTable(schema.effects.properties, '<i class="fa fa-info-circle fa-fw"></i>'+$.i18n("edt_conf_effp_heading_title")+' '+$.i18n("conf_helptable_expl")));
$('#opt_expl_foregroundEffect').html(createHelpTable(schema.foregroundEffect.properties, '<i class="fa fa-info-circle fa-fw"></i>'+$.i18n("edt_conf_fge_heading_title")+' '+$.i18n("conf_helptable_expl")));
$('#opt_expl_backgroundEffect').html(createHelpTable(schema.backgroundEffect.properties, '<i class="fa fa-info-circle fa-fw"></i>'+$.i18n("edt_conf_bge_heading_title")+' '+$.i18n("conf_helptable_expl")));
}
});
function updateEffectlist(event){
if(editorReady)
{
var newEffects = event.response.info.effects;
if (newEffects.length != olddEffects.length)
{
$('#root_foregroundEffect_effect').html('');
var usrEffArr = [];
var sysEffArr = [];
for(i = 0; i < newEffects.length; i++)
{
var effectName = newEffects[i].name;
if(!/^\:/.test(newEffects[i].file))
usrEffArr.push(effectName);
else
sysEffArr.push(effectName);
}
$('#root_foregroundEffect_effect').append(createSel(usrEffArr, $.i18n('remote_optgroup_usreffets')));
$('#root_foregroundEffect_effect').append(createSel(sysEffArr, $.i18n('remote_optgroup_syseffets')));
$('#root_backgroundEffect_effect').html($('#root_foregroundEffect_effect').html());
olddEffects = newEffects;
$('#root_foregroundEffect_effect').val(confFgEff);
$('#root_foregroundEffect_effect').trigger('change');
$('#root_backgroundEffect_effect').val(confBgEff);
$('#root_backgroundEffect_effect').trigger('change');
}
}
}
$(document).ready( function() {
performTranslation();
requestServerConfigSchema();
$(hyperion).on("cmd-serverinfo",updateEffectlist);
});

7
assets/webconfig/js/content_general.js
View File

@ -4,13 +4,14 @@ $(hyperion).one("cmd-config-getschema", function(event) {
schema = parsedConfSchemaJSON.properties;
conf_editor = createJsonEditor('editor_container', {
general: schema.general
}, true);
$('#editor_container h3').remove();
}, true, true);
$('#btn_submit').off().on('click',function() {
requestWriteConfig(conf_editor.getValue());
});
if(showOptHelp)
$('#opt_expl').html(createHelpTable(schema.general.properties, '<i class="fa fa-info-circle fa-fw"></i>'+$.i18n("edt_conf_gen_heading_title")+' '+$.i18n("conf_helptable_expl")));
});

7
assets/webconfig/js/content_grabber.js
View File

@ -19,8 +19,11 @@ $(hyperion).one("cmd-config-getschema", function(event) {
requestWriteConfig(conf_editor_v4l2.getValue());
});
$('#opt_expl_fg').html(createHelpTable(schema.framegrabber.properties, '<i class="fa fa-camera fa-fw"></i>'+$.i18n("edt_conf_fg_heading_title")));
$('#opt_expl_v4l2').html(createHelpTable(schema.grabberV4L2.items.properties, '<i class="fa fa-camera fa-fw"></i>'+$.i18n("edt_conf_v4l2_heading_title")));
if(showOptHelp)
{
$('#opt_expl_fg').html(createHelpTable(schema.framegrabber.properties, '<i class="fa fa-info-circle fa-fw"></i>'+$.i18n("edt_conf_fg_heading_title")+' '+$.i18n("conf_helptable_expl")));
$('#opt_expl_v4l2').html(createHelpTable(schema.grabberV4L2.items.properties, '<i class="fa fa-info-circle fa-fw"></i>'+$.i18n("edt_conf_v4l2_heading_title")+' '+$.i18n("conf_helptable_expl")));
}
});

2
assets/webconfig/js/content_index.js
View File

@ -2,7 +2,6 @@ $(document).ready( function() {
var uiLock = false;
$("#main-nav").hide();
$("#loading_overlay").addClass("overlay");
loadContentTo("#container_connection_lost","connection_lost");
initWebSocket();
bindNavToContent("#load_dashboard","dashboard",true);
@ -22,6 +21,7 @@ $(document).ready( function() {
bindNavToContent("#load_webconfig","webconfig",false);
$(hyperion).on("cmd-serverinfo",function(event){
showOptHelp = parsedConfJSON.general.showOptHelp;
parsedServerInfoJSON = event.response;
currentVersion = parsedServerInfoJSON.info.hyperion[0].version;
cleanCurrentVersion = currentVersion.replace(/\./g, '');

3
assets/webconfig/js/content_kodi.js
View File

@ -10,7 +10,8 @@ $(hyperion).one("cmd-config-getschema", function(event) {
requestWriteConfig(conf_editor.getValue());
});
$('#opt_expl').html(createHelpTable(schema.kodiVideoChecker.properties, '<i class="fa fa-play-circle-o fa-fw"></i>'+$.i18n("conf_kodi_label_title")));
if(showOptHelp)
$('#opt_expl').html(createHelpTable(schema.kodiVideoChecker.properties, '<i class="fa fa-info-circle fa-fw"></i>'+$.i18n("conf_kodi_label_title")+' '+$.i18n("conf_helptable_expl")));
});

13
assets/webconfig/js/content_network.js
View File

@ -49,11 +49,14 @@ $(hyperion).one("cmd-config-getschema", function(event) {
requestWriteConfig(conf_editor_forw.getValue());
});
$('#opt_expl_jsonserver').html(createHelpTable(schema.jsonServer.properties, '<i class="fa fa-sitemap fa-fw"></i>'+$.i18n("edt_conf_js_heading_title")));
$('#opt_expl_protoserver').html(createHelpTable(schema.protoServer.properties, '<i class="fa fa-sitemap fa-fw"></i>'+$.i18n("edt_conf_ps_heading_title")));
$('#opt_expl_boblightserver').html(createHelpTable(schema.boblightServer.properties, '<i class="fa fa-sitemap fa-fw"></i>'+$.i18n("edt_conf_bobls_heading_title")));
$('#opt_expl_udplistener').html(createHelpTable(schema.udpListener.properties, '<i class="fa fa-sitemap fa-fw"></i>'+$.i18n("edt_conf_udpl_heading_title")));
$('#opt_expl_forwarder').html(createHelpTable(schema.forwarder.properties, '<i class="fa fa-sitemap fa-fw"></i>'+$.i18n("edt_conf_fw_heading_title")));
if(showOptHelp)
{
$('#opt_expl_jsonserver').html(createHelpTable(schema.jsonServer.properties, '<i class="fa fa-info-circle fa-fw"></i>'+$.i18n("edt_conf_js_heading_title")+' '+$.i18n("conf_helptable_expl")));
$('#opt_expl_protoserver').html(createHelpTable(schema.protoServer.properties, '<i class="fa fa-info-circle fa-fw"></i>'+$.i18n("edt_conf_ps_heading_title")));
$('#opt_expl_boblightserver').html(createHelpTable(schema.boblightServer.properties, '<i class="fa fa-info-circle fa-fw"></i>'+$.i18n("edt_conf_bobls_heading_title")+' '+$.i18n("conf_helptable_expl")));
$('#opt_expl_udplistener').html(createHelpTable(schema.udpListener.properties, '<i class="fa fa-info-circle fa-fw"></i>'+$.i18n("edt_conf_udpl_heading_title")+' '+$.i18n("conf_helptable_expl")));
$('#opt_expl_forwarder').html(createHelpTable(schema.forwarder.properties, '<i class="fa fa-info-circle fa-fw"></i>'+$.i18n("edt_conf_fw_heading_title")+' '+$.i18n("conf_helptable_expl")));
}
});

5
assets/webconfig/js/content_webconfig.js
View File

@ -4,11 +4,14 @@ $(hyperion).one("cmd-config-getschema", function(event) {
schema = parsedConfSchemaJSON.properties;
conf_editor = createJsonEditor('editor_container', {
webConfig : schema.webConfig
}, true);
}, true, true);
$('#btn_submit').off().on('click',function() {
requestWriteConfig(conf_editor.getValue());
});
if(showOptHelp)
$('#opt_expl_webconfig').html(createHelpTable(schema.webConfig.properties, '<i class="fa fa-info-circle fa-fw"></i>'+$.i18n("edt_conf_webc_heading_title")+' '+$.i18n("conf_helptable_expl")));
});

5
assets/webconfig/js/hyperion.js
View File

@ -1,5 +1,6 @@
// global vars
var showOptHelp = true;
var currentVersion;
var cleanCurrentVersion;
var latestVersion;
@ -24,7 +25,7 @@ function initRestart()
{
$(hyperion).off();
requestServerConfigReload();
watchdog = 1;
watchdog = 2;
$("#wrapper").fadeOut("slow");
cron();
}
@ -229,8 +230,6 @@ function requestWriteConfig(config)
});
var config_str = JSON.stringify(complete_config);
console.log("save");
console.log(config_str);
sendToHyperion("config","setconfig", '"config":'+config_str);
}

49
assets/webconfig/js/lib/jsoneditor.js
View File

@ -4859,7 +4859,7 @@ JSONEditor.defaults.editors["enum"] = JSONEditor.AbstractEditor.extend({
JSONEditor.defaults.editors.select = JSONEditor.AbstractEditor.extend({
setValue: function(value,initial) {
value = this.typecast(value||'');
value = this.typecast(value||'');
// Sanitize value before setting it
var sanitized = value;
@ -5008,7 +5008,7 @@ JSONEditor.defaults.editors.select = JSONEditor.AbstractEditor.extend({
}
// Other, not supported
else {
throw "'select' editor requires the enum property to be set.";
//throw "'select' editor requires the enum property to be set.";
}
},
build: function() {
@ -5041,23 +5041,11 @@ JSONEditor.defaults.editors.select = JSONEditor.AbstractEditor.extend({
this.value = this.enum_values[0];
},
onInputChange: function() {
var val = this.input.value;
var new_val;
// Invalid option, use first option instead
if(this.enum_options.indexOf(val) === -1) {
new_val = this.enum_values[0];
}
else {
new_val = this.enum_values[this.enum_options.indexOf(val)];
}
// If valid hasn't changed
if(new_val === this.value) return;
var val = this.input.value;
// Store new value and propogate change event
this.value = new_val;
this.onChange(true);
this.value = val;
this.onChange(true);
},
setupSelect2: function() {
// If the Select2 library is loaded use it when we have lots of items
@ -6358,14 +6346,20 @@ JSONEditor.AbstractTheme = Class.extend({
this.setSelectOptions(switcher, options, titles);
},
setSelectOptions: function(select, options, titles) {
titles = titles || [];
select.innerHTML = '';
for(var i=0; i<options.length; i++) {
var option = document.createElement('option');
option.setAttribute('value',options[i]);
option.textContent = titles[i] || options[i];
select.appendChild(option);
}
if (typeof options != "undefined")
{
titles = titles || [];
select.innerHTML = '';
for(var i=0; i<options.length; i++) {
var option = document.createElement('option');
option.setAttribute('value',options[i]);
if (typeof titles[i] != 'undefined' && titles[i].startsWith('edt_'))
option.textContent = $.i18n(titles[i]);
else
option.textContent = titles[i] || options[i];
select.appendChild(option);
}
}
},
getTextareaInput: function() {
var el = document.createElement('textarea');
@ -7056,6 +7050,11 @@ JSONEditor.defaults.resolvers.unshift(function(schema) {
}
}
});
// Use the `select` editor if a string has format "select"
JSONEditor.defaults.resolvers.unshift(function(schema) {
if(schema.type === "string" && schema.format === "select")
return "select";
});
// Specialized editors for arrays of strings
JSONEditor.defaults.resolvers.unshift(function(schema) {
if(schema.type === "array" && schema.items && !(Array.isArray(schema.items)) && schema.uniqueItems && ['string','number','integer'].indexOf(schema.items.type) >= 0) {

3
assets/webconfig/js/localStorage.js
View File

@ -47,10 +47,11 @@
}
else
{
showInfoDialog('warning', "Can't store settings", "Your browser doesn't support localStorage. You can't save a specific language setting (fallback to 'auto detection') and access level (fallback to 'default'). You could still use the webinterface without further issues");
showInfoDialog('warning', "Can't store settings", "Your browser doesn't support localStorage. You can't save a specific language setting (fallback to 'auto detection') and access level (fallback to 'default'). Some wizards may be hidden. You could still use the webinterface without further issues");
initTrans('auto');
$('#btn_setlang').toggle();
$('#btn_setaccess').toggle();
$('#btn_wizard_byteorder').toggle();
}
$('#btn_setlang').off().on('click',function() {

8
assets/webconfig/js/ui_utils.js
View File

@ -80,7 +80,7 @@ function showInfoDialog(type,header,message,btnid)
else if (type == "select"){
$('#modal_dialog .modal-bodyicon').html('<img src="img/hyperion/hyperionlogo.png" alt="Redefine ambient light!">');
$('#modal_dialog .modal-footer-button').html('<button type="button" id="'+btnid+'" class="btn btn-success" data-dismiss="modal">'+$.i18n('general_btn_save')+'</button>');
$('#modal_dialog .modal-footer-button').append('<button type="button" class="btn btn-danger" data-dismiss="modal">'+$.i18n('general_btn_abort')+'</button>');
$('#modal_dialog .modal-footer-button').append('<button type="button" class="btn btn-danger" data-dismiss="modal">'+$.i18n('general_btn_cancel')+'</button>');
}
else if (type == "uilock"){
$('#modal_dialog .modal-bodyicon').html('<img src="img/hyperion/hyperionlogo.png" alt="Redefine ambient light!">');
@ -182,8 +182,10 @@ function createHelpTable(list, phead){
thead.appendChild(createTableTh($.i18n('conf_helptable_option'), $.i18n('conf_helptable_expl')));
for (key in list){
text = list[key].title.replace('title', 'expl');
tbody.appendChild(createTableTd($.i18n(list[key].title), $.i18n(text)));
if(list[key].access != 'system'){
text = list[key].title.replace('title', 'expl');
tbody.appendChild(createTableTd($.i18n(list[key].title), $.i18n(text)));
}
}
table.appendChild(thead);
table.appendChild(tbody);

142
assets/webconfig/js/wizard.js Normal file
View File

@ -0,0 +1,142 @@
$(document).ready( function() {
//clear priority if people reload the page or lost connection while a wizard was active
var wizardStatus = localStorage.getItem("wizardactive");
$(hyperion).one("cmd-config-getschema", function(event) {
if(wizardStatus)
requestPriorityClear();
});
//rgb byte order wizard
var colorIntveralId;
var new_rgb_order;
function changeColor()
{
var color = $("#wiz_canv_color").css('background-color');
if (color == 'rgb(255, 0, 0)')
{
$("#wiz_canv_color").css('background-color','rgb(0, 255, 0)');
requestSetColor('0','255','0');
}
else
{
$("#wiz_canv_color").css('background-color','rgb(255, 0, 0)');
requestSetColor('255','0','0');
}
}
function startWizardRGB()
{
$("#wizard_modal").modal({
backdrop : "static",
keyboard: false,
show: true
});
}
function beginWizardRGB()
{
$("#wiz_switchtime_select").off().on('change',function() {
clearInterval(colorIntveralId);
var time = $("#wiz_switchtime_select").val();
colorIntveralId = setInterval(function() { changeColor(); }, time*1000);
});
$('.wselect').change(function () {
var rgb_order = order = parsedConfJSON.device.colorOrder.split("");
var redS = $("#wiz_r_select").val();
var greenS = $("#wiz_g_select").val();
for (var i = 0; i<order.length; i++)
{
if (redS == order[i])
$('#wiz_g_select option[value='+order[i]+']').attr('disabled',true);
else
$('#wiz_g_select option[value='+order[i]+']').attr('disabled',false);
if (greenS == order[i])
$('#wiz_r_select option[value='+order[i]+']').attr('disabled',true);
else
$('#wiz_r_select option[value='+order[i]+']').attr('disabled',false);
}
if(redS != 'null' && greenS != 'null')
{
$('#btn_wiz_save').attr('disabled',false);
var blueS = parsedConfJSON.device.colorOrder.replace(redS, "").replace(greenS, "");
rgb_order[0] = redS;
rgb_order[1] = greenS;
rgb_order[2] = blueS;
rgb_order = rgb_order.toString().replace(/,/g,"");
var old_rgb_order = parsedConfJSON.device.colorOrder;
if(old_rgb_order == rgb_order)
{
$('#btn_wiz_save').toggle(false);
$('#btn_wiz_checkok').toggle(true);
}
else
{
$('#btn_wiz_save').toggle(true);
$('#btn_wiz_checkok').toggle(false);
}
new_rgb_order = rgb_order
}
else
$('#btn_wiz_save').attr('disabled',true);
});
$("#wiz_switchtime_select").html('');
$("#wiz_switchtime_select").append(createSelOpt('5','5'),createSelOpt('10','10'),createSelOpt('15','15'),createSelOpt('30','30'));
$("#wiz_switchtime_select").trigger('change');
$("#wiz_r_select").html('');
$("#wiz_r_select").append(createSelOpt("null", ""),createSelOpt('r', $.i18n('general_col_red')),createSelOpt('g', $.i18n('general_col_green')),createSelOpt('b', $.i18n('general_col_blue')));
$("#wiz_g_select").html($("#wiz_r_select").html());
$("#wiz_r_select").trigger('change');
requestSetColor('255','0','0');
localStorage.wizardactive = true;
}
$('#btn_wizard_byteorder').off().on('click',function() {
startWizardRGB();
});
$('#btn_wiz_cont').off().on('click',function() {
beginWizardRGB();
$('#wizp1').toggle(false);
$('#wizp2').toggle(true);
});
$('#btn_wiz_abort').off().on('click',function() {
$("#wizard_modal").modal('hide');
$("#wiz_canv_color").css('background-color','rgb(255, 0, 0)');
clearInterval(colorIntveralId);
requestPriorityClear();
localStorage.wizardactive = false;
$('#wizp1').toggle(true);
$('#wizp2').toggle(false);
$('#btn_wiz_save').toggle(true);
$('#btn_wiz_checkok').toggle(false);
});
$('#btn_wiz_cancel').off().on('click',function() {
$("#wizard_modal").modal('hide');
});
$('#btn_wiz_checkok').off().on('click',function() {
showInfoDialog('success', $.i18n('infoDialog_wizrgb_title'), $.i18n('infoDialog_wizrgb_text'));
});
$('#btn_wiz_save').off().on('click',function() {
var devConf = parsedConfJSON.device;
devConf.colorOrder = new_rgb_order;
requestWriteConfig(devConf);
initRestart();
});
});

48
config/hyperion.config.json.commented
View File

@ -6,10 +6,12 @@
{
/// geenral Settings
/// * 'name' : The user friendly name of the hyperion instance (used for network things)
/// * 'configVersion' : don't touch it's an internal value regarding which validation schema for this config is used
/// * 'showOptHelp' : Show option expanations at the webui. Highly recommended for beginners.
/// * 'configVersion' : Don't touch! It's an internal value regarding which validation schema for this config is used.
"general" :
{
"name" : "MyHyperionConfig",
"showOptHelp" : true,
"configVersion" : 2
},
/// set log level: silent warn verbose debug
@ -259,25 +261,37 @@
"grabAudio" : true,
"grabMenu" : false,
"grabPause" : false,
"grabScreensaver" : true,
"enable3DDetection" : true
"grabScreensaver" : false,
"enable3DDetection" : false
},
/// Initial Effect sets a "booteffect" or "color" (foreground-effect) and optional set a "effect" or "color" during inactive grabbers and network receivers (background-effect)
/// * background-effect : 2 options: set a effect (example: ["Rainbow swirl fast"]) or set a color (RGB) (example: [255,134,0])
/// * background-effect-args : Set optional effect arguments (Have a look at the select effect to get the possible values), define it only when needed
/// * foreground-effect : 2 options: set a effect (example: ["Rainbow swirl fast"]) or set a color (RGB) (example: [255,134,0])
/// * foreground-effect-args : Set optional effect arguments (Have a look at the select effect to get the possible values), define it only when needed
/// * foreground-duration_ms : The duration of the selected foreground-effect or color (0=endless)
/// HINT: "foreground-effect" starts always with priority 0, so it blocks all remotes and grabbers if the loop is endless
/// HINT: Set a empty value if you want to disable a component (example: "")
"initialEffect" :
/// foregroundEffect sets a "booteffect" or "bootcolor" during startup for a given period in ms (duration_ms)
/// * enable : if true, foreground effect is enabled
/// * type : choose between "color" or "effect"
/// * color : if type is color, a color is used (RGB) (example: [0,0,255])
/// * effect : if type is effect a effect is used (example: "Rainbow swirl fast")
/// * duration_ms : The duration of the selected effect or color (0=endless)
/// HINT: "foregroundEffect" starts always with priority 0, so it blocks all remotes and grabbers if the duration_ms is endless (0)
"foregroundEffect" :
{
"background-effect" : ["Full color mood blobs"],
//"background-effect-args" : {},
"foreground-effect" : ["Rainbow swirl fast"],
//"foreground-effect-args" : {},
"foreground-duration_ms" : 3000
"enable" : true,
"type" : "effect",
"color" : [0,0,255],
"effect" : "Rainbow swirl fast",
"duration_ms" : 3000
},
/// backgroundEffect sets a background effect or color. It is used when all capture devices are stopped (with the help of the kodiVideChecker or manual via remote). Could be also selected via priorities selection.
/// * enable : if true, background effect is enabled
/// * type : choose between "color" or "effect"
/// * color : if type is color, a color is used (RGB) (example: [255,134,0])
/// * effect : if type is effect a effect is used (example: "Rainbow swirl fast")
"backgroundEffect" :
{
"enable" : true,
"type" : "effect",
"color" : [255,138,0],
"effect" : "Warm mood blobs"
},
/// The configuration of the Json/Proto forwarder. Forward messages to multiple instances of Hyperion on same and/or other hosts

23
config/hyperion.config.json.default
View File

@ -2,6 +2,7 @@
"general" :
{
"name" : "MyHyperionConfig",
"showOptHelp" : true,
"configVersion" : 2
},
"logger" :
@ -122,6 +123,10 @@
{
"enable" : true,
"threshold" : 0.0,
"unknownFrameCnt" : 600,
"borderFrameCnt" : 50,
"maxInconsistentCnt" : 10,
"blurRemoveCnt" : 1,
"mode" : "default"
},
@ -139,11 +144,21 @@
"enable3DDetection" : false
},
"initialEffect" :
"foregroundEffect" :
{
"background-effect" : ["Warm mood blobs"],
"foreground-effect" : ["Rainbow swirl fast"],
"foreground-duration_ms" : 3000
"enable" : true,
"type" : "effect",
"color" : [0,0,255],
"effect" : "Rainbow swirl fast",
"duration_ms" : 3000
},
"backgroundEffect" :
{
"enable" : true,
"type" : "effect",
"color" : [255,138,0],
"effect" : "Warm mood blobs"
},
"forwarder" :

2
effects/candle.json
View File

@ -4,7 +4,7 @@
"args" :
{
"sleepTime" : 0.15,
"brightness" : 1.0,
"brightness" : 100,
"color" : [ 255, 138, 0 ],
"candles" : "all"
}

4
effects/candle.py
View File

@ -15,8 +15,8 @@ import random
# Get parameters
color = hyperion.args.get('color', (255,138,0))
colorShift = hyperion.args.get('colorShift', 0.01)
brightness = float(hyperion.args.get('brightness', 0.5))
colorShift = float(hyperion.args.get('colorShift', 1))/100.0
brightness = float(hyperion.args.get('brightness', 100))/100.0
sleepTime = float(hyperion.args.get('sleepTime', 0.14))

2
effects/rainbow-mood.json
View File

@ -4,7 +4,7 @@
"args" :
{
"rotation-time" : 60.0,
"brightness" : 1.0,
"brightness" : 100,
"reverse" : false
}
}

9
effects/rainbow-mood.py
View File

@ -2,15 +2,10 @@ import hyperion, time, colorsys
# Get the parameters
rotationTime = float(hyperion.args.get('rotation-time', 30.0))
brightness = float(hyperion.args.get('brightness', 1.0))
saturation = float(hyperion.args.get('saturation', 1.0))
brightness = float(hyperion.args.get('brightness', 100))/100.0
saturation = float(hyperion.args.get('saturation', 100))/100.0
reverse = bool(hyperion.args.get('reverse', False))
# Check parameters
rotationTime = max(0.1, rotationTime)
brightness = max(0.0, min(brightness, 1.0))
saturation = max(0.0, min(saturation, 1.0))
# Calculate the sleep time and hue increment
sleepTime = 0.1
hueIncrement = sleepTime / rotationTime

20
effects/schema/candle.schema.json
View File

@ -9,6 +9,9 @@
"title":"edt_eff_whichleds_title",
"enum" : ["all","all-together","list"],
"default" : "all",
"options" : {
"enum_titles" : ["edt_eff_enum_all", "edt_eff_enum_all-together", "edt_eff_enum_list"]
},
"propertyOrder" : 1
},
"ledlist": {
@ -34,19 +37,20 @@
"colorShift": {
"type": "number",
"title":"edt_eff_colorshift_title",
"default": 0.01,
"minimum" : 0.00,
"maximum": 0.3,
"step": 0.01,
"default": 1,
"minimum" : 0,
"maximum": 30,
"append" : "edt_append_percent",
"propertyOrder" : 4
},
"brightness": {
"type": "number",
"title":"edt_eff_brightness_title",
"default": 1,
"minimum" : 0.01,
"maximum": 1,
"step": 0.1,
"default": 100,
"minimum" : 1,
"maximum": 100,
"step" : 10,
"append" : "edt_append_percent",
"propertyOrder" : 5
},
"sleepTime": {

21
effects/schema/rainbow-mood.schema.json
View File

@ -15,17 +15,28 @@
"brightness": {
"type": "number",
"title":"edt_eff_brightness_title",
"default": 1.0,
"minimum" : 0.1,
"maximum" : 1.0,
"step" : 0.1,
"default": 100,
"minimum" : 1,
"maximum" : 100,
"step" : 10,
"append" : "edt_append_percent",
"propertyOrder" : 2
},
"saturation": {
"type": "number",
"title":"edt_eff_saturation_title",
"default": 100,
"minimum" : 1,
"maximum" : 100,
"step" : 10,
"append" : "edt_append_percent",
"propertyOrder" : 3
},
"reverse": {
"type": "boolean",
"title":"edt_eff_reversedirection_title",
"default": false,
"propertyOrder" : 3
"propertyOrder" : 4
}
},
"additionalProperties": false

12
effects/schema/sparks.schema.json
View File

@ -36,15 +36,19 @@
"brightness": {
"type": "number",
"title":"edt_eff_brightness_title",
"default": 1.0,
"minimum" : 0.01,
"default": 100,
"minimum" : 1,
"step" : 10,
"append" : "edt_append_percent",
"propertyOrder" : 4
},
"saturation": {
"type": "number",
"title":"edt_eff_saturation_title",
"default": 1.0,
"minimum" : 0.01,
"default": 100,
"minimum" : 1,
"step" : 10,
"append" : "edt_append_percent",
"propertyOrder" : 5
},
"reverse": {

4
effects/schema/trails.schema.json
View File

@ -27,7 +27,7 @@
},
"trails": {
"type": "integer",
"title":"edt_eff_trails_title",
"title":"edt_eff_count_title",
"default": 3,
"minimum" : 1,
"propertyOrder" : 4
@ -41,7 +41,7 @@
},
"random": {
"type": "boolean",
"title":"edt_eff_random_header_title",
"title":"edt_eff_colorrandom_title",
"default": false,
"propertyOrder" : 6
},

4
effects/sparks.json
View File

@ -5,8 +5,8 @@
{
"rotation-time" : 3.0,
"sleep-time" : 0.05,
"brightness" : 1.0,
"saturation" : 1.0,
"brightness" : 100,
"saturation" : 100,
"reverse" : false,
"color" : [255,255,255],
"random-color" : false

6
effects/sparks.py
View File

@ -3,16 +3,14 @@ import hyperion, time, colorsys, random
# Get the parameters
rotationTime = float(hyperion.args.get('rotation-time', 3.0))
sleepTime = float(hyperion.args.get('sleep-time', 0.05))
brightness = float(hyperion.args.get('brightness', 1.0))
saturation = float(hyperion.args.get('saturation', 1.0))
brightness = float(hyperion.args.get('brightness', 100))/100.0
saturation = float(hyperion.args.get('saturation', 100))/100.0
reverse = bool(hyperion.args.get('reverse', False))
color = list(hyperion.args.get('color', (255,255,255)))
randomColor = bool(hyperion.args.get('random-color', False))
# Check parameters
rotationTime = max(0.1, rotationTime)
brightness = max(0.0, min(brightness, 1.0))
saturation = max(0.0, min(saturation, 1.0))
# Initialize the led data
ledData = bytearray()

9
effects/strobe-raspbmc.json
View File

@ -1,9 +0,0 @@
{
"name" : "Strobe Raspbmc",
"script" : "strobe.py",
"args" :
{
"color" : [ 188, 17, 66 ],
"frequency" : 5.0
}
}

2
effects/trails.json
View File

@ -1,5 +1,5 @@
{
"name" : "trails",
"name" : "Trails",
"script" : "trails.py",
"args" :
{

2
effects/trails_color.json
View File

@ -1,5 +1,5 @@
{
"name" : "trails_color",
"name" : "Trails color",
"script" : "trails.py",
"args" :
{

182
libsrc/hyperion/schemas/hyperion.schema-2.json
View File

@ -6,7 +6,7 @@
"general" :
{
"type" : "object",
"title" : "edt_general_heading_title",
"title" : "edt_conf_gen_heading_title",
"required" : true,
"defaultProperties": ["name"],
"properties" :
@ -14,10 +14,19 @@
"name" :
{
"type" : "string",
"title" : "edt_general_name_title",
"title" : "edt_conf_gen_name_title",
"default" : "MyHyperionConfig",
"required" : true,
"propertyOrder" : 1
},
"showOptHelp" :
{
"type" : "boolean",
"title" : "edt_conf_gen_showOptHelp_title",
"default" : true,
"required" : true,
"propertyOrder" : 2
},
"configVersion" :
{
"type" : "integer",
@ -69,6 +78,9 @@
"title" : "edt_dev_general_colorOrder_title",
"enum" : ["rgb", "bgr", "rbg", "brg", "gbr", "grb"],
"default" : "rgb",
"options" : {
"enum_titles" : ["edt_conf_enum_rgb", "edt_conf_enum_bgr", "edt_conf_enum_rbg", "edt_conf_enum_brg", "edt_conf_enum_gbr", "edt_conf_enum_grb"]
},
"propertyOrder" : 3
},
"rewriteTime": {
@ -94,25 +106,32 @@
"imageToLedMappingType" :
{
"type" : "string",
"title" : "edt_conf_color_imageToLedMappingType",
"enum" : ["multicolor_mean", "unicolor_mean"],
"default" : "multicolor_mean",
"options" : {
"enum_titles" : ["edt_conf_enum_multicolor_mean", "edt_conf_enum_unicolor_mean"]
},
"propertyOrder" : 1
},
"channelAdjustment_enable" :
{
"type" : "boolean",
"title" : "edt_conf_color_channelAdjustment_enable",
"default" : true,
"propertyOrder" : 2
},
"channelAdjustment_v4l_only" :
{
"type" : "boolean",
"title" : "edt_conf_color_channelAdjustment_v4l_only",
"default" : false,
"propertyOrder" : 3
},
"channelAdjustment" :
{
"type" : "array",
"title" : "edt_conf_color_channelAdjustment_header_title",
"required" : true,
"propertyOrder" : 4,
"items" :
@ -124,16 +143,23 @@
"id" :
{
"type" : "string",
"required" : true
"title" : "edt_conf_color_id",
"required" : true,
"default" : "A userdefined name",
"propertyOrder" : 1
},
"leds" :
{
"type" : "string",
"required" : true
"title" : "edt_conf_color_leds",
"required" : true,
"default" : "*",
"propertyOrder" : 2
},
"black" :
{
"type" : "array",
"title" : "edt_conf_color_black",
"format" : "colorpicker",
"required" : true,
"default": [0,0,0],
@ -144,11 +170,12 @@
},
"minItems" : 3,
"maxItems" : 3,
"propertyOrder" : 8
"propertyOrder" : 3
},
"white" :
{
"type" : "array",
"title" : "edt_conf_color_white",
"format" : "colorpicker",
"required" : true,
"default": [255,255,255],
@ -159,11 +186,12 @@
},
"minItems" : 3,
"maxItems" : 3,
"propertyOrder" : 1
"propertyOrder" : 4
},
"red" :
{
"type" : "array",
"title" : "edt_conf_color_red",
"format" : "colorpicker",
"required" : true,
"default": [255,0,0],
@ -174,11 +202,12 @@
},
"minItems" : 3,
"maxItems" : 3,
"propertyOrder" : 2
"propertyOrder" : 5
},
"green" :
{
"type" : "array",
"title" : "edt_conf_color_green",
"format" : "colorpicker",
"required" : true,
"default": [0,255,0],
@ -189,11 +218,12 @@
},
"minItems" : 3,
"maxItems" : 3,
"propertyOrder" : 3
"propertyOrder" : 6
},
"blue" :
{
"type" : "array",
"title" : "edt_conf_color_blue",
"format" : "colorpicker",
"required" : true,
"default": [0,0,255],
@ -204,11 +234,12 @@
},
"minItems" : 3,
"maxItems" : 3,
"propertyOrder" : 4
"propertyOrder" : 7
},
"cyan" :
{
"type" : "array",
"title" : "edt_conf_color_cyan",
"format" : "colorpicker",
"required" : true,
"default": [0,255,255],
@ -219,11 +250,12 @@
},
"minItems" : 3,
"maxItems" : 3,
"propertyOrder" : 5
"propertyOrder" : 8
},
"magenta" :
{
"type" : "array",
"title" : "edt_conf_color_magenta",
"format" : "colorpicker",
"required" : true,
"default": [255,0,255],
@ -234,11 +266,12 @@
},
"minItems" : 3,
"maxItems" : 3,
"propertyOrder" : 6
"propertyOrder" : 9
},
"yellow" :
{
"type" : "array",
"title" : "edt_conf_color_yellow",
"format" : "colorpicker",
"required" : true,
"default": [255,255,0],
@ -249,7 +282,7 @@
},
"minItems" : 3,
"maxItems" : 3,
"propertyOrder" : 7
"propertyOrder" : 10
}
},
"additionalProperties" : false
@ -424,6 +457,9 @@
"title" : "edt_conf_smooth_type_title",
"enum" : ["linear"],
"default" : "linear",
"options" : {
"enum_titles" : ["edt_conf_enum_linear"]
},
"propertyOrder" : 2
},
"time_ms" :
@ -506,6 +542,9 @@
"title" : "edt_conf_v4l2_standard_title",
"enum" : ["PAL","NTSC"],
"default" : "PAL",
"options" : {
"enum_titles" : ["edt_conf_enum_PAL", "edt_conf_enum_NTSC"]
},
"propertyOrder" : 4
},
"width" :
@ -806,7 +845,6 @@
{
"type" : "object",
"title" : "edt_conf_bb_heading_title",
"defaultProperties": ["enable","mode","threshold"],
"properties" :
{
"enable" :
@ -833,6 +871,7 @@
"title" : "edt_conf_bb_unknownFrameCnt_title",
"minimum" : 0,
"default" : 600,
"access" : "expert",
"propertyOrder" : 3
},
"borderFrameCnt" :
@ -841,6 +880,7 @@
"title" : "edt_conf_bb_borderFrameCnt_title",
"minimum" : 0,
"default" : 50,
"access" : "expert",
"propertyOrder" : 4
},
"maxInconsistentCnt" :
@ -849,6 +889,7 @@
"title" : "edt_conf_bb_maxInconsistentCnt_title",
"minimum" : 0,
"default" : 10,
"access" : "expert",
"propertyOrder" : 5
},
"blurRemoveCnt" :
@ -857,6 +898,7 @@
"title" : "edt_conf_bb_blurRemoveCnt_title",
"minimum" : 0,
"default" : 1,
"access" : "expert",
"propertyOrder" : 6
},
"mode" :
@ -951,40 +993,109 @@
},
"additionalProperties" : false
},
"initialEffect" :
"foregroundEffect" :
{
"type" : "object",
"title" : "Initial Effect",
"defaultProperties": ["background-effect","foreground-effect","foreground-duration_ms"],
"title" : "edt_conf_fge_heading_title",
"properties" :
{
"background-effect" :
"enable" :
{
"type" : "array",
"title" : "Background effect",
"propertyOrder" : 3
},
"background-effect-args" :
{
"type" : "object",
"title" : "Background effect arguments"
},
"foreground-effect" :
{
"type" : "array",
"title" : "Boot effect",
"type" : "boolean",
"title" : "edt_conf_general_enable_title",
"default" : true,
"propertyOrder" : 1
},
"foreground-effect-args" :
"type" :
{
"type" : "object",
"title" : "Boot effect arguments"
"type" : "string",
"title" : "edt_conf_fge_type_title",
"enum" : ["color", "effect"],
"default" : "effect",
"options" : {
"enum_titles" : ["edt_conf_enum_color", "edt_conf_enum_effect"]
},
"propertyOrder" : 2
},
"foreground-duration_ms" :
"color" :
{
"type" : "array",
"format" : "colorpicker",
"title" : "edt_conf_fge_color_title",
"default" : [255,0,0],
"items" : {
"type" : "integer",
"minimum" : 0,
"maximum" : 255
},
"minItems" : 3,
"maxItems" : 3,
"propertyOrder" : 3
},
"effect" :
{
"type" : "string",
"format" : "select",
"title" : "edt_conf_fge_effect_title",
"propertyOrder" : 4
},
"duration_ms" :
{
"type" : "integer",
"title" : "Boot effect duration",
"title" : "edt_conf_fge_duration_ms_title",
"default" : 3000,
"minimum" : 100,
"append" : "edt_append_ms",
"propertyOrder" : 5
}
},
"additionalProperties" : false
},
"backgroundEffect" :
{
"type" : "object",
"title" : "edt_conf_bge_heading_title",
"properties" :
{
"enable" :
{
"type" : "boolean",
"title" : "edt_conf_general_enable_title",
"default" : true,
"propertyOrder" : 1
},
"type" :
{
"type" : "string",
"title" : "edt_conf_fge_type_title",
"enum" : ["color", "effect"],
"default" : "effect",
"options" : {
"enum_titles" : ["edt_conf_enum_color", "edt_conf_enum_effect"]
},
"propertyOrder" : 2
},
"color" :
{
"type" : "array",
"format" : "colorpicker",
"title" : "edt_conf_fge_color_title",
"default" : [255,138,0],
"items" : {
"type" : "integer",
"minimum" : 0,
"maximum" : 255
},
"minItems" : 3,
"maxItems" : 3,
"propertyOrder" : 3
},
"effect" :
{
"type" : "string",
"format" : "select",
"title" : "edt_conf_fge_effect_title",
"propertyOrder" : 4
}
},
"additionalProperties" : false
@ -1191,6 +1302,7 @@
"effects" :
{
"type" : "object",
"title" : "edt_conf_effp_heading_title",
"properties" :
{
"paths" :

59
src/hyperiond/hyperiond.cpp
View File

@ -207,32 +207,35 @@ void HyperionDaemon::loadConfig(const QString & configFile, const int neededConf
void HyperionDaemon::startInitialEffect()
{
#define FGCONFIG_ARRAY fgEffectConfig.toArray()
#define BGCONFIG_ARRAY bgEffectConfig.toArray()
#define FGCONFIG_ARRAY fgColorConfig.toArray()
#define BGCONFIG_ARRAY bgColorConfig.toArray()
Hyperion *hyperion = Hyperion::getInstance();
// create boot sequence if the configuration is present
if (_qconfig.contains("initialEffect"))
{
const QJsonObject & effectConfig = _qconfig["initialEffect"].toObject();
// create boot sequence
const QJsonObject & FGEffectConfig = _qconfig["foregroundEffect"].toObject();
const QJsonObject & BGEffectConfig = _qconfig["backgroundEffect"].toObject();
const int FG_PRIORITY = 0;
const int DURATION_INFINITY = 0;
const int BG_PRIORITY = PriorityMuxer::LOWEST_PRIORITY -1;
// clear the leds
hyperion->setColor(FG_PRIORITY, ColorRgb::BLACK, 100, false);
// clear the leds
hyperion->setColor(FG_PRIORITY, ColorRgb::BLACK, 100, false);
// initial foreground effect/color
const QJsonValue fgEffectConfig = effectConfig["foreground-effect"];
// initial foreground effect/color
if (FGEffectConfig["enable"].toBool(true))
{
const QString fgTypeConfig = FGEffectConfig["type"].toString("effect");
const QString fgEffectConfig = FGEffectConfig["effect"].toString("Rainbow swirl fast");
const QJsonValue fgColorConfig = FGEffectConfig["color"];
int default_fg_duration_ms = 3000;
int fg_duration_ms = effectConfig["foreground-duration_ms"].toInt(default_fg_duration_ms);
int fg_duration_ms = FGEffectConfig["duration_ms"].toInt(default_fg_duration_ms);
if (fg_duration_ms == DURATION_INFINITY)
{
fg_duration_ms = default_fg_duration_ms;
Warning(_log, "foreground effect duration 'infinity' is forbidden, set to default value %d ms",default_fg_duration_ms);
}
if ( ! fgEffectConfig.isNull() && fgEffectConfig.isArray() && FGCONFIG_ARRAY.size() == 3 )
if ( fgTypeConfig.contains("color") )
{
ColorRgb fg_color = {
(uint8_t)FGCONFIG_ARRAY.at(0).toInt(0),
@ -242,19 +245,19 @@ void HyperionDaemon::startInitialEffect()
hyperion->setColor(FG_PRIORITY, fg_color, fg_duration_ms, false);
Info(_log,"Inital foreground color set (%d %d %d)",fg_color.red,fg_color.green,fg_color.blue);
}
else if (! fgEffectConfig.isNull() && fgEffectConfig.isArray() && FGCONFIG_ARRAY.size() == 1 && FGCONFIG_ARRAY.at(0).isString())
else
{
const QString fgEffectName = FGCONFIG_ARRAY.at(0).toString();
int result = effectConfig.contains("foreground-effect-args")
// ? hyperion->setEffect(fgEffectName, effectConfig["foreground-effect-args"], FG_PRIORITY, fg_duration_ms)
? hyperion->setEffect(fgEffectName, _qconfig["initialEffect"].toObject()["foreground-effect-args"].toObject(), FG_PRIORITY, fg_duration_ms)
: hyperion->setEffect(fgEffectName, FG_PRIORITY, fg_duration_ms);
Info(_log,"Inital foreground effect '%s' %s", fgEffectName.toUtf8().constData(), ((result == 0) ? "started" : "failed"));
int result = hyperion->setEffect(fgEffectConfig, FG_PRIORITY, fg_duration_ms);
Info(_log,"Inital foreground effect '%s' %s", fgEffectConfig.toUtf8().constData(), ((result == 0) ? "started" : "failed"));
}
// initial background effect/color
const QJsonValue bgEffectConfig = effectConfig["background-effect"];
if ( ! bgEffectConfig.isNull() && bgEffectConfig.isArray() && BGCONFIG_ARRAY.size() == 3 )
}
// initial background effect/color
if (BGEffectConfig["enable"].toBool(true))
{
const QString bgTypeConfig = BGEffectConfig["type"].toString("effect");
const QString bgEffectConfig = BGEffectConfig["effect"].toString("Warm mood blobs");
const QJsonValue bgColorConfig = BGEffectConfig["color"];
if (bgTypeConfig.contains("color"))
{
ColorRgb bg_color = {
(uint8_t)BGCONFIG_ARRAY.at(0).toInt(0),
@ -264,14 +267,10 @@ void HyperionDaemon::startInitialEffect()
hyperion->setColor(BG_PRIORITY, bg_color, DURATION_INFINITY, false);
Info(_log,"Inital background color set (%d %d %d)",bg_color.red,bg_color.green,bg_color.blue);
}
else if (! bgEffectConfig.isNull() && bgEffectConfig.isArray() && BGCONFIG_ARRAY.size() == 1 && BGCONFIG_ARRAY.at(0).isString())
else
{
const QString bgEffectName = BGCONFIG_ARRAY.at(0).toString();
int result = effectConfig.contains("background-effect-args")
// ? hyperion->setEffect(bgEffectName, effectConfig["background-effect-args"], BG_PRIORITY, fg_duration_ms)
? hyperion->setEffect(bgEffectName, _qconfig["initialEffect"].toObject()["background-effect-args"].toObject(), BG_PRIORITY, DURATION_INFINITY)
: hyperion->setEffect(bgEffectName, BG_PRIORITY, DURATION_INFINITY);
Info(_log,"Inital background effect '%s' %s", bgEffectName.toUtf8().constData(), ((result == 0) ? "started" : "failed"));
int result = hyperion->setEffect(bgEffectConfig, BG_PRIORITY, DURATION_INFINITY);
Info(_log,"Inital background effect '%s' %s", bgEffectConfig.toUtf8().constData(), ((result == 0) ? "started" : "failed"));
}
}