mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
JSON Auto correction + hyperion schema split for better readability (#452)
* revoke schema split * add "getAutoCorrectedConfig" function * revoke schema split * revoke schema split * revoke schema split * Prevent compiler error if none grabber is available * revoke schema split * add "getAutoCorrectedConfig" function * revoke schema split * remove "configMigrator" * remove "configMigrator" * Change TestConfigFile to show how the autocorrection works * revoke schema split * revoke schema split * remove "ConfigMigrator" * remove "ConfigMigrator" * remove "ConfigMigratorBase" * remove "ConfigMigratorBase" * Add QJsonUtils.h * added ability "ignore-required" It has been added the ability to correct the configuration without having to pay attention to the keyword "required" in the hyperion schema * Allow Comments in Hyperion Schema * add ability to ignore the "required" keyword in hyperion schema * add ability to ignore the "required" keyword in hyperion schema * add ability to ignore the "required" keyword in hyperion schema * //Allow Comments in Hyperion Schema * Update jsonschema.py to version 0.8.0 to support ... references in json schema * add RefResolver from jsonschema.py to resolve references in hyperion schema * remove dupe code * split the hyperion schema in separatly files For better readability * add function "resolveReferences" to resolve references in hyperion schema. * remove CURRENT_CONFIG_VERSION * remove CURRENT_CONFIG_VERSION * split the hyperion schema in separatly files For better readability * Create schema-backgroundEffect.json * Add the rest of the Hyperion schema via upload * Remove Comments in config file * Add return variable to function writeJson(). fix function resolveReferences(). edit function load() to handle QPair result from schemaChecker. * edit function validate() to return QPair variable * fit function loadEffectDefinition() * fit function checkJson() * Expand error check by dividing "_error" variable in "_error" and "_schemaError". Replace variable "bool" in validate() in QPair * Extend function "cmd_cfg_set" to handle auto correction * Extend function "loadConfig" to handle auto correction * fix function loadConfig()
This commit is contained in:
Paulchen Panther
committed by
brindosch
brindosch
parent
622a171808
commit
5bd020a570
257
libsrc/hyperion/schema/schema-color.json
Normal file
257
libsrc/hyperion/schema/schema-color.json
Normal file
@@ -0,0 +1,257 @@
|
||||
{
|
||||
"type":"object",
|
||||
"title" : "edt_conf_color_heading_title",
|
||||
"required" : true,
|
||||
"properties":
|
||||
{
|
||||
"imageToLedMappingType" :
|
||||
{
|
||||
"type" : "string",
|
||||
"required" : true,
|
||||
"title" : "edt_conf_color_imageToLedMappingType_title",
|
||||
"enum" : ["multicolor_mean", "unicolor_mean"],
|
||||
"default" : "multicolor_mean",
|
||||
"options" : {
|
||||
"enum_titles" : ["edt_conf_enum_multicolor_mean", "edt_conf_enum_unicolor_mean"]
|
||||
},
|
||||
"propertyOrder" : 1
|
||||
},
|
||||
"channelAdjustment" :
|
||||
{
|
||||
"type" : "array",
|
||||
"title" : "edt_conf_color_channelAdjustment_header_title",
|
||||
"required" : true,
|
||||
"propertyOrder" : 3,
|
||||
"items" :
|
||||
{
|
||||
"type" : "object",
|
||||
"required" : true,
|
||||
"title" : "edt_conf_color_channelAdjustment_header_itemtitle",
|
||||
"properties" :
|
||||
{
|
||||
"id" :
|
||||
{
|
||||
"type" : "string",
|
||||
"title" : "edt_conf_color_id_title",
|
||||
"required" : true,
|
||||
"default" : "A userdefined name",
|
||||
"propertyOrder" : 1
|
||||
},
|
||||
"leds" :
|
||||
{
|
||||
"type" : "string",
|
||||
"title" : "edt_conf_color_leds_title",
|
||||
"required" : true,
|
||||
"default" : "*",
|
||||
"propertyOrder" : 2
|
||||
},
|
||||
"black" :
|
||||
{
|
||||
"type" : "array",
|
||||
"title" : "edt_conf_color_black_title",
|
||||
"format" : "colorpicker",
|
||||
"required" : true,
|
||||
"default": [0,0,0],
|
||||
"items" : {
|
||||
"type" : "integer",
|
||||
"minimum" : 0,
|
||||
"maximum" : 255
|
||||
},
|
||||
"minItems" : 3,
|
||||
"maxItems" : 3,
|
||||
"propertyOrder" : 3
|
||||
},
|
||||
"white" :
|
||||
{
|
||||
"type" : "array",
|
||||
"title" : "edt_conf_color_white_title",
|
||||
"format" : "colorpicker",
|
||||
"required" : true,
|
||||
"default": [255,255,255],
|
||||
"items" : {
|
||||
"type" : "integer",
|
||||
"minimum" : 0,
|
||||
"maximum" : 255
|
||||
},
|
||||
"minItems" : 3,
|
||||
"maxItems" : 3,
|
||||
"propertyOrder" : 4
|
||||
},
|
||||
"red" :
|
||||
{
|
||||
"type" : "array",
|
||||
"title" : "edt_conf_color_red_title",
|
||||
"format" : "colorpicker",
|
||||
"required" : true,
|
||||
"default": [255,0,0],
|
||||
"items" : {
|
||||
"type" : "integer",
|
||||
"minimum" : 0,
|
||||
"maximum" : 255
|
||||
},
|
||||
"minItems" : 3,
|
||||
"maxItems" : 3,
|
||||
"propertyOrder" : 5
|
||||
},
|
||||
"green" :
|
||||
{
|
||||
"type" : "array",
|
||||
"title" : "edt_conf_color_green_title",
|
||||
"format" : "colorpicker",
|
||||
"required" : true,
|
||||
"default": [0,255,0],
|
||||
"items" : {
|
||||
"type" : "integer",
|
||||
"minimum" : 0,
|
||||
"maximum" : 255
|
||||
},
|
||||
"minItems" : 3,
|
||||
"maxItems" : 3,
|
||||
"propertyOrder" : 6
|
||||
},
|
||||
"blue" :
|
||||
{
|
||||
"type" : "array",
|
||||
"title" : "edt_conf_color_blue_title",
|
||||
"format" : "colorpicker",
|
||||
"required" : true,
|
||||
"default": [0,0,255],
|
||||
"items" : {
|
||||
"type" : "integer",
|
||||
"minimum" : 0,
|
||||
"maximum" : 255
|
||||
},
|
||||
"minItems" : 3,
|
||||
"maxItems" : 3,
|
||||
"propertyOrder" : 7
|
||||
},
|
||||
"cyan" :
|
||||
{
|
||||
"type" : "array",
|
||||
"title" : "edt_conf_color_cyan_title",
|
||||
"format" : "colorpicker",
|
||||
"required" : true,
|
||||
"default": [0,255,255],
|
||||
"items" : {
|
||||
"type" : "integer",
|
||||
"minimum" : 0,
|
||||
"maximum" : 255
|
||||
},
|
||||
"minItems" : 3,
|
||||
"maxItems" : 3,
|
||||
"propertyOrder" : 8
|
||||
},
|
||||
"magenta" :
|
||||
{
|
||||
"type" : "array",
|
||||
"title" : "edt_conf_color_magenta_title",
|
||||
"format" : "colorpicker",
|
||||
"required" : true,
|
||||
"default": [255,0,255],
|
||||
"items" : {
|
||||
"type" : "integer",
|
||||
"minimum" : 0,
|
||||
"maximum" : 255
|
||||
},
|
||||
"minItems" : 3,
|
||||
"maxItems" : 3,
|
||||
"propertyOrder" : 9
|
||||
},
|
||||
"yellow" :
|
||||
{
|
||||
"type" : "array",
|
||||
"title" : "edt_conf_color_yellow_title",
|
||||
"format" : "colorpicker",
|
||||
"required" : true,
|
||||
"default": [255,255,0],
|
||||
"items" : {
|
||||
"type" : "integer",
|
||||
"minimum" : 0,
|
||||
"maximum" : 255
|
||||
},
|
||||
"minItems" : 3,
|
||||
"maxItems" : 3,
|
||||
"propertyOrder" : 10
|
||||
},
|
||||
"backlightThreshold" :
|
||||
{
|
||||
"type" : "integer",
|
||||
"title" : "edt_conf_color_backlightThreshold_title",
|
||||
"required" : true,
|
||||
"minimum" : 0,
|
||||
"maximum": 100,
|
||||
"default" : 0,
|
||||
"append" : "edt_append_percent",
|
||||
"propertyOrder" : 11
|
||||
},
|
||||
"backlightColored" :
|
||||
{
|
||||
"type" : "boolean",
|
||||
"title" : "edt_conf_color_backlightColored_title",
|
||||
"required" : true,
|
||||
"default" : false,
|
||||
"propertyOrder" : 12
|
||||
},
|
||||
"brightness" :
|
||||
{
|
||||
"type" : "integer",
|
||||
"title" : "edt_conf_color_brightness_title",
|
||||
"required" : true,
|
||||
"minimum" : 0,
|
||||
"maximum": 100,
|
||||
"default" : 100,
|
||||
"append" : "edt_append_percent",
|
||||
"propertyOrder" : 13
|
||||
},
|
||||
"brightnessCompensation" :
|
||||
{
|
||||
"type" : "integer",
|
||||
"title" : "edt_conf_color_brightnessComp_title",
|
||||
"required" : true,
|
||||
"minimum" : 0,
|
||||
"maximum": 100,
|
||||
"default" : 90,
|
||||
"append" : "edt_append_percent",
|
||||
"access" : "advanced",
|
||||
"propertyOrder" : 14
|
||||
},
|
||||
"gammaRed" :
|
||||
{
|
||||
"type" : "number",
|
||||
"title" : "edt_conf_color_gammaRed_title",
|
||||
"required" : true,
|
||||
"minimum" : 0.1,
|
||||
"maximum": 100.0,
|
||||
"default" : 1.5,
|
||||
"step" : 0.1,
|
||||
"propertyOrder" : 15
|
||||
},
|
||||
"gammaGreen" :
|
||||
{
|
||||
"type" : "number",
|
||||
"title" : "edt_conf_color_gammaGreen_title",
|
||||
"required" : true,
|
||||
"minimum" : 0.1,
|
||||
"maximum": 100.0,
|
||||
"default" : 1.5,
|
||||
"step" : 0.1,
|
||||
"propertyOrder" : 16
|
||||
},
|
||||
"gammaBlue" :
|
||||
{
|
||||
"type" : "number",
|
||||
"title" : "edt_conf_color_gammaBlue_title",
|
||||
"required" : true,
|
||||
"minimum" : 0.1,
|
||||
"maximum": 100.0,
|
||||
"default" : 1.5,
|
||||
"step" : 0.1,
|
||||
"propertyOrder" : 17
|
||||
}
|
||||
},
|
||||
"additionalProperties" : false
|
||||
}
|
||||
}
|
||||
},
|
||||
"additionalProperties" : false
|
||||
}
|
||||
Reference in New Issue
Block a user