commit dc10828f8c1bcfea0d1a6168a1fc407e7d67b0be
author Brad Bishop <bradleyb@fuzziesquirrel.com> Thu Sep 24 19:01:28 2020 -0400
committer James Feist <james.feist@linux.intel.com> Thu Sep 24 23:14:40 2020 +0000
tree e37c2d460b9ca27334b699a32ce6f2ae95e20a7d
parent 0a2ab3c911d35c4c8421c47a7ce83d9341237785

schemas: Intel Fan Connector

Add a proper subschema for IntelFanConnector.  Remove status from legacy
json because IntelFanConnector was the only user.  Pwm and Tachs have
other users so we can't remove those until those classes have proper
subschema.

Change-Id: Ic4f330fbcfe6ff711ff9aef3fd65d138b145303a
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

schemas/Intel.json

diff --git a/schemas/Intel.json b/schemas/Intel.json
new file mode 100644
index 0000000..193fc18
--- /dev/null
+++ b/schemas/Intel.json
@@ -0,0 +1,37 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "definitions": {
+        "IntelFanConnector": {
+            "properties": {
+                "LED": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Pwm": {
+                    "type": "number"
+                },
+                "Tachs": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "enum": [
+                        "IntelFanConnector"
+                    ]
+                }
+            },
+            "required": [
+                "Name",
+                "Type",
+                "Status",
+                "Pwm",
+                "Tachs"
+            ],
+            "type": "object"
+        }
+    }
+}

schemas/global.json

diff --git a/schemas/global.json b/schemas/global.json
index ee49869..86236b3 100644
--- a/schemas/global.json
+++ b/schemas/global.json
@@ -9,6 +9,9 @@
             ],
             "oneOf": [
                 {
+                    "$ref": "Intel.json#/definitions/IntelFanConnector"
+                },
+                {
                     "$ref": "Pid.json#/definitions/Pid"
                 },
                 {

schemas/legacy.json

diff --git a/schemas/legacy.json b/schemas/legacy.json
index 8ac0515..ff47338 100644
--- a/schemas/legacy.json
+++ b/schemas/legacy.json
@@ -144,9 +144,6 @@
                 "SensorType": {
                     "$ref": "#/definitions/Types/SensorType"
                 },
-                "Status": {
-                    "$ref": "#/definitions/Types/Status"
-                },
                 "TachMaxPercent": {
                     "$ref": "#/definitions/Types/TachMaxPercent"
                 },
@@ -358,9 +355,6 @@
             "SensorType": {
                 "type": "string"
             },
-            "Status": {
-                "type": "string"
-            },
             "TachMaxPercent": {
                 "type": "number"
             },