Merge remote-tracking branch 'origin/master' into develop

12 files changed, 15 insertions, 15 deletions

diff --git a/keyboards/dyz/dyz40/info.json b/keyboards/dyz/dyz40/info.json
index 2a30ca0bb2..db525a4707 100644
--- a/keyboards/dyz/dyz40/info.json
+++ b/keyboards/dyz/dyz40/info.json
@@ -20,7 +20,7 @@
     "usb": {
         "vid": "0xD772",
         "pid": "0x000B",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/dyz/dyz_tkl/info.json b/keyboards/dyz/dyz_tkl/info.json
index 8cba9c24e7..07a1a7cb7b 100644
--- a/keyboards/dyz/dyz_tkl/info.json
+++ b/keyboards/dyz/dyz_tkl/info.json
@@ -17,7 +17,7 @@
     "usb": {
         "vid": "0xD772",
         "pid": "0x000C",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/dyz/selka40/info.json b/keyboards/dyz/selka40/info.json
index b947bbb59a..740eb0d5f1 100644
--- a/keyboards/dyz/selka40/info.json
+++ b/keyboards/dyz/selka40/info.json
@@ -20,7 +20,7 @@
     "usb": {
         "vid": "0xD772",
         "pid": "0x0012",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/dyz/synthesis60/info.json b/keyboards/dyz/synthesis60/info.json
index 381e7efb36..c0d9baf560 100644
--- a/keyboards/dyz/synthesis60/info.json
+++ b/keyboards/dyz/synthesis60/info.json
@@ -35,7 +35,7 @@
     "usb": {
         "vid": "0xD772",
         "pid": "0x0017",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/handwired/3dortho14u/rev1/info.json b/keyboards/handwired/3dortho14u/rev1/info.json
index 72ed95e5f4..bd9220281c 100644
--- a/keyboards/handwired/3dortho14u/rev1/info.json
+++ b/keyboards/handwired/3dortho14u/rev1/info.json
@@ -28,9 +28,9 @@
       "rows": ["B0", "B1", "B2", "B3", "B7"]
     },
     "usb": {
-      "device_ver": "0x0001",
+      "vid": "0x6662",
       "pid": "0x3D14",
-      "vid": "0x6662"
+      "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/handwired/3dortho14u/rev2/info.json b/keyboards/handwired/3dortho14u/rev2/info.json
index 705d6b5570..7f241f35ff 100644
--- a/keyboards/handwired/3dortho14u/rev2/info.json
+++ b/keyboards/handwired/3dortho14u/rev2/info.json
@@ -28,9 +28,9 @@
       "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
     },
     "usb": {
-      "device_ver": "0x0001",
+      "vid": "0x6662",
       "pid": "0x3D14",
-      "vid": "0x6662"
+      "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/handwired/baredev/rev1/info.json b/keyboards/handwired/baredev/rev1/info.json
index 601b5df128..6292817538 100644
--- a/keyboards/handwired/baredev/rev1/info.json
+++ b/keyboards/handwired/baredev/rev1/info.json
@@ -44,7 +44,7 @@
     "usb": {
         "vid": "0x1209",
         "pid": "0x4126",
-        "device_ver": "0x0001",
+        "device_version": "0.0.1",
         "polling_interval": 1,
         "shared_endpoint": {
             "keyboard": true
diff --git a/keyboards/handwired/hillside/0_1/info.json b/keyboards/handwired/hillside/0_1/info.json
index 8c00f70366..7e128d5191 100644
--- a/keyboards/handwired/hillside/0_1/info.json
+++ b/keyboards/handwired/hillside/0_1/info.json
@@ -18,7 +18,7 @@
     "usb": {
       "vid": "0xFEED",
       "pid": "0x67C0",
-      "device_ver": "0x0001"
+      "device_version": "0.0.1"
     },
 
     "features": {
diff --git a/keyboards/handwired/pytest/info.json b/keyboards/handwired/pytest/info.json
index 5c941af9bf..331472762c 100644
--- a/keyboards/handwired/pytest/info.json
+++ b/keyboards/handwired/pytest/info.json
@@ -5,6 +5,6 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x6465",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     }
 }
diff --git a/keyboards/handwired/wakizashi40/info.json b/keyboards/handwired/wakizashi40/info.json
index eed6dd9417..b97d61171b 100644
--- a/keyboards/handwired/wakizashi40/info.json
+++ b/keyboards/handwired/wakizashi40/info.json
@@ -24,9 +24,9 @@
     "rows": ["D3", "D2", "D1", "D0"]
   },
   "usb": {
-    "device_ver": "0x0001",
+    "vid": "0x6662",
     "pid": "0x7740",
-    "vid": "0x6662"
+    "device_version": "0.0.1"
   },
   "layout_aliases": {
     "LAYOUT": "LAYOUT_all"
diff --git a/keyboards/karlb/kbic65/info.json b/keyboards/karlb/kbic65/info.json
index 560e162a3e..857f8d3cc5 100644
--- a/keyboards/karlb/kbic65/info.json
+++ b/keyboards/karlb/kbic65/info.json
@@ -29,7 +29,7 @@
     "usb": {
         "vid": "0x424B",
         "pid": "0xD87A",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/splitography/info.json b/keyboards/splitography/info.json
index 2d07607c29..a7f8bb7c95 100644
--- a/keyboards/splitography/info.json
+++ b/keyboards/splitography/info.json
@@ -23,7 +23,7 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x6060",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT": {