From 9c3388d1bb1b637fff22c48344a51426822d3e29 Mon Sep 17 00:00:00 2001 From: brindosch Date: Mon, 17 Apr 2017 19:16:22 +0200 Subject: [PATCH] update --- effects/schema/flag.schema.json | 6 ++-- effects/schema/light-clock.schema.json | 6 ++-- .../hyperion/schemas/hyperion.schema-2.json | 28 ++++++++++++++++--- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/effects/schema/flag.schema.json b/effects/schema/flag.schema.json index f3bf586e..d1779252 100644 --- a/effects/schema/flag.schema.json +++ b/effects/schema/flag.schema.json @@ -1,7 +1,7 @@ { "type":"object", "script" : "flag.py", - "title":"edt_eff_flag_header_title", + "title":"edt_eff_flag_header", "required":true, "properties":{ "countries": { @@ -11,13 +11,13 @@ "uniqueItems": true, "items": { "type": "string", - "enum": ["de","lt","fr","se","nl"] + "enum": ["de","at","fr","be","it","es","bg","ee","dk","fi","hu","ie","lv","lt","lu","mt","nl","pl","pt","ro","sl","se","ch"] }, "propertyOrder" : 1 }, "switch-time": { "type": "integer", - "title":"edt_eff_switchtime_title", + "title":"edt_eff_interval_title", "default": 5, "minimum" : 1, "append" : "edt_append_s", diff --git a/effects/schema/light-clock.schema.json b/effects/schema/light-clock.schema.json index 0f763d3c..ea212931 100644 --- a/effects/schema/light-clock.schema.json +++ b/effects/schema/light-clock.schema.json @@ -50,7 +50,7 @@ "type": "array", "title": "edt_eff_backgroundColor_title", "format": "colorpicker", - "default": [255, 255, 255], + "default": [0, 0, 0,], "items": { "type": "integer", "minimum": 0, @@ -65,7 +65,7 @@ "title": "edt_eff_markerDepth_title", "default": 5, "minimum" : 0, - "maximum" : 100, + "maximum" : 50, "append" : "edt_append_percent", "propertyOrder" : 5 }, @@ -74,7 +74,7 @@ "title": "edt_eff_markerWidth_title", "default": 5, "minimum" : 0, - "maximum" : 100, + "maximum" : 25, "append" : "edt_append_percent", "propertyOrder" : 6 }, diff --git a/libsrc/hyperion/schemas/hyperion.schema-2.json b/libsrc/hyperion/schemas/hyperion.schema-2.json index bfb3bdab..ea59ff04 100644 --- a/libsrc/hyperion/schemas/hyperion.schema-2.json +++ b/libsrc/hyperion/schemas/hyperion.schema-2.json @@ -970,14 +970,24 @@ }, "minItems" : 3, "maxItems" : 3, - "propertyOrder" : 3 + "propertyOrder" : 3, + "options": { + "dependencies": { + "type": "color" + } + } }, "effect" : { "type" : "string", "format" : "select", "title" : "edt_conf_fge_effect_title", - "propertyOrder" : 4 + "propertyOrder" : 4, + "options": { + "dependencies": { + "type": "effect" + } + } }, "duration_ms" : { @@ -1028,14 +1038,24 @@ }, "minItems" : 3, "maxItems" : 3, - "propertyOrder" : 3 + "propertyOrder" : 3, + "options": { + "dependencies": { + "type": "color" + } + } }, "effect" : { "type" : "string", "format" : "select", "title" : "edt_conf_fge_effect_title", - "propertyOrder" : 4 + "propertyOrder" : 4, + "options": { + "dependencies": { + "type": "effect" + } + } } }, "additionalProperties" : false