frodovdr
/
hyperion.ng
mirror of https://github.com/hyperion-project/hyperion.ng.git
1
0
Fork 0
Code Issues Releases Wiki Activity

BugFix 

Former-commit-id: 8887ee93d5bcaa7ee13f4f5afb601a65d59ee113
This commit is contained in:
AEtHeLsYn 2016-03-13 12:10:54 +01:00
parent e4d77660a4
commit a5a17776d4
5 changed files with 99 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
config/hyperion.config.json
View File

@ -42,6 +42,32 @@
/// - 'updateDelay' The delay of the output to leds (in periods of smoothing) /// - 'updateDelay' The delay of the output to leds (in periods of smoothing)
"color" : "color" :
{ {
"correction" :
[
{
"id" : "default",
"leds" : "*",
"correctionValues" :
{
"red" : 255,
"green" : 255,
"blue" : 255
}
}
],
"temperature" :
[
{
"id" : "default",
"leds" : "*",
"correctionValues" :
{
"red" : 255,
"green" : 255,
"blue" : 255
}
}
],
"transform" : "transform" :
[ [
{ {
@ -52,6 +78,11 @@
"saturationGain" : 1.0000, "saturationGain" : 1.0000,
"valueGain" : 1.0000 "valueGain" : 1.0000
}, },
"hsl" :
{
"saturationGain" : 1.0000,
"luminanceGain" : 1.0000
},`
"red" : "red" :
{ {
"threshold" : 0.0000, "threshold" : 0.0000,

42
libsrc/hyperion/hyperion.schema.json
View File

@ -38,6 +38,31 @@
"type":"object", "type":"object",
"required":false, "required":false,
"properties": { "properties": {
"correctionValues" : {
"type" : "object",
"required" : false,
"properties" : {
"red" : {
"type" : "integer",
"required" : false,
"minimum" : 0
"maximum" : 255
},
"green" : {
"type" : "integer",
"required" : false,
"minimum" : 0
"maximum" : 255
}
"blue" : {
"type" : "integer",
"required" : false,
"minimum" : 0
"maximum" : 255
}
},
"additionalProperties" : false
},
"hsv" : { "hsv" : {
"type" : "object", "type" : "object",
"required" : false, "required" : false,
@ -54,6 +79,23 @@
} }
}, },
"additionalProperties" : false "additionalProperties" : false
},
"hsl" : {
"type" : "object",
"required" : false,
"properties" : {
"saturationGain" : {
"type" : "number",
"required" : false,
"minimum" : 0.0
},
"luminanceGain" : {
"type" : "number",
"required" : false,
"minimum" : 0.0
}
},
"additionalProperties" : false
}, },
"red": { "red": {
"type":"object", "type":"object",

18
libsrc/jsonserver/schema/schema-correction.json
View File

@ -16,22 +16,22 @@
"required" : false "required" : false
}, },
"red" : { "red" : {
"type" : "number", "type" : "integer",
"required" : false, "required" : false,
"minimum": 0.0, "minimum": 0,
"maximum": 255.0 "maximum": 255
}, },
"green" : { "green" : {
"type" : "number", "type" : "integer",
"required" : false, "required" : false,
"minimum": 0.0, "minimum": 0,
"maximum": 255.0 "maximum": 255
}, },
"blue" : { "blue" : {
"type" : "number", "type" : "integer",
"required" : false, "required" : false,
"minimum": 0.0, "minimum": 0,
"maximum": 255.0 "maximum": 255
} }
}, },
"additionalProperties": false "additionalProperties": false

18
libsrc/jsonserver/schema/schema-temperature.json
View File

@ -16,22 +16,22 @@
"required" : false "required" : false
}, },
"red" : { "red" : {
"type" : "number", "type" : "integer",
"required" : false, "required" : false,
"minimum": 0.0, "minimum": 0,
"maximum": 255.0 "maximum": 255
}, },
"green" : { "green" : {
"type" : "number", "type" : "integer",
"required" : false, "required" : false,
"minimum": 0.0, "minimum": 0,
"maximum": 255.0 "maximum": 255
}, },
"blue" : { "blue" : {
"type" : "number", "type" : "integer",
"required" : false, "required" : false,
"minimum": 0.0, "minimum": 0,
"maximum": 255.0 "maximum": 255
} }
}, },
"additionalProperties": false "additionalProperties": false

16
src/hyperion-remote/hyperion-remote.cpp
View File

@ -61,7 +61,7 @@ int main(int argc, char * argv[])
StringParameter & argId = parameters.add<StringParameter> ('q', "qualifier" , "Identifier(qualifier) of the transform to set"); StringParameter & argId = parameters.add<StringParameter> ('q', "qualifier" , "Identifier(qualifier) of the transform to set");
DoubleParameter & argSaturation = parameters.add<DoubleParameter> ('s', "saturation", "Set the HSV saturation gain of the leds"); DoubleParameter & argSaturation = parameters.add<DoubleParameter> ('s', "saturation", "Set the HSV saturation gain of the leds");
DoubleParameter & argValue = parameters.add<DoubleParameter> ('v', "value" , "Set the HSV value gain of the leds"); DoubleParameter & argValue = parameters.add<DoubleParameter> ('v', "value" , "Set the HSV value gain of the leds");
DoubleParameter & argSaturationL = parameters.add<DoubleParameter> ('u', "saturationL", "Set the HSL saturation gain of the leds"); DoubleParameter & argSaturationL = parameters.add<DoubleParameter> ('u', "saturationL", "Set the HSL saturation gain of the leds");
DoubleParameter & argLuminance = parameters.add<DoubleParameter> ('m', "luminance" , "Set the HSL luminance gain of the leds"); DoubleParameter & argLuminance = parameters.add<DoubleParameter> ('m', "luminance" , "Set the HSL luminance gain of the leds");
TransformParameter & argGamma = parameters.add<TransformParameter>('g', "gamma" , "Set the gamma of the leds (requires 3 space seperated values)"); TransformParameter & argGamma = parameters.add<TransformParameter>('g', "gamma" , "Set the gamma of the leds (requires 3 space seperated values)");
TransformParameter & argThreshold = parameters.add<TransformParameter>('t', "threshold" , "Set the threshold of the leds (requires 3 space seperated values between 0.0 and 1.0)"); TransformParameter & argThreshold = parameters.add<TransformParameter>('t', "threshold" , "Set the threshold of the leds (requires 3 space seperated values between 0.0 and 1.0)");
@ -70,13 +70,13 @@ int main(int argc, char * argv[])
SwitchParameter<> & argPrint = parameters.add<SwitchParameter<> >(0x0, "print" , "Print the json input and output messages on stdout"); SwitchParameter<> & argPrint = parameters.add<SwitchParameter<> >(0x0, "print" , "Print the json input and output messages on stdout");
SwitchParameter<> & argHelp = parameters.add<SwitchParameter<> >('h', "help" , "Show this help message and exit"); SwitchParameter<> & argHelp = parameters.add<SwitchParameter<> >('h', "help" , "Show this help message and exit");
StringParameter & argIdC = parameters.add<StringParameter> ('y', "qualifier" , "Identifier(qualifier) of the correction to set"); StringParameter & argIdC = parameters.add<StringParameter> ('y', "qualifier" , "Identifier(qualifier) of the correction to set");
IntParameter & argCorrR = parameters.add<IntParameter> ('1', "correctionR" , "Specify the red channel correction factor"); IntParameter & argCorrR = parameters.add<IntParameter> ('1', "correctionR" , "Specify the red channel correction");
IntParameter & argCorrG = parameters.add<IntParameter> ('2', "correctionG" , "Specify the green channel correction factor"); IntParameter & argCorrG = parameters.add<IntParameter> ('2', "correctionG" , "Specify the green channel correction");
IntParameter & argCorrB = parameters.add<IntParameter> ('3', "correctionB" , "Specify the blue channel correction factor"); IntParameter & argCorrB = parameters.add<IntParameter> ('3', "correctionB" , "Specify the blue channel correction");
StringParameter & argIdT = parameters.add<StringParameter> ('z', "qualifier" , "Identifier(qualifier) of the temperature to set"); StringParameter & argIdT = parameters.add<StringParameter> ('z', "qualifier" , "Identifier(qualifier) of the temperature to set");
IntParameter & argTempR = parameters.add<IntParameter> ('4', "tempR" , "Specify the red channel temperature factor"); IntParameter & argTempR = parameters.add<IntParameter> ('4', "tempR" , "Specify the red channel temperature correction");
IntParameter & argTempG = parameters.add<IntParameter> ('5', "tempG" , "Specify the red channel temperature factor"); IntParameter & argTempG = parameters.add<IntParameter> ('5', "tempG" , "Specify the red channel temperature correction");
IntParameter & argTempB = parameters.add<IntParameter> ('6', "tempB" , "Specify the red channel temperature factor"); IntParameter & argTempB = parameters.add<IntParameter> ('6', "tempB" , "Specify the red channel temperature correction");
// set the default values // set the default values
argAddress.setDefault(defaultServerAddress.toStdString()); argAddress.setDefault(defaultServerAddress.toStdString());
@ -106,7 +106,7 @@ int main(int argc, char * argv[])
std::cerr << (commandCount == 0 ? "No command found." : "Multiple commands found.") << " Provide exactly one of the following options:" << std::endl; std::cerr << (commandCount == 0 ? "No command found." : "Multiple commands found.") << " Provide exactly one of the following options:" << std::endl;
std::cerr << " " << argColor.usageLine() << std::endl; std::cerr << " " << argColor.usageLine() << std::endl;
std::cerr << " " << argImage.usageLine() << std::endl; std::cerr << " " << argImage.usageLine() << std::endl;
std::cerr << " " << argEffect.usageLine() << std::endl; std::cerr << " " << argEffect.usageLine() << std::endl;
std::cerr << " " << argServerInfo.usageLine() << std::endl; std::cerr << " " << argServerInfo.usageLine() << std::endl;
std::cerr << " " << argClear.usageLine() << std::endl; std::cerr << " " << argClear.usageLine() << std::endl;
std::cerr << " " << argClearAll.usageLine() << std::endl; std::cerr << " " << argClearAll.usageLine() << std::endl;