merge upstream master

2 files changed, 343 insertions, 7 deletions

diff --git a/keyboards/keebio/kbo5000/rev1/config.h b/keyboards/keebio/kbo5000/rev1/config.h
index 5d065fe1c2..3d3253d2c3 100644
--- a/keyboards/keebio/kbo5000/rev1/config.h
+++ b/keyboards/keebio/kbo5000/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       0xCB10
-#define PRODUCT_ID      0x126A
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    Keebio
-#define PRODUCT         KBO-5000 Rev. 1
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 12
diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json
new file mode 100644
index 0000000000..b07e73f17e
--- /dev/null
+++ b/keyboards/keebio/kbo5000/rev1/info.json
@@ -0,0 +1,343 @@
+{
+    "keyboard_name": "KBO-5000 Rev. 1",
+    "manufacturer": "Keebio",
+    "url": "https://keeb.io",
+    "maintainer": "nooges",
+    "usb": {
+        "vid": "0xCB10",
+        "pid": "0x126A",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+
+                {"label":"F7", "x":10, "y":0},
+                {"label":"F8", "x":11, "y":0},
+                {"label":"F9", "x":12.5, "y":0},
+                {"label":"F10", "x":13.5, "y":0},
+                {"label":"F11", "x":14.5, "y":0},
+                {"label":"F12", "x":15.5, "y":0},
+                {"label":"Prt Sc", "x":17.5, "y":0},
+                {"label":"Scr Lk", "x":18.5, "y":0},
+                {"label":"Pause", "x":19.5, "y":0},
+
+                {"label":"F13", "x":0, "y":1.25},
+                {"label":"~", "x":1.5, "y":1.25},
+                {"label":"!", "x":2.5, "y":1.25},
+                {"label":"@", "x":3.5, "y":1.25},
+                {"label":"#", "x":4.5, "y":1.25},
+                {"label":"$", "x":5.5, "y":1.25},
+                {"label":"%", "x":6.5, "y":1.25},
+                {"label":"^", "x":7.5, "y":1.25},
+
+                {"label":"&", "x":10, "y":1.25},
+                {"label":"*", "x":11, "y":1.25},
+                {"label":"(", "x":12, "y":1.25},
+                {"label":")", "x":13, "y":1.25},
+                {"label":"_", "x":14, "y":1.25},
+                {"label":"+", "x":15, "y":1.25},
+                {"label":"Del", "x":16, "y":1.25},
+                {"label":"Bksp", "x":17, "y":1.25},
+                {"label":"Ins", "x":18.5, "y":1.25},
+                {"label":"Pg Up", "x":19.5, "y":1.25},
+
+                {"label":"F14", "x":0, "y":2.25},
+                {"label":"Tab", "x":1.5, "y":2.25, "w":1.5},
+                {"label":"Q", "x":3, "y":2.25},
+                {"label":"W", "x":4, "y":2.25},
+                {"label":"E", "x":5, "y":2.25},
+                {"label":"R", "x":6, "y":2.25},
+                {"label":"T", "x":7, "y":2.25},
+
+                {"label":"Y", "x":9.5, "y":2.25},
+                {"label":"U", "x":10.5, "y":2.25},
+                {"label":"I", "x":11.5, "y":2.25},
+                {"label":"O", "x":12.5, "y":2.25},
+                {"label":"P", "x":13.5, "y":2.25},
+                {"label":"{", "x":14.5, "y":2.25},
+                {"label":"}", "x":15.5, "y":2.25},
+                {"label":"|", "x":16.5, "y":2.25, "w":1.5},
+                {"label":"Del", "x":18.5, "y":2.25},
+                {"label":"Pg Dn", "x":19.5, "y":2.25},
+
+                {"label":"F15", "x":0, "y":3.25},
+                {"label":"Caps Lock", "x":1.5, "y":3.25, "w":1.75},
+                {"label":"A", "x":3.25, "y":3.25},
+                {"label":"S", "x":4.25, "y":3.25},
+                {"label":"D", "x":5.25, "y":3.25},
+                {"label":"F", "x":6.25, "y":3.25},
+                {"label":"G", "x":7.25, "y":3.25},
+
+                {"label":"H", "x":9.75, "y":3.25},
+                {"label":"J", "x":10.75, "y":3.25},
+                {"label":"K", "x":11.75, "y":3.25},
+                {"label":"L", "x":12.75, "y":3.25},
+                {"label":":", "x":13.75, "y":3.25},
+                {"label":"\"", "x":14.75, "y":3.25},
+                {"label":"Enter", "x":15.75, "y":3.25, "w":2.25},
+                {"label":"Home", "x":18.5, "y":3.25},
+                {"label":"End", "x":19.5, "y":3.25},
+
+                {"label":"F16", "x":0, "y":4.25},
+                {"label":"Shift", "x":1.5, "y":4.25, "w":2.25},
+                {"label":"Z", "x":3.75, "y":4.25},
+                {"label":"X", "x":4.75, "y":4.25},
+                {"label":"C", "x":5.75, "y":4.25},
+                {"label":"V", "x":6.75, "y":4.25},
+                {"label":"B", "x":7.75, "y":4.25},
+                {"label":"N", "x":10.25, "y":4.25},
+                {"label":"M", "x":11.25, "y":4.25},
+                {"label":"<", "x":12.25, "y":4.25},
+                {"label":">", "x":13.25, "y":4.25},
+                {"label":"?", "x":14.25, "y":4.25},
+                {"label":"Shift", "x":15.25, "y":4.25, "w":1.75},
+                {"label":"Up", "x":18.5, "y":4.25},
+
+                {"label":"F17", "x":0, "y":5.25},
+                {"label":"Ctrl", "x":1.5, "y":5.25, "w":1.25},
+                {"label":"Win", "x":2.75, "y":5.25},
+                {"label":"Alt", "x":3.75, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":6.25, "y":5.25},
+                {"label":"Fn", "x":7.25, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":10, "y":5.25, "w":1.25},
+                {"label":"Space", "x":11.25, "y":5.25, "w":2.25},
+                {"label":"Alt", "x":13.5, "y":5.25, "w":1.25},
+                {"label":"Win", "x":14.75, "y":5.25},
+                {"label":"Ctrl", "x":15.75, "y":5.25, "w":1.25},
+                {"label":"Left", "x":17.5, "y":5.25},
+                {"label":"Down", "x":18.5, "y":5.25},
+                {"label":"Right", "x":19.5, "y":5.25}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+
+                {"label":"F7", "x":10, "y":0},
+                {"label":"F8", "x":11, "y":0},
+                {"label":"F9", "x":12.5, "y":0},
+                {"label":"F10", "x":13.5, "y":0},
+                {"label":"F11", "x":14.5, "y":0},
+                {"label":"F12", "x":15.5, "y":0},
+                {"label":"Prt Sc", "x":17.5, "y":0},
+                {"label":"Scr Lk", "x":18.5, "y":0},
+                {"label":"Pause", "x":19.5, "y":0},
+
+                {"label":"F13", "x":0, "y":1.25},
+                {"label":"~", "x":1.5, "y":1.25},
+                {"label":"!", "x":2.5, "y":1.25},
+                {"label":"@", "x":3.5, "y":1.25},
+                {"label":"#", "x":4.5, "y":1.25},
+                {"label":"$", "x":5.5, "y":1.25},
+                {"label":"%", "x":6.5, "y":1.25},
+                {"label":"^", "x":7.5, "y":1.25},
+
+                {"label":"&", "x":10, "y":1.25},
+                {"label":"*", "x":11, "y":1.25},
+                {"label":"(", "x":12, "y":1.25},
+                {"label":")", "x":13, "y":1.25},
+                {"label":"_", "x":14, "y":1.25},
+                {"label":"+", "x":15, "y":1.25},
+                {"label":"Del", "x":16, "y":1.25},
+                {"label":"Bksp", "x":17, "y":1.25},
+                {"label":"Ins", "x":18.5, "y":1.25},
+                {"label":"Pg Up", "x":19.5, "y":1.25},
+
+                {"label":"F14", "x":0, "y":2.25},
+                {"label":"Tab", "x":1.5, "y":2.25, "w":1.5},
+                {"label":"Q", "x":3, "y":2.25},
+                {"label":"W", "x":4, "y":2.25},
+                {"label":"E", "x":5, "y":2.25},
+                {"label":"R", "x":6, "y":2.25},
+                {"label":"T", "x":7, "y":2.25},
+
+                {"label":"Y", "x":9.5, "y":2.25},
+                {"label":"U", "x":10.5, "y":2.25},
+                {"label":"I", "x":11.5, "y":2.25},
+                {"label":"O", "x":12.5, "y":2.25},
+                {"label":"P", "x":13.5, "y":2.25},
+                {"label":"{", "x":14.5, "y":2.25},
+                {"label":"}", "x":15.5, "y":2.25},
+                {"label":"Del", "x":18.5, "y":2.25},
+                {"label":"Pg Dn", "x":19.5, "y":2.25},
+
+                {"label":"F15", "x":0, "y":3.25},
+                {"label":"Caps Lock", "x":1.5, "y":3.25, "w":1.75},
+                {"label":"A", "x":3.25, "y":3.25},
+                {"label":"S", "x":4.25, "y":3.25},
+                {"label":"D", "x":5.25, "y":3.25},
+                {"label":"F", "x":6.25, "y":3.25},
+                {"label":"G", "x":7.25, "y":3.25},
+
+                {"label":"H", "x":9.75, "y":3.25},
+                {"label":"J", "x":10.75, "y":3.25},
+                {"label":"K", "x":11.75, "y":3.25},
+                {"label":"L", "x":12.75, "y":3.25},
+                {"label":":", "x":13.75, "y":3.25},
+                {"label":"\"", "x":14.75, "y":3.25},
+                {"label":"#", "x":15.75, "y":3.25},
+                {"label":"Enter", "x":16.75, "y":2.25, "w":1.25, "h":2},
+                {"label":"Home", "x":18.5, "y":3.25},
+                {"label":"End", "x":19.5, "y":3.25},
+
+                {"label":"F16", "x":0, "y":4.25},
+                {"label":"Shift", "x":1.5, "y":4.25, "w":1.25},
+                {"label":"\\", "x":2.75, "y":4.25},
+                {"label":"Z", "x":3.75, "y":4.25},
+                {"label":"X", "x":4.75, "y":4.25},
+                {"label":"C", "x":5.75, "y":4.25},
+                {"label":"V", "x":6.75, "y":4.25},
+                {"label":"B", "x":7.75, "y":4.25},
+                {"label":"N", "x":10.25, "y":4.25},
+                {"label":"M", "x":11.25, "y":4.25},
+                {"label":"<", "x":12.25, "y":4.25},
+                {"label":">", "x":13.25, "y":4.25},
+                {"label":"?", "x":14.25, "y":4.25},
+                {"label":"Shift", "x":15.25, "y":4.25, "w":1.75},
+                {"label":"Up", "x":18.5, "y":4.25},
+
+                {"label":"F17", "x":0, "y":5.25},
+                {"label":"Ctrl", "x":1.5, "y":5.25, "w":1.25},
+                {"label":"Win", "x":2.75, "y":5.25},
+                {"label":"Alt", "x":3.75, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":6.25, "y":5.25},
+                {"label":"Fn", "x":7.25, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":10, "y":5.25, "w":1.25},
+                {"label":"Space", "x":11.25, "y":5.25, "w":2.25},
+                {"label":"Alt", "x":13.5, "y":5.25, "w":1.25},
+                {"label":"Win", "x":14.75, "y":5.25},
+                {"label":"Ctrl", "x":15.75, "y":5.25, "w":1.25},
+                {"label":"Left", "x":17.5, "y":5.25},
+                {"label":"Down", "x":18.5, "y":5.25},
+                {"label":"Right", "x":19.5, "y":5.25}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+
+                {"label":"F7", "x":10, "y":0},
+                {"label":"F8", "x":11, "y":0},
+                {"label":"F9", "x":12.5, "y":0},
+                {"label":"F10", "x":13.5, "y":0},
+                {"label":"F11", "x":14.5, "y":0},
+                {"label":"F12", "x":15.5, "y":0},
+                {"label":"Prt Sc", "x":17.5, "y":0},
+                {"label":"Scr Lk", "x":18.5, "y":0},
+                {"label":"Pause", "x":19.5, "y":0},
+
+                {"label":"F13", "x":0, "y":1.25},
+                {"label":"~", "x":1.5, "y":1.25},
+                {"label":"!", "x":2.5, "y":1.25},
+                {"label":"@", "x":3.5, "y":1.25},
+                {"label":"#", "x":4.5, "y":1.25},
+                {"label":"$", "x":5.5, "y":1.25},
+                {"label":"%", "x":6.5, "y":1.25},
+                {"label":"^", "x":7.5, "y":1.25},
+
+                {"label":"&", "x":10, "y":1.25},
+                {"label":"*", "x":11, "y":1.25},
+                {"label":"(", "x":12, "y":1.25},
+                {"label":")", "x":13, "y":1.25},
+                {"label":"_", "x":14, "y":1.25},
+                {"label":"+", "x":15, "y":1.25},
+                {"label":"Del", "x":16, "y":1.25},
+                {"label":"Bksp", "x":17, "y":1.25},
+                {"label":"Ins", "x":18.5, "y":1.25},
+                {"label":"Pg Up", "x":19.5, "y":1.25},
+
+                {"label":"F14", "x":0, "y":2.25},
+                {"label":"Tab", "x":1.5, "y":2.25, "w":1.5},
+                {"label":"Q", "x":3, "y":2.25},
+                {"label":"W", "x":4, "y":2.25},
+                {"label":"E", "x":5, "y":2.25},
+                {"label":"R", "x":6, "y":2.25},
+                {"label":"T", "x":7, "y":2.25},
+
+                {"label":"Y", "x":9.5, "y":2.25},
+                {"label":"U", "x":10.5, "y":2.25},
+                {"label":"I", "x":11.5, "y":2.25},
+                {"label":"O", "x":12.5, "y":2.25},
+                {"label":"P", "x":13.5, "y":2.25},
+                {"label":"{", "x":14.5, "y":2.25},
+                {"label":"}", "x":15.5, "y":2.25},
+                {"label":"|", "x":16.5, "y":2.25, "w":1.5},
+                {"label":"Del", "x":18.5, "y":2.25},
+                {"label":"Pg Dn", "x":19.5, "y":2.25},
+
+                {"label":"F15", "x":0, "y":3.25},
+                {"label":"Caps Lock", "x":1.5, "y":3.25, "w":1.75},
+                {"label":"A", "x":3.25, "y":3.25},
+                {"label":"S", "x":4.25, "y":3.25},
+                {"label":"D", "x":5.25, "y":3.25},
+                {"label":"F", "x":6.25, "y":3.25},
+                {"label":"G", "x":7.25, "y":3.25},
+
+                {"label":"H", "x":9.75, "y":3.25},
+                {"label":"J", "x":10.75, "y":3.25},
+                {"label":"K", "x":11.75, "y":3.25},
+                {"label":"L", "x":12.75, "y":3.25},
+                {"label":":", "x":13.75, "y":3.25},
+                {"label":"\"", "x":14.75, "y":3.25},
+                {"label":"#", "x":15.75, "y":3.25},
+                {"label":"Enter", "x":16.75, "y":3.25, "w":1.25},
+                {"label":"Home", "x":18.5, "y":3.25},
+                {"label":"End", "x":19.5, "y":3.25},
+
+                {"label":"F16", "x":0, "y":4.25},
+                {"label":"Shift", "x":1.5, "y":4.25, "w":1.25},
+                {"label":"\\", "x":2.75, "y":4.25},
+                {"label":"Z", "x":3.75, "y":4.25},
+                {"label":"X", "x":4.75, "y":4.25},
+                {"label":"C", "x":5.75, "y":4.25},
+                {"label":"V", "x":6.75, "y":4.25},
+                {"label":"B", "x":7.75, "y":4.25},
+                {"label":"N", "x":10.25, "y":4.25},
+                {"label":"M", "x":11.25, "y":4.25},
+                {"label":"<", "x":12.25, "y":4.25},
+                {"label":">", "x":13.25, "y":4.25},
+                {"label":"?", "x":14.25, "y":4.25},
+                {"label":"Shift", "x":15.25, "y":4.25, "w":1.75},
+                {"label":"Up", "x":18.5, "y":4.25},
+
+                {"label":"F17", "x":0, "y":5.25},
+                {"label":"Ctrl", "x":1.5, "y":5.25, "w":1.25},
+                {"label":"Win", "x":2.75, "y":5.25},
+                {"label":"Alt", "x":3.75, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":6.25, "y":5.25},
+                {"label":"Fn", "x":7.25, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":10, "y":5.25, "w":1.25},
+                {"label":"Space", "x":11.25, "y":5.25, "w":2.25},
+                {"label":"Alt", "x":13.5, "y":5.25, "w":1.25},
+                {"label":"Win", "x":14.75, "y":5.25},
+                {"label":"Ctrl", "x":15.75, "y":5.25, "w":1.25},
+                {"label":"Left", "x":17.5, "y":5.25},
+                {"label":"Down", "x":18.5, "y":5.25},
+                {"label":"Right", "x":19.5, "y":5.25}
+            ]
+        }
+    }
+}