From 9a24e026a29fe66f223509bbd5be9eac3134bf41 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Sun, 10 Oct 2021 10:27:22 +0200 Subject: [PATCH] fix: qmk info.json format --- keyboards/minimon/index_tab/info.json | 1142 ++++++++++++++++++++++++- lib/chibios | 2 +- lib/chibios-contrib | 2 +- lib/googletest | 2 +- lib/lufa | 2 +- 5 files changed, 1128 insertions(+), 22 deletions(-) diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json index 0350b32a0a40..9b105a6b7b30 100644 --- a/keyboards/minimon/index_tab/info.json +++ b/keyboards/minimon/index_tab/info.json @@ -1,26 +1,1132 @@ { - "name": "Index Tab", - "vendorId": "0x4B49", - "productId": "0x1306", - "lighting": "qmk_rgblight", + "keyboard_name": "Index Tab", + "maintainer": "kyrremann", "url": "https://github.com/Kyrremann/index-tab", - "matrix": { - "rows": 6, - "cols": 13 + "rgblight": { + "led_count": 10, + "pin": "E6" + }, + "usb": { + "vid": "0x4B49", + "pid": "0x1306", + "device_ver": "0x0001" + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["D3", "B7", "B3", "B2", "B1", "B0"], + "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D2", "F1", "F0"] }, "layouts": { - "labels": [ - ["Bottom row", "2x2u", "7u", "Full ortho"] + "LAYOUT_2u": [ + { + "label": "CAPS", + "x": 0, + "y": 0.75 + }, + { + "label": "F1", + "x": 1, + "y": 0.75 + }, + { + "label": "F2", + "x": 2, + "y": 0.75 + }, + { + "label": "F3", + "x": 3, + "y": 0.75 + }, + { + "label": "F4", + "x": 4, + "y": 0.75 + }, + { + "label": "F5", + "x": 5, + "y": 0.75 + }, + { + "label": "F6", + "x": 6, + "y": 0.75 + }, + { + "label": "F7", + "x": 7, + "y": 0.75 + }, + { + "label": "F8", + "x": 8, + "y": 0.75 + }, + { + "label": "F9", + "x": 9, + "y": 0.75 + }, + { + "label": "F10", + "x": 10, + "y": 0.75 + }, + { + "label": "F11", + "x": 11, + "y": 0.75 + }, + { + "label": "F12", + "x": 12, + "y": 0.75 + }, + { + "label": "§", + "x": 0, + "y": 1.75 + }, + { + "label": "1", + "x": 1, + "y": 1.75 + }, + { + "label": "2", + "x": 2, + "y": 1.75 + }, + { + "label": "3", + "x": 3, + "y": 1.75 + }, + { + "label": "4", + "x": 4, + "y": 1.75 + }, + { + "label": "5", + "x": 5, + "y": 1.75 + }, + { + "label": "6", + "x": 6, + "y": 1.75 + }, + { + "label": "7", + "x": 7, + "y": 1.75 + }, + { + "label": "8", + "x": 8, + "y": 1.75 + }, + { + "label": "9", + "x": 9, + "y": 1.75 + }, + { + "label": "0", + "x": 10, + "y": 1.75 + }, + { + "x": 11, + "y": 1.75 + }, + { + "x": 12, + "y": 1.75 + }, + { + "label": "TAB", + "x": 0, + "y": 2.75 + }, + { + "label": "q", + "x": 1, + "y": 2.75 + }, + { + "label": "w", + "x": 2, + "y": 2.75 + }, + { + "label": "e", + "x": 3, + "y": 2.75 + }, + { + "label": "r", + "x": 4, + "y": 2.75 + }, + { + "label": "t", + "x": 5, + "y": 2.75 + }, + { + "label": "y", + "x": 6, + "y": 2.75 + }, + { + "label": "u", + "x": 7, + "y": 2.75 + }, + { + "label": "i", + "x": 8, + "y": 2.75 + }, + { + "label": "o", + "x": 9, + "y": 2.75 + }, + { + "label": "p", + "x": 10, + "y": 2.75 + }, + { + "label": "å", + "x": 11, + "y": 2.75 + }, + { + "label": "BKSP", + "x": 12, + "y": 2.75 + }, + { + "label": "CTRL", + "x": 0, + "y": 3.75 + }, + { + "label": "a", + "x": 1, + "y": 3.75 + }, + { + "label": "s", + "x": 2, + "y": 3.75 + }, + { + "label": "d", + "x": 3, + "y": 3.75 + }, + { + "label": "f", + "x": 4, + "y": 3.75 + }, + { + "label": "g", + "x": 5, + "y": 3.75 + }, + { + "label": "h", + "x": 6, + "y": 3.75 + }, + { + "label": "j", + "x": 7, + "y": 3.75 + }, + { + "label": "k", + "x": 8, + "y": 3.75 + }, + { + "label": "l", + "x": 9, + "y": 3.75 + }, + { + "label": "ø", + "x": 10, + "y": 3.75 + }, + { + "label": "æ", + "x": 11, + "y": 3.75 + }, + { + "label": "↲", + "x": 12, + "y": 3.75 + }, + { + "label": "SHIFT", + "x": 0, + "y": 4.75 + }, + { + "label": "z", + "x": 1, + "y": 4.75 + }, + { + "label": "x", + "x": 2, + "y": 4.75 + }, + { + "label": "c", + "x": 3, + "y": 4.75 + }, + { + "label": "v", + "x": 4, + "y": 4.75 + }, + { + "label": "b", + "x": 5, + "y": 4.75 + }, + { + "label": "n", + "x": 6, + "y": 4.75 + }, + { + "label": "m", + "x": 7, + "y": 4.75 + }, + { + "label": ",", + "x": 8, + "y": 4.75 + }, + { + "label": ".", + "x": 9, + "y": 4.75 + }, + { + "label": "-", + "x": 10, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 11, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 12, + "y": 4.75 + }, + { + "label": "ESC", + "x": 0, + "y": 5.75 + }, + { + "label": "'", + "x": 1, + "y": 5.75 + }, + { + "label": "ALT", + "x": 2, + "y": 5.75 + }, + { + "label": "WIN", + "x": 3, + "y": 5.75 + }, + { + "x": 4, + "y": 5.75, + "w": 2 + }, + { + "x": 6, + "y": 5.75, + "w": 2 + }, + { + "label": "RSE", + "x": 8, + "y": 5.75 + }, + { + "label": "←", + "x": 9, + "y": 5.75 + }, + { + "label": "↑", + "x": 10, + "y": 5.75 + }, + { + "label": "↓", + "x": 11, + "y": 5.75 + }, + { + "label": "→", + "x": 12, + "y": 5.75 + } + ], + "LAYOUT_7u": [ + { + "label": "CAPS", + "x": 0, + "y": 0.75 + }, + { + "label": "F1", + "x": 1, + "y": 0.75 + }, + { + "label": "F2", + "x": 2, + "y": 0.75 + }, + { + "label": "F3", + "x": 3, + "y": 0.75 + }, + { + "label": "F4", + "x": 4, + "y": 0.75 + }, + { + "label": "F5", + "x": 5, + "y": 0.75 + }, + { + "label": "F6", + "x": 6, + "y": 0.75 + }, + { + "label": "F7", + "x": 7, + "y": 0.75 + }, + { + "label": "F8", + "x": 8, + "y": 0.75 + }, + { + "label": "F9", + "x": 9, + "y": 0.75 + }, + { + "label": "F10", + "x": 10, + "y": 0.75 + }, + { + "label": "F11", + "x": 11, + "y": 0.75 + }, + { + "label": "F12", + "x": 12, + "y": 0.75 + }, + { + "label": "§", + "x": 0, + "y": 1.75 + }, + { + "label": "1", + "x": 1, + "y": 1.75 + }, + { + "label": "2", + "x": 2, + "y": 1.75 + }, + { + "label": "3", + "x": 3, + "y": 1.75 + }, + { + "label": "4", + "x": 4, + "y": 1.75 + }, + { + "label": "5", + "x": 5, + "y": 1.75 + }, + { + "label": "6", + "x": 6, + "y": 1.75 + }, + { + "label": "7", + "x": 7, + "y": 1.75 + }, + { + "label": "8", + "x": 8, + "y": 1.75 + }, + { + "label": "9", + "x": 9, + "y": 1.75 + }, + { + "label": "0", + "x": 10, + "y": 1.75 + }, + { + "x": 11, + "y": 1.75 + }, + { + "x": 12, + "y": 1.75 + }, + { + "label": "TAB", + "x": 0, + "y": 2.75 + }, + { + "label": "q", + "x": 1, + "y": 2.75 + }, + { + "label": "w", + "x": 2, + "y": 2.75 + }, + { + "label": "e", + "x": 3, + "y": 2.75 + }, + { + "label": "r", + "x": 4, + "y": 2.75 + }, + { + "label": "t", + "x": 5, + "y": 2.75 + }, + { + "label": "y", + "x": 6, + "y": 2.75 + }, + { + "label": "u", + "x": 7, + "y": 2.75 + }, + { + "label": "i", + "x": 8, + "y": 2.75 + }, + { + "label": "o", + "x": 9, + "y": 2.75 + }, + { + "label": "p", + "x": 10, + "y": 2.75 + }, + { + "label": "å", + "x": 11, + "y": 2.75 + }, + { + "label": "BKSP", + "x": 12, + "y": 2.75 + }, + { + "label": "CTRL", + "x": 0, + "y": 3.75 + }, + { + "label": "a", + "x": 1, + "y": 3.75 + }, + { + "label": "s", + "x": 2, + "y": 3.75 + }, + { + "label": "d", + "x": 3, + "y": 3.75 + }, + { + "label": "f", + "x": 4, + "y": 3.75 + }, + { + "label": "g", + "x": 5, + "y": 3.75 + }, + { + "label": "h", + "x": 6, + "y": 3.75 + }, + { + "label": "j", + "x": 7, + "y": 3.75 + }, + { + "label": "k", + "x": 8, + "y": 3.75 + }, + { + "label": "l", + "x": 9, + "y": 3.75 + }, + { + "label": "ø", + "x": 10, + "y": 3.75 + }, + { + "label": "æ", + "x": 11, + "y": 3.75 + }, + { + "label": "↲", + "x": 12, + "y": 3.75 + }, + { + "label": "SHIFT", + "x": 0, + "y": 4.75 + }, + { + "label": "z", + "x": 1, + "y": 4.75 + }, + { + "label": "x", + "x": 2, + "y": 4.75 + }, + { + "label": "c", + "x": 3, + "y": 4.75 + }, + { + "label": "v", + "x": 4, + "y": 4.75 + }, + { + "label": "b", + "x": 5, + "y": 4.75 + }, + { + "label": "n", + "x": 6, + "y": 4.75 + }, + { + "label": "m", + "x": 7, + "y": 4.75 + }, + { + "label": ",", + "x": 8, + "y": 4.75 + }, + { + "label": ".", + "x": 9, + "y": 4.75 + }, + { + "label": "-", + "x": 10, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 11, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 12, + "y": 4.75 + }, + { + "x": 0, + "y": 5.75 + }, + { + "x": 1, + "y": 5.75 + }, + { + "x": 2, + "y": 5.75 + }, + { + "x": 3, + "y": 5.75, + "w": 7 + }, + { + "x": 10, + "y": 5.75 + }, + { + "x": 11, + "y": 5.75 + }, + { + "x": 12, + "y": 5.75 + } ], - "keymap": [ - ["0,0","0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11","0,12"], - ["1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12"], - ["2,0","2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11","2,12"], - ["3,0","3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11","3,12"], - ["4,0","4,1","4,2","4,3","4,4","4,5","4,6","4,7","4,8","4,9","4,10","4,11","4,12"], - [{"p":"2x2u"},"5,0","5,1","5,2","5,3\n\n\n0,0",{"w":2},"5,5\n\n\n0,0",{"w":2},"5,7\n\n\n0,0","5,8\n\n\n0,0","5,9\n\n\n0,0","5,10","5,11","5,12"], - [{"p":"7u"},{"w":7},"5,9\n\n\n0,1"], - [{"p":"Full ortho"},"5,3\n\n\n0,2","5,4\n\n\n0,2","5,5\n\n\n0,2","5,6\n\n\n0,2","5,7\n\n\n0,2","5,8\n\n\n0,2","5,9\n\n\n0,2"] + "LAYOUT_ortho": [ + { + "label": "CAPS", + "x": 0, + "y": 2 + }, + { + "label": "F1", + "x": 1, + "y": 2 + }, + { + "label": "F2", + "x": 2, + "y": 2 + }, + { + "label": "F3", + "x": 3, + "y": 2 + }, + { + "label": "F4", + "x": 4, + "y": 2 + }, + { + "label": "F5", + "x": 5, + "y": 2 + }, + { + "label": "F6", + "x": 6, + "y": 2 + }, + { + "label": "F7", + "x": 7, + "y": 2 + }, + { + "label": "F8", + "x": 8, + "y": 2 + }, + { + "label": "F9", + "x": 9, + "y": 2 + }, + { + "label": "F10", + "x": 10, + "y": 2 + }, + { + "label": "F11", + "x": 11, + "y": 2 + }, + { + "label": "F12", + "x": 12, + "y": 2 + }, + { + "label": "§", + "x": 0, + "y": 3 + }, + { + "label": "1", + "x": 1, + "y": 3 + }, + { + "label": "2", + "x": 2, + "y": 3 + }, + { + "label": "3", + "x": 3, + "y": 3 + }, + { + "label": "4", + "x": 4, + "y": 3 + }, + { + "label": "5", + "x": 5, + "y": 3 + }, + { + "label": "6", + "x": 6, + "y": 3 + }, + { + "label": "7", + "x": 7, + "y": 3 + }, + { + "label": "8", + "x": 8, + "y": 3 + }, + { + "label": "9", + "x": 9, + "y": 3 + }, + { + "label": "0", + "x": 10, + "y": 3 + }, + { + "x": 11, + "y": 3 + }, + { + "x": 12, + "y": 3 + }, + { + "label": "TAB", + "x": 0, + "y": 4 + }, + { + "label": "q", + "x": 1, + "y": 4 + }, + { + "label": "w", + "x": 2, + "y": 4 + }, + { + "label": "e", + "x": 3, + "y": 4 + }, + { + "label": "r", + "x": 4, + "y": 4 + }, + { + "label": "t", + "x": 5, + "y": 4 + }, + { + "label": "y", + "x": 6, + "y": 4 + }, + { + "label": "u", + "x": 7, + "y": 4 + }, + { + "label": "i", + "x": 8, + "y": 4 + }, + { + "label": "o", + "x": 9, + "y": 4 + }, + { + "label": "p", + "x": 10, + "y": 4 + }, + { + "label": "å", + "x": 11, + "y": 4 + }, + { + "label": "BKSP", + "x": 12, + "y": 4 + }, + { + "label": "CTRL", + "x": 0, + "y": 5 + }, + { + "label": "a", + "x": 1, + "y": 5 + }, + { + "label": "s", + "x": 2, + "y": 5 + }, + { + "label": "d", + "x": 3, + "y": 5 + }, + { + "label": "f", + "x": 4, + "y": 5 + }, + { + "label": "g", + "x": 5, + "y": 5 + }, + { + "label": "h", + "x": 6, + "y": 5 + }, + { + "label": "j", + "x": 7, + "y": 5 + }, + { + "label": "k", + "x": 8, + "y": 5 + }, + { + "label": "l", + "x": 9, + "y": 5 + }, + { + "label": "ø", + "x": 10, + "y": 5 + }, + { + "label": "æ", + "x": 11, + "y": 5 + }, + { + "label": "↲", + "x": 12, + "y": 5 + }, + { + "label": "SHIFT", + "x": 0, + "y": 6 + }, + { + "label": "z", + "x": 1, + "y": 6 + }, + { + "label": "x", + "x": 2, + "y": 6 + }, + { + "label": "c", + "x": 3, + "y": 6 + }, + { + "label": "v", + "x": 4, + "y": 6 + }, + { + "label": "b", + "x": 5, + "y": 6 + }, + { + "label": "n", + "x": 6, + "y": 6 + }, + { + "label": "m", + "x": 7, + "y": 6 + }, + { + "label": ",", + "x": 8, + "y": 6 + }, + { + "label": ".", + "x": 9, + "y": 6 + }, + { + "label": "-", + "x": 10, + "y": 6 + }, + { + "label": "SHIFT", + "x": 11, + "y": 6 + }, + { + "label": "SHIFT", + "x": 12, + "y": 6 + }, + { + "x": 0, + "y": 7 + }, + { + "x": 1, + "y": 7 + }, + { + "x": 2, + "y": 7 + }, + { + "x": 3, + "y": 7 + }, + { + "x": 4, + "y": 7 + }, + { + "x": 5, + "y": 7 + }, + { + "x": 6, + "y": 7 + }, + { + "x": 7, + "y": 7 + }, + { + "x": 8, + "y": 7 + }, + { + "x": 9, + "y": 7 + }, + { + "x": 10, + "y": 7 + }, + { + "x": 11, + "y": 7 + }, + { + "x": 12, + "y": 7 + } ] } } diff --git a/lib/chibios b/lib/chibios index 413e39c5681d..313416b8fda9 160000 --- a/lib/chibios +++ b/lib/chibios @@ -1 +1 @@ -Subproject commit 413e39c5681d181720440f2a8b7391f581788d7b +Subproject commit 313416b8fda90d9973a749a0a35970956852c286 diff --git a/lib/chibios-contrib b/lib/chibios-contrib index 4568901a91e9..e3a3a2404771 160000 --- a/lib/chibios-contrib +++ b/lib/chibios-contrib @@ -1 +1 @@ -Subproject commit 4568901a91e9bef78ea96a7a83e8150fe1f7353a +Subproject commit e3a3a24047717af33b098266e11c2e4e5102206a diff --git a/lib/googletest b/lib/googletest index e2239ee6043f..ec44c6c1675c 160000 --- a/lib/googletest +++ b/lib/googletest @@ -1 +1 @@ -Subproject commit e2239ee6043f73722e7aa812a459f54a28552929 +Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780 diff --git a/lib/lufa b/lib/lufa index 19a5d533f02a..ce10f7642b04 160000 --- a/lib/lufa +++ b/lib/lufa @@ -1 +1 @@ -Subproject commit 19a5d533f02a7b46eeadca99cc9699659cef7a60 +Subproject commit ce10f7642b0459e409839b23cc91498945119b4d