Merge branch 'master' into macos_compile

Conflicts: libsrc/leddevice/CMakeLists.txt libsrc/leddevice/LedDeviceFactory.cpp test/TestRs232HighSpeed.cpp Former-commit-id: 5583f2f881afd1a9b0c8ec3a52d7d3b54fe1dff7
2025-03-01 10:33:28 +00:00 · 2013-12-28 08:55:06 +01:00
parent e84f9eb147 71b8fd4879
commit fd835b5bfb
27 changed files with 1428 additions and 187 deletions
--- a/libsrc/hyperion/hyperion.schema.json
+++ b/libsrc/hyperion/hyperion.schema.json
@@ -255,6 +255,14 @@
                "grabMenu" : {
                    "type" : "boolean",
                    "required" : true
+                },
+                "grabScreensaver" : {
+                    "type" : "boolean",
+                    "required" : false
+                },
+                "enable3DDetection" : {
+                    "type" : "boolean",
+                    "required" : false
                }
            },
            "additionalProperties" : false