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

2 files changed, 59 insertions, 7 deletions

diff --git a/keyboards/uzu42/rev1/config.h b/keyboards/uzu42/rev1/config.h
index 4da4f02aa9..d8f474257e 100644
--- a/keyboards/uzu42/rev1/config.h
+++ b/keyboards/uzu42/rev1/config.h
@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x3060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    nrtkbb
-#define PRODUCT         uzu42
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 8
diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json
new file mode 100644
index 0000000000..f96564f36b
--- /dev/null
+++ b/keyboards/uzu42/rev1/info.json
@@ -0,0 +1,59 @@
+{
+  "keyboard_name": "uzu42",
+  "manufacturer": "nrtkbb",
+  "url": "https://github.com/nrtkbb/Keyboards/tree/master/uzu42",
+  "maintainer": "nrtkbb",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x3060",
+    "device_version": "0.0.1"
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"label":"Q", "x":0.375, "y":0},
+        {"label":"W", "x":1.375, "y":0},
+        {"label":"E", "x":2.375, "y":0},
+        {"label":"R", "x":3.375, "y":0.125},
+        {"label":"T", "x":4.375, "y":0.25},
+        {"label":"Y", "x":7.625, "y":0.25},
+        {"label":"U", "x":8.625, "y":0.125},
+        {"label":"I", "x":9.625, "y":0},
+        {"label":"O", "x":10.625, "y":0},
+        {"label":"P", "x":11.625, "y":0},
+        {"label":"A", "x":0.25, "y":1},
+        {"label":"S", "x":1.25, "y":1},
+        {"label":"D", "x":2.25, "y":1},
+        {"label":"F", "x":3.25, "y":1.125},
+        {"label":"G", "x":4.25, "y":1.25},
+        {"label":"H", "x":7.75, "y":1.25},
+        {"label":"J", "x":8.75, "y":1.125},
+        {"label":"K", "x":9.75, "y":1},
+        {"label":"L", "x":10.75, "y":1},
+        {"label":"Ent", "x":11.75, "y":1},
+        {"label":"Z", "x":0.125, "y":2},
+        {"label":"X", "x":1.125, "y":2},
+        {"label":"C", "x":2.125, "y":2},
+        {"label":"V", "x":3.125, "y":2.125},
+        {"label":"B", "x":4.125, "y":2.25},
+        {"label":"N", "x":7.875, "y":2.25},
+        {"label":"M", "x":8.875, "y":2.125},
+        {"label":",", "x":9.875, "y":2},
+        {"label":".", "x":10.875, "y":2},
+        {"label":"/", "x":11.875, "y":2},
+        {"label":"Shift", "x":0, "y":3},
+        {"label":"Space", "x":1, "y":3},
+        {"label":"Alt", "x":2, "y":3.05},
+        {"label":"GUI", "x":3, "y":3.18},
+        {"label":"Lower", "x":4, "y":3.3},
+        {"label":"Esc", "x":5, "y":3.43},
+        {"label":"Space", "x":7, "y":3.43},
+        {"label":"Raise", "x":8, "y":3.3},
+        {"label":"BkSpc", "x":9, "y":3.18},
+        {"label":"Ctrl", "x":10, "y":3.05},
+        {"label":"GUI", "x":11, "y":3},
+        {"label":"No", "x":12, "y":3}
+      ]
+    }
+  }
+}