From c72ed7c02473dec4da6cb263c1e0fb2ca4856b94 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 17 Jan 2022 08:44:34 +1100
Subject: CLI: Parse USB device version BCD (#14580)

* CLI: Parse USB device version BCD

* Apply suggestions
---
 data/schemas/definitions.jsonschema | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'data/schemas/definitions.jsonschema')

diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
index 822f237073..3f92e289a7 100644
--- a/data/schemas/definitions.jsonschema
+++ b/data/schemas/definitions.jsonschema
@@ -20,6 +20,10 @@
         "type": "string",
         "pattern": "^0x[0-9A-F]{4}$"
     },
+    "bcd_version": {
+        "type": "string",
+        "pattern": "^[0-9]{1,2}\\.[0-9]\\.[0-9]$"
+    },
     "text_identifier": {
         "type": "string",
         "minLength": 1,
@@ -70,13 +74,13 @@
     "signed_int": {
         "type": "number",
         "multipleOf": 1
-    }
+    },
     "signed_int_8": {
         "type": "number",
         "min": -127,
         "max": 127,
         "multipleOf": 1
-    }
+    },
     "string_array": {
         "type": "array",
         "items": {
@@ -97,7 +101,7 @@
         "type": "number",
         "min": 0,
         "multipleOf": 1
-    }
+    },
     "unsigned_int_8": {
         "type": "number",
         "min": 0,
-- 
cgit v1.2.1


From fede569bbe66e2fa0b16cc3ac7b7e6b66daf9f86 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 15 Feb 2022 04:41:16 +0000
Subject: Allow NO_PIN within info.json (#16359)

---
 data/schemas/definitions.jsonschema | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'data/schemas/definitions.jsonschema')

diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
index 3f92e289a7..9fd503a108 100644
--- a/data/schemas/definitions.jsonschema
+++ b/data/schemas/definitions.jsonschema
@@ -51,6 +51,10 @@
     },
     "mcu_pin": {
         "oneOf": [
+            {
+                "type": "string",
+                "enum": ["NO_PIN"]
+            },
             {
                 "type": "string",
                 "pattern": "^[A-K]\\d{1,2}$"
-- 
cgit v1.2.1