diff --git a/assets/webconfig/content/conf_leds.html b/assets/webconfig/content/conf_leds.html old mode 100644 new mode 100755 index c0b35256..3e3b54c9 --- a/assets/webconfig/content/conf_leds.html +++ b/assets/webconfig/content/conf_leds.html @@ -165,7 +165,71 @@
%
- JSONRPC_schema/schema-hyperion-classic.json JSONRPC_schema/schema-hyperion-classic.json diff --git a/libsrc/hyperion/schema/schema-ledConfig.json b/libsrc/hyperion/schema/schema-ledConfig.json index dc89af3e..050fddc8 100644 --- a/libsrc/hyperion/schema/schema-ledConfig.json +++ b/libsrc/hyperion/schema/schema-ledConfig.json @@ -1,122 +1,149 @@ { - "type" : "object", - "properties" : - { - "classic" : - { - "type":"object", - "required" : true, - "properties": - { - "top" : - { - "type" : "integer", - "minimum" : 0, - "default" : 8 + "type": "object", + "properties": { + "classic": { + "type": "object", + "required": true, + "properties": { + "top": { + "type": "integer", + "minimum": 0, + "default": 8 }, - "bottom" : - { - "type" : "integer", - "minimum" : 0, - "default" : 8 + "bottom": { + "type": "integer", + "minimum": 0, + "default": 8 }, - "left" : - { - "type" : "integer", - "minimum" : 0, - "default" : 5 + "left": { + "type": "integer", + "minimum": 0, + "default": 5 }, - "right" : - { - "type" : "integer", - "minimum" : 0, - "default" : 5 + "right": { + "type": "integer", + "minimum": 0, + "default": 5 }, - "glength" : - { - "type" : "integer", - "minimum" : 0, - "default" : 0 + "glength": { + "type": "integer", + "minimum": 0, + "default": 0 }, - "gpos" : - { - "type" : "integer", - "minimum" : 0, - "default" : 0 + "gpos": { + "type": "integer", + "minimum": 0, + "default": 0 }, - "position" : - { - "type" : "integer", - "default" : 0 + "position": { + "type": "integer", + "default": 0 }, - "reverse" : - { - "type" : "boolean", - "default" : false + "reverse": { + "type": "boolean", + "default": false }, - "hdepth" : - { - "type" : "integer", - "minimum" : 1, - "maximum" : 100, - "default" : 8 + "hdepth": { + "type": "integer", + "minimum": 1, + "maximum": 100, + "default": 8 }, - "vdepth" : - { - "type" : "integer", - "minimum" : 1, - "maximum" : 100, - "default" : 5 + "vdepth": { + "type": "integer", + "minimum": 1, + "maximum": 100, + "default": 5 }, - "overlap" : - { - "type" : "integer", - "minimum" : 0, - "default" : 0 + "overlap": { + "type": "integer", + "minimum": 0, + "default": 0 }, - "edgegap" : - { - "type" : "integer", - "minimum" : 0, - "maximum" : 50, - "default" : 0 + "edgegap": { + "type": "integer", + "minimum": 0, + "maximum": 50, + "default": 0 + }, + "ptlh": { + "type": "integer", + "minimum": 0, + "maximum": 100, + "default": 0 + }, + "ptlv": { + "type": "integer", + "minimum": 0, + "maximum": 100, + "default": 0 + }, + "ptrh": { + "type": "integer", + "minimum": 0, + "maximum": 100, + "default": 0 + }, + "ptrv": { + "type": "integer", + "minimum": 0, + "maximum": 100, + "default": 0 + }, + "pblh": { + "type": "integer", + "minimum": 0, + "maximum": 100, + "default": 0 + }, + "pblv": { + "type": "integer", + "minimum": 0, + "maximum": 100, + "default": 0 + }, + "pbrh": { + "type": "integer", + "minimum": 0, + "maximum": 100, + "default": 0 + }, + "pbrv": { + "type": "integer", + "minimum": 0, + "maximum": 100, + "default": 0 } }, - "additionalProperties" : false + "additionalProperties": false }, - "matrix" : - { - "type":"object", - "required" : true, - "properties": - { - "ledshoriz" : - { - "type" : "integer", - "minimum" : 0, - "maximum" : 50, - "default" : 0 + "matrix": { + "type": "object", + "required": true, + "properties": { + "ledshoriz": { + "type": "integer", + "minimum": 0, + "maximum": 50, + "default": 0 }, - "ledsvert" : - { - "type" : "integer", - "minimum" : 0, - "maximum" : 50, - "default" : 0 + "ledsvert": { + "type": "integer", + "minimum": 0, + "maximum": 50, + "default": 0 }, - "cabling" : - { + "cabling": { "type": "string", - "enum" : ["snake", "parallel"] - }, - "start" : - { + "enum": ["snake", "parallel"] + }, + "start": { "type": "string", - "enum" : ["top-left", "top-right", "bottom-left", "bottom-right"] - } + "enum": ["top-left", "top-right", "bottom-left", "bottom-right"] + } }, - "additionalProperties" : false + "additionalProperties": false } }, - "additionalProperties" : true + "additionalProperties": true } diff --git a/src/hyperiond/hyperiond.cpp b/src/hyperiond/hyperiond.cpp index 292840b4..dd84c9e4 100644 --- a/src/hyperiond/hyperiond.cpp +++ b/src/hyperiond/hyperiond.cpp @@ -340,7 +340,7 @@ void HyperionDaemon::handleSettingsUpdate(const settings::type &settingsType, co // stop all capture interfaces #ifdef ENABLE_FB if(_fbGrabber != nullptr) - { + { _fbGrabber->stop(); delete _fbGrabber; _fbGrabber = nullptr;