From 9e2ee292b086fe74056cc11e265e4fa4949fe875 Mon Sep 17 00:00:00 2001 From: Robert Kossessa Date: Sat, 27 Jan 2024 02:53:22 +0100 Subject: [PATCH] UPD: Change schema to hsv --- src/data/nanoConfig.json | 28 +++++---- src/data/profileSchema.json | 118 ++++++++++++++++++++++++++++++------ 2 files changed, 116 insertions(+), 30 deletions(-) diff --git a/src/data/nanoConfig.json b/src/data/nanoConfig.json index dbad3a5..1b8b907 100644 --- a/src/data/nanoConfig.json +++ b/src/data/nanoConfig.json @@ -30,21 +30,22 @@ }, "ledConfig": { "ledEnable": true, + "ledBrightness": 100, "ledMode": 1, "primary": { "h": 255, "s": 255, - "l": 100 + "v": 100 }, "secondary": { "h": 255, "s": 255, - "l": 100 + "v": 100 }, "pointer": { "h": 255, "s": 255, - "l": 10 + "v": 10 } }, "guiConfig": { @@ -81,21 +82,22 @@ }, "ledConfig": { "ledEnable": true, + "ledBrightness": 100, "ledMode": 1, "primary": { "h": 255, "s": 255, - "l": 100 + "v": 100 }, "secondary": { "h": 255, "s": 255, - "l": 100 + "v": 100 }, "pointer": { "h": 255, "s": 255, - "l": 10 + "v": 10 } }, "guiConfig": { @@ -132,21 +134,22 @@ }, "ledConfig": { "ledEnable": true, + "ledBrightness": 100, "ledMode": 1, "primary": { "h": 255, "s": 255, - "l": 100 + "v": 100 }, "secondary": { "h": 255, "s": 255, - "l": 100 + "v": 100 }, "pointer": { "h": 255, "s": 255, - "l": 10 + "v": 10 } }, "guiConfig": { @@ -186,21 +189,22 @@ }, "ledConfig": { "ledEnable": true, + "ledBrightness": 100, "ledMode": 1, "primary": { "h": 100, "s": 100, - "l": 100 + "v": 100 }, "secondary": { "h": 120, "s": 120, - "l": 120 + "v": 120 }, "pointer": { "h": 255, "s": 255, - "l": 255 + "v": 255 } }, "guiConfig": { diff --git a/src/data/profileSchema.json b/src/data/profileSchema.json index 763f4b7..86e90bf 100644 --- a/src/data/profileSchema.json +++ b/src/data/profileSchema.json @@ -30,7 +30,11 @@ "description": "Flag to indicate whether to show the description" } }, - "required": ["profileDesc", "profileType", "showDesc"], + "required": [ + "profileDesc", + "profileType", + "showDesc" + ], "additionalProperties": false }, "feedbackConfig": { @@ -73,7 +77,17 @@ "description": "Secondary haptic volume" } }, - "required": ["feedbackEn", "feedbackType", "multiRev", "feedbackStrength", "endstopStrength", "outputRamp", "pos", "secondaryHaptic", "secondaryVol"], + "required": [ + "feedbackEn", + "feedbackType", + "multiRev", + "feedbackStrength", + "endstopStrength", + "outputRamp", + "pos", + "secondaryHaptic", + "secondaryVol" + ], "additionalProperties": false }, "mappingConfig": { @@ -104,7 +118,14 @@ "description": "Mapping for switch D" } }, - "required": ["internalMacro", "knobMap", "switchA", "switchB", "switchC", "switchD"], + "required": [ + "internalMacro", + "knobMap", + "switchA", + "switchB", + "switchC", + "switchD" + ], "additionalProperties": false }, "ledConfig": { @@ -114,6 +135,10 @@ "type": "boolean", "description": "Flag to enable LED" }, + "ledBrightness": { + "type": "integer", + "description": "LED brightness multiplier in percent" + }, "ledMode": { "type": "integer", "description": "LED mode" @@ -121,35 +146,81 @@ "primary": { "type": "object", "properties": { - "h": { "type": "integer", "description": "Hue value for primary LED" }, - "s": { "type": "integer", "description": "Saturation value for primary LED" }, - "l": { "type": "integer", "description": "Lightness value for primary LED" } + "h": { + "type": "integer", + "description": "Hue value for primary LED" + }, + "s": { + "type": "integer", + "description": "Saturation value for primary LED" + }, + "v": { + "type": "integer", + "description": "Value value for primary LED" + } }, - "required": ["h", "s", "l"], + "required": [ + "h", + "s", + "v" + ], "additionalProperties": false }, "secondary": { "type": "object", "properties": { - "h": { "type": "integer", "description": "Hue value for secondary LED" }, - "s": { "type": "integer", "description": "Saturation value for secondary LED" }, - "l": { "type": "integer", "description": "Lightness value for secondary LED" } + "h": { + "type": "integer", + "description": "Hue value for secondary LED" + }, + "s": { + "type": "integer", + "description": "Saturation value for secondary LED" + }, + "v": { + "type": "integer", + "description": "Value value for secondary LED" + } }, - "required": ["h", "s", "l"], + "required": [ + "h", + "s", + "v" + ], "additionalProperties": false }, "pointer": { "type": "object", "properties": { - "h": { "type": "integer", "description": "Hue value for pointer LED" }, - "s": { "type": "integer", "description": "Saturation value for pointer LED" }, - "l": { "type": "integer", "description": "Lightness value for pointer LED" } + "h": { + "type": "integer", + "description": "Hue value for pointer LED" + }, + "s": { + "type": "integer", + "description": "Saturation value for pointer LED" + }, + "v": { + "type": "integer", + "description": "Value value for pointer LED" + } }, - "required": ["h", "s", "l"], + "required": [ + "h", + "s", + "v" + ], "additionalProperties": false } }, - "required": ["ledEnable", "ledMode", "primary", "secondary", "pointer"], + "required": [ + "ledEnable", + "ledBrightness", + "ledMode", + "primary", + "secondary", + "pointer" + ], "additionalProperties": false }, "guiConfig": { @@ -160,10 +231,21 @@ "description": "Flag to enable GUI" } }, - "required": ["guiEnable"], + "required": [ + "guiEnable" + ], "additionalProperties": false } }, - "required": ["id", "name", "profileTag", "profileConfig", "feedbackConfig", "mappingConfig", "ledConfig", "guiConfig"], + "required": [ + "id", + "name", + "profileTag", + "profileConfig", + "feedbackConfig", + "mappingConfig", + "ledConfig", + "guiConfig" + ], "additionalProperties": false }