diff --git a/libsrc/hyperion/hyperion.schema.json b/libsrc/hyperion/hyperion.schema.json index 165bd906..6ace729f 100644 --- a/libsrc/hyperion/hyperion.schema.json +++ b/libsrc/hyperion/hyperion.schema.json @@ -38,31 +38,6 @@ "type":"object", "required":false, "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" : { "type" : "object", "required" : false, diff --git a/libsrc/jsonserver/JsonClientConnection.cpp b/libsrc/jsonserver/JsonClientConnection.cpp index 9298a3d2..5a11dc59 100644 --- a/libsrc/jsonserver/JsonClientConnection.cpp +++ b/libsrc/jsonserver/JsonClientConnection.cpp @@ -409,6 +409,8 @@ void JsonClientConnection::handleServerInfoCommand(const Json::Value &) transform["saturationGain"] = colorTransform->_hsvTransform.getSaturationGain(); transform["valueGain"] = colorTransform->_hsvTransform.getValueGain(); + transform["saturationLGain"] = colorTransform->_hslTransform.getSaturationGain(); + transform["luminanceGain"] = colorTransform->_hslTransform.getLuminanceGain(); Json::Value & threshold = transform["threshold"]; threshold.append(colorTransform->_rgbRedTransform.getThreshold()); diff --git a/src/hyperion-remote/JsonConnection.cpp b/src/hyperion-remote/JsonConnection.cpp index 150fa63a..009647af 100644 --- a/src/hyperion-remote/JsonConnection.cpp +++ b/src/hyperion-remote/JsonConnection.cpp @@ -216,12 +216,12 @@ void JsonConnection::setTransform(std::string * transformId, double * saturation transform["valueGain"] = *value; } - if (saturation != nullptr) + if (saturationL != nullptr) { transform["saturationLGain"] = *saturationL; } - if (value != nullptr) + if (luminance != nullptr) { transform["luminanceGain"] = *luminance; }