fix: Reverted device and types json to originals

rdkcentral · Aug 27, 2024 · d8431a5 · d8431a5
1 parent f9d5015
commit d8431a5
Show file tree

Hide file tree

Showing 2 changed files with 105 additions and 48 deletions.
diff --git a/src/openrpc/device.json b/src/openrpc/device.json
@@ -292,34 +292,7 @@
         "name": "versions",
         "summary": "the versions",
         "schema": {
-          "type": "object",
-          "properties": {
-            "sdk": {
-              "$ref": "https://meta.comcast.com/firebolt/types#/definitions/SemanticVersion",
-              "description": "The Firebolt SDK version"
-            },
-            "api": {
-              "$ref": "https://meta.comcast.com/firebolt/types#/definitions/SemanticVersion",
-              "description": "The lateset Firebolt API version supported by the curent device."
-            },
-            "firmware": {
-              "$ref": "https://meta.comcast.com/firebolt/types#/definitions/SemanticVersion",
-              "description": "The device firmware version."
-            },
-            "os": {
-              "$ref": "https://meta.comcast.com/firebolt/types#/definitions/SemanticVersion",
-              "description": "**Deprecated** Use `firmware`, instead."
-            },
-            "debug": {
-              "type": "string",
-              "description": "Detail version as a string, for debugging purposes"
-            }
-          },
-          "required": [
-            "api",
-            "firmware",
-            "os"
-          ]
+          "$ref": "#/components/schemas/DeviceVersion"
         }
       },
       "examples": [
@@ -388,8 +361,8 @@
           "result": {
             "name": "Default Result",
             "value": {
-              "hdcp14": true,
-              "hdcp22": true
+              "hdcp1.4": true,
+              "hdcp2.2": true
             }
           }
         }
@@ -463,7 +436,8 @@
             "name": "Default Result",
             "value": {
               "stereo": true,
-              "dolbyDigital51": true,
+              "dolbyDigital5.1": true,
+              "dolbyDigital5.1+": true,
               "dolbyAtmos": true
             }
           }
@@ -746,20 +720,98 @@
   "components": {
     "schemas": {
       "Resolution": {
-        "type": "array",
-        "items": [
+        "oneOf": [
+          {
+            "type": "array",
+            "items": [
+              {
+                "type": "integer",
+                "const": 720,
+                "description": "Width in pixels"
+              },
+              {
+                "type": "integer",
+                "const": 480,
+                "description": "Height in pixels"
+              }
+            ],
+            "additionalItems": false,
+            "minItems": 2,
+            "maxItems": 2
+          },
+          {
+            "type": "array",
+            "items": [
+              {
+                "type": "integer",
+                "const": 720,
+                "description": "Width in pixels"
+              },
+              {
+                "type": "integer",
+                "const": 576,
+                "description": "Height in pixels"
+              }
+            ],
+            "additionalItems": false,
+            "minItems": 2,
+            "maxItems": 2
+          },
+          {
+            "type": "array",
+            "items": [
+              {
+                "type": "integer",
+                "const": 1280,
+                "description": "Width in pixels"
+              },
+              {
+                "type": "integer",
+                "const": 720,
+                "description": "Height in pixels"
+              }
+            ],
+            "additionalItems": false,
+            "minItems": 2,
+            "maxItems": 2
+          },
           {
-            "type": "integer",
-            "description": "Width in pixels"
+            "type": "array",
+            "items": [
+              {
+                "type": "integer",
+                "const": 1920,
+                "description": "Width in pixels"
+              },
+              {
+                "type": "integer",
+                "const": 1080,
+                "description": "Height in pixels"
+              }
+            ],
+            "additionalItems": false,
+            "minItems": 2,
+            "maxItems": 2
           },
           {
-            "type": "integer",
-            "description": "Height in pixels"
+            "type": "array",
+            "items": [
+              {
+                "type": "integer",
+                "const": 3840,
+                "description": "Width in pixels"
+              },
+              {
+                "type": "integer",
+                "const": 2160,
+                "description": "Height in pixels"
+              }
+            ],
+            "additionalItems": false,
+            "minItems": 2,
+            "maxItems": 2
           }
-        ],
-        "additionalItems": false,
-        "minItems": 2,
-        "maxItems": 2
+        ]
       },
       "NetworkType": {
         "title": "NetworkType",
@@ -787,7 +839,10 @@
           "stereo": {
             "type": "boolean"
           },
-          "dolbyDigital51": {
+          "dolbyDigital5.1": {
+            "type": "boolean"
+          },
+          "dolbyDigital5.1+": {
             "type": "boolean"
           },
           "dolbyAtmos": {
@@ -796,7 +851,8 @@
         },
         "required": [
           "stereo",
-          "dolbyDigital51",
+          "dolbyDigital5.1",
+          "dolbyDigital5.1+",
           "dolbyAtmos"
         ]
       },
@@ -829,16 +885,16 @@
         "title": "HDCPVersionMap",
         "type": "object",
         "properties": {
-          "hdcp14": {
+          "hdcp1.4": {
             "type": "boolean"
           },
-          "hdcp22": {
+          "hdcp2.2": {
             "type": "boolean"
           }
         },
         "required": [
-          "hdcp14",
-          "hdcp22"
+          "hdcp1.4",
+          "hdcp2.2"
         ],
         "description": "The type of HDCP versions that is supported"
       },

diff --git a/src/schemas/types.json b/src/schemas/types.json
@@ -35,7 +35,8 @@
             "type": "string",
             "enum": [
                 "stereo",
-                "dolbyDigital51",
+                "dolbyDigital5.1",
+                "dolbyDigital5.1+",
                 "dolbyAtmos"
             ]
         },