From d3e447f4228e38b489832dd4b77b5fbc49afe083 Mon Sep 17 00:00:00 2001 From: penfold42 Date: Mon, 31 Dec 2018 16:11:08 +1100 Subject: [PATCH] Add new white_algorithms to web UI --- assets/webconfig/i18n/cs.json | 3 ++- assets/webconfig/i18n/de.json | 1 + assets/webconfig/i18n/en.json | 3 ++- assets/webconfig/i18n/es.json | 3 ++- assets/webconfig/i18n/it.json | 1 + libsrc/leddevice/schemas/schema-sk6812spi.json | 4 ++-- libsrc/leddevice/schemas/schema-ws281x.json | 4 ++-- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/assets/webconfig/i18n/cs.json b/assets/webconfig/i18n/cs.json index 8cc269fb..4c22a882 100644 --- a/assets/webconfig/i18n/cs.json +++ b/assets/webconfig/i18n/cs.json @@ -294,7 +294,8 @@ "wiz_cc_btn_stop": "Stopnout video", "wiz_cc_summary": "Závěr nastavení. Během přehrávání videa můžete znovu měnit nebo otestovat hodnoty. Pokud jste hotovi, klikněte na tlačítko Uložit.", "edt_dev_enum_subtract_minimum": "Odčtěte minimum", - "edt_dev_enum_sub_min_warm_adjust": "Teplota barvy", + "edt_dev_enum_sub_min_cool_adjust": "Teplota barvy: cool", + "edt_dev_enum_sub_min_warm_adjust": "Teplota barvy: warm", "edt_dev_enum_white_off": "Bílá vypnutá", "edt_dev_general_heading_title": "Obecné nastavení", "edt_dev_general_name_title": "Název konfigurace", diff --git a/assets/webconfig/i18n/de.json b/assets/webconfig/i18n/de.json index 9b6ee9fd..38308fc7 100644 --- a/assets/webconfig/i18n/de.json +++ b/assets/webconfig/i18n/de.json @@ -348,6 +348,7 @@ "wiz_cc_summary" : "Im folgenden eine Zusammenfassung deiner Einstellungen. Während du ein Video abspielst, kannst du hier weiter ausprobieren. Wenn du fertig bist, klicke auf speichern.", "edt_dev_auth_key_title" : "Aurora API Schlüssel", "edt_dev_enum_subtract_minimum" : "Subtrahiere minimum", + "edt_dev_enum_sub_min_cool_adjust" : "Minimale Anpassung: cool", "edt_dev_enum_sub_min_warm_adjust" : "Minimale Anpassung: warm", "edt_dev_enum_white_off" : "Weiß ist aus", "edt_dev_general_heading_title" : "Allgemeine Einstellungen", diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json index 9067151e..44d429a5 100644 --- a/assets/webconfig/i18n/en.json +++ b/assets/webconfig/i18n/en.json @@ -348,7 +348,8 @@ "wiz_cc_summary" : "A conclusion of your settings. During video playback, you could change or test values again. If you are done, click on save.", "edt_dev_auth_key_title" : "Aurora API Key", "edt_dev_enum_subtract_minimum" : "Substract minimum", - "edt_dev_enum_sub_min_warm_adjust" : "Min warm adjust", + "edt_dev_enum_sub_min_cool_adjust" : "Subtract cool white", + "edt_dev_enum_sub_min_warm_adjust" : "Subtract warm white", "edt_dev_enum_white_off" : "White off", "edt_dev_general_heading_title" : "General Settings", "edt_dev_general_name_title" : "Configuration name", diff --git a/assets/webconfig/i18n/es.json b/assets/webconfig/i18n/es.json index 74f42c70..afbd8a2c 100644 --- a/assets/webconfig/i18n/es.json +++ b/assets/webconfig/i18n/es.json @@ -294,6 +294,7 @@ "wiz_cc_btn_stop": "Parar vídeo", "wiz_cc_summary": "Una conclusión de su configuración. Durante la reproducción de vídeo, puede cambiar o probar valores de nuevo. Si está hecho, haga clic en guardar.", "edt_dev_enum_subtract_minimum": "Restar mínimo", + "edt_dev_enum_sub_min_cool_adjust": "Min. Ajuste fresco", "edt_dev_enum_sub_min_warm_adjust": "Min. Ajuste caliente", "edt_dev_enum_white_off": "Blanco apagado", "edt_dev_general_heading_title": "Configuración general", @@ -753,4 +754,4 @@ "edt_conf_enum_SECAM": "SECAM", "general_speech_it": "Italiano", "general_speech_cs": "Czech" -} \ No newline at end of file +} diff --git a/assets/webconfig/i18n/it.json b/assets/webconfig/i18n/it.json index 1a85d8cf..e78940ef 100644 --- a/assets/webconfig/i18n/it.json +++ b/assets/webconfig/i18n/it.json @@ -294,6 +294,7 @@ "wiz_cc_btn_stop": "Interrompi video", "wiz_cc_summary": "Conclusione delle tue impostazioni. Durante la riproduzione video puoi cambiare nuovamente i valori. Se hai finito clicca su salva.", "edt_dev_enum_subtract_minimum": "Sottrai minimo", + "edt_dev_enum_sub_min_cool_adjust": "Regolazione freddo min", "edt_dev_enum_sub_min_warm_adjust": "Regolazione calore min", "edt_dev_enum_white_off": "Bianco off", "edt_dev_general_heading_title": "Impostazioni Generali", diff --git a/libsrc/leddevice/schemas/schema-sk6812spi.json b/libsrc/leddevice/schemas/schema-sk6812spi.json index 8f3fc8ff..b8c02c29 100644 --- a/libsrc/leddevice/schemas/schema-sk6812spi.json +++ b/libsrc/leddevice/schemas/schema-sk6812spi.json @@ -23,10 +23,10 @@ "whiteAlgorithm": { "type": "string", "title":"edt_dev_spec_whiteLedAlgor_title", - "enum" : ["subtract_minimum","sub_min_warm_adjust","white_off"], + "enum" : ["subtract_minimum","sub_min_cool_adjust","sub_min_warm_adjust","white_off"], "default": "subtract_minimum", "options" : { - "enum_titles" : ["edt_dev_enum_subtract_minimum", "edt_dev_enum_sub_min_warm_adjust", "edt_dev_enum_white_off"] + "enum_titles" : ["edt_dev_enum_subtract_minimum", "edt_dev_enum_sub_min_cool_adjust","edt_dev_enum_sub_min_warm_adjust", "edt_dev_enum_white_off"] }, "propertyOrder" : 4 }, diff --git a/libsrc/leddevice/schemas/schema-ws281x.json b/libsrc/leddevice/schemas/schema-ws281x.json index bbf9206b..b190f400 100644 --- a/libsrc/leddevice/schemas/schema-ws281x.json +++ b/libsrc/leddevice/schemas/schema-ws281x.json @@ -35,10 +35,10 @@ "whiteAlgorithm": { "type": "string", "title":"edt_dev_spec_whiteLedAlgor_title", - "enum" : ["subtract_minimum","sub_min_warm_adjust","white_off"], + "enum" : ["subtract_minimum","sub_min_cool_adjust","sub_min_warm_adjust","white_off"], "default": "subtract_minimum", "options" : { - "enum_titles" : ["edt_dev_enum_subtract_minimum", "edt_dev_enum_sub_min_warm_adjust", "edt_dev_enum_white_off"] + "enum_titles" : ["edt_dev_enum_subtract_minimum", "edt_dev_enum_sub_min_cool_adjust","edt_dev_enum_sub_min_warm_adjust", "edt_dev_enum_white_off"] }, "propertyOrder" : 6 },