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

2 files changed, 93 insertions, 7 deletions

diff --git a/keyboards/keebio/foldkb/rev1/config.h b/keyboards/keebio/foldkb/rev1/config.h
index ab4751f1f3..7985c3eb42 100644
--- a/keyboards/keebio/foldkb/rev1/config.h
+++ b/keyboards/keebio/foldkb/rev1/config.h
@@ -16,13 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xCB10
-#define PRODUCT_ID      0x1258
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    Keebio
-#define PRODUCT         FoldKB Rev. 1
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json
new file mode 100644
index 0000000000..da06fadac1
--- /dev/null
+++ b/keyboards/keebio/foldkb/rev1/info.json
@@ -0,0 +1,93 @@
+{
+    "keyboard_name": "FoldKB Rev. 1",
+    "manufacturer": "Keebio",
+    "url": "https://keeb.io",
+    "maintainer": "nooges",
+    "usb": {
+        "vid": "0xCB10",
+        "pid": "0x1258",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "Mute", "x": 0, "y": 0 },
+                { "label": "Esc", "x": 1.25, "y": 0 },
+                { "label": "~", "x": 2.25, "y": 0 },
+                { "label": "1", "x": 3.25, "y": 0 },
+                { "label": "2", "x": 4.25, "y": 0 },
+                { "label": "3", "x": 5.25, "y": 0 },
+                { "label": "4", "x": 6.25, "y": 0 },
+                { "label": "5", "x": 7.25, "y": 0 },
+                { "label": "6", "x": 9, "y": 0 },
+                { "label": "7", "x": 10, "y": 0 },
+                { "label": "8", "x": 11, "y": 0 },
+                { "label": "9", "x": 12, "y": 0 },
+                { "label": "0", "x": 13, "y": 0 },
+                { "label": "-", "x": 14, "y": 0 },
+                { "label": "=", "x": 15, "y": 0 },
+                { "label": "Bksp", "x": 16, "y": 0 },
+
+                { "label": "Home", "x": 0, "y": 1 },
+                { "label": "Tab", "x": 1.75, "y": 1, "w": 1.5 },
+                { "label": "Q", "x": 3.25, "y": 1 },
+                { "label": "W", "x": 4.25, "y": 1 },
+                { "label": "E", "x": 5.25, "y": 1 },
+                { "label": "R", "x": 6.25, "y": 1 },
+                { "label": "T", "x": 7.25, "y": 1 },
+                { "label": "Y", "x": 9, "y": 1 },
+                { "label": "U", "x": 10, "y": 1 },
+                { "label": "I", "x": 11, "y": 1 },
+                { "label": "O", "x": 12, "y": 1 },
+                { "label": "P", "x": 13, "y": 1 },
+                { "label": "[", "x": 14, "y": 1 },
+                { "label": "]", "x": 15, "y": 1 },
+                { "label": "\\", "x": 16, "y": 1, "w": 1.5 },
+
+                { "label": "End", "x": 0, "y": 2 },
+                { "label": "Caps", "x": 1.5, "y": 2, "w": 1.75 },
+                { "label": "A", "x": 3.25, "y": 2 },
+                { "label": "S", "x": 4.25, "y": 2 },
+                { "label": "D", "x": 5.25, "y": 2 },
+                { "label": "F", "x": 6.25, "y": 2 },
+                { "label": "G", "x": 7.25, "y": 2 },
+                { "label": "H", "x": 9, "y": 2 },
+                { "label": "J", "x": 10, "y": 2 },
+                { "label": "K", "x": 11, "y": 2 },
+                { "label": "L", "x": 12, "y": 2 },
+                { "label": ";", "x": 13, "y": 2 },
+                { "label": "'", "x": 14, "y": 2 },
+                { "label": "Enter", "x": 15, "y": 2, "w": 2.25 },
+
+                { "label": "PgUp", "x": 0, "y": 3 },
+                { "label": "Shift", "x": 1, "y": 3, "w": 2.25 },
+                { "label": "Z", "x": 3.25, "y": 3 },
+                { "label": "X", "x": 4.25, "y": 3 },
+                { "label": "C", "x": 5.25, "y": 3 },
+                { "label": "V", "x": 6.25, "y": 3 },
+                { "label": "B", "x": 7.25, "y": 3 },
+                { "label": "N", "x": 9, "y": 3 },
+                { "label": "M", "x": 10, "y": 3 },
+                { "label": ",", "x": 11, "y": 3 },
+                { "label": ".", "x": 12, "y": 3 },
+                { "label": "/", "x": 13, "y": 3 },
+                { "label": "Shift", "x": 14, "y": 3, "w": 1.75 },
+                { "label": "Fn1", "x": 15.75, "y": 3 },
+
+                { "label": "PgDn", "x": 0, "y": 4 },
+                { "label": "Ctrl", "x": 1.5, "y": 4, "w": 1.25 },
+                { "label": "Win", "x": 2.75, "y": 4, "w": 1.25 },
+                { "label": "Alt", "x": 4, "y": 4, "w": 1.25 },
+                { "label": "Fn1", "x": 5.25, "y": 4 },
+                { "label": "Space", "x": 6.25, "y": 4 },
+                { "label": "Space", "x": 7.25, "y": 4 },
+                { "label": "Space", "x": 9, "y": 4, "w": 1.25 },
+                { "label": "Space", "x": 10.25, "y": 4, "w": 1.5 },
+                { "label": "Alt", "x": 11.75, "y": 4, "w": 1.25 },
+                { "label": "Win", "x": 13, "y": 4, "w": 1.25 },
+                { "label": "Menu", "x": 14.25, "y": 4, "w": 1.25 },
+                { "label": "Ctrl", "x": 15.5, "y": 4, "w": 1.25 }
+            ]
+        }
+    }
+}