diff --git a/deploy/hyperion-remote b/deploy/hyperion-remote index 616f4ffd..51d6553d 100755 Binary files a/deploy/hyperion-remote and b/deploy/hyperion-remote differ diff --git a/deploy/hyperiond.REMOVED.git-id b/deploy/hyperiond.REMOVED.git-id index 155e2807..ffa4726e 100644 --- a/deploy/hyperiond.REMOVED.git-id +++ b/deploy/hyperiond.REMOVED.git-id @@ -1 +1 @@ -eec9520a7c9861d27e5944da29ba31a5fcee41eb \ No newline at end of file +a0d2edb5c6043c421c8efc82a4b86edaa6d8837e \ No newline at end of file diff --git a/libsrc/hyperion/Hyperion.cpp b/libsrc/hyperion/Hyperion.cpp index 80791d1f..e8963de3 100644 --- a/libsrc/hyperion/Hyperion.cpp +++ b/libsrc/hyperion/Hyperion.cpp @@ -43,15 +43,18 @@ LedDevice* Hyperion::constructDevice(const Json::Value& deviceConfig) HsvTransform * Hyperion::createHsvTransform(const Json::Value & hsvConfig) { - return new HsvTransform(hsvConfig["saturationGain"].asDouble(), hsvConfig["valueGain"].asDouble()); + const double saturationGain = hsvConfig.get("saturationGain", 1.0).asDouble(); + const double valueGain = hsvConfig.get("valueGain", 1.0).asDouble(); + + return new HsvTransform(saturationGain, valueGain); } ColorTransform* Hyperion::createColorTransform(const Json::Value& colorConfig) { - const double threshold = colorConfig["threshold"].asDouble(); - const double gamma = colorConfig["gamma"].asDouble(); - const double blacklevel = colorConfig["blacklevel"].asDouble(); - const double whitelevel = colorConfig["whitelevel"].asDouble(); + const double threshold = colorConfig.get("threshold", 0.0).asDouble(); + const double gamma = colorConfig.get("gamma", 1.0).asDouble(); + const double blacklevel = colorConfig.get("blacklevel", 0.0).asDouble(); + const double whitelevel = colorConfig.get("whitelevel", 1.0).asDouble(); ColorTransform* transform = new ColorTransform(threshold, gamma, blacklevel, whitelevel); return transform;