From 4871f651c5328cc8c16d1ec991f3e865094b24c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 27 Apr 2023 07:45:43 +1000 Subject: Move remaining `LAYOUT_all`s to data driven (#20463) --- keyboards/jones/v03/info.json | 233 +++++++++++++++++++++++++++++++++++++--- keyboards/jones/v03/v03.h | 105 ------------------ keyboards/jones/v03_1/info.json | 233 +++++++++++++++++++++++++++++++++++++--- keyboards/jones/v03_1/v03_1.c | 2 +- keyboards/jones/v03_1/v03_1.h | 105 ------------------ 5 files changed, 437 insertions(+), 241 deletions(-) delete mode 100644 keyboards/jones/v03/v03.h delete mode 100644 keyboards/jones/v03_1/v03_1.h (limited to 'keyboards/jones') diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/info.json index ca87554f1f..6b4dbb0884 100644 --- a/keyboards/jones/v03/info.json +++ b/keyboards/jones/v03/info.json @@ -22,28 +22,231 @@ "layouts": { "LAYOUT_ansi": { "layout": [ - {"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"", "x":7, "y":0}, {"label":"", "x":8, "y":0}, {"label":"", "x":9, "y":0}, {"label":"", "x":10, "y":0}, {"label":"", "x":11, "y":0}, {"label":"", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"Backspace", "x":11.5, "y":1, "w":1.5}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, - {"label":"Ctrl", "x":0.25, "y":2, "w":1.25}, {"label":"A", "x":1.5, "y":2}, {"label":"S", "x":2.5, "y":2}, {"label":"D", "x":3.5, "y":2}, {"label":"F", "x":4.5, "y":2}, {"label":"G", "x":5.5, "y":2}, {"label":"H", "x":6.5, "y":2}, {"label":"J", "x":7.5, "y":2}, {"label":"K", "x":8.5, "y":2}, {"label":"L", "x":9.5, "y":2}, {"label":":", "x":10.5, "y":2}, {"label":"Enter", "x":11.5, "y":2, "w":2.25}, {"label":"\u201d", "x":13.75, "y":2}, - {"label":"Shift", "x":0.25, "y":3, "w":1.75}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"label":"Shift", "x":12, "y":3}, {"label":"\u2191", "x":13, "y":3}, {"label":"Fn", "x":14, "y":3}, - {"label":"Rotary", "x":0, "y":4}, {"label":"Caps", "x":1, "y":4}, {"label":"Opt", "x":2, "y":4, "w":1.25}, {"label":"Cmd", "x":3.25, "y":4, "w":1.25}, {"label":"Space & Shift", "x":4.5, "y":4, "w":2}, {"label":"Space & Raise", "x":6.5, "y":4, "w":2}, {"label":"Cmd", "x":8.5, "y":4, "w":1.25}, {"label":"Opt", "x":9.75, "y":4, "w":1.25}, {"label":"Ctrl", "x":11, "y":4}, {"label":"\u2190", "x":12, "y":4}, {"label":"\u2193", "x":13, "y":4}, {"label":"\u2192", "x":14, "y":4} + {"matrix": [6, 0], "x": 0, "y": 0}, + {"matrix": [6, 1], "x": 1, "y": 0}, + {"matrix": [6, 2], "x": 2, "y": 0}, + {"matrix": [6, 3], "x": 3, "y": 0}, + {"matrix": [6, 4], "x": 4, "y": 0}, + {"matrix": [6, 5], "x": 5, "y": 0}, + {"matrix": [5, 6], "x": 6, "y": 0}, + {"matrix": [5, 7], "x": 7, "y": 0}, + {"matrix": [5, 8], "x": 8, "y": 0}, + {"matrix": [5, 9], "x": 9, "y": 0}, + {"matrix": [5, 10], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [0, 8], "x": 12, "y": 0}, + {"matrix": [0, 9], "x": 13, "y": 0}, + {"matrix": [0, 10], "x": 14, "y": 0}, + + {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [7, 2], "x": 1.5, "y": 1}, + {"matrix": [7, 3], "x": 2.5, "y": 1}, + {"matrix": [7, 4], "x": 3.5, "y": 1}, + {"matrix": [7, 5], "x": 4.5, "y": 1}, + {"matrix": [7, 6], "x": 5.5, "y": 1}, + {"matrix": [6, 7], "x": 6.5, "y": 1}, + {"matrix": [6, 8], "x": 7.5, "y": 1}, + {"matrix": [6, 9], "x": 8.5, "y": 1}, + {"matrix": [6, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 7], "x": 10.5, "y": 1}, + {"matrix": [1, 8], "x": 11.5, "y": 1, "w": 1.5}, + {"matrix": [1, 9], "x": 13, "y": 1}, + {"matrix": [1, 10], "x": 14, "y": 1}, + + {"matrix": [8, 0], "x": 0.25, "y": 2, "w": 1.25}, + {"matrix": [8, 2], "x": 1.5, "y": 2}, + {"matrix": [8, 3], "x": 2.5, "y": 2}, + {"matrix": [8, 4], "x": 3.5, "y": 2}, + {"matrix": [8, 5], "x": 4.5, "y": 2}, + {"matrix": [8, 6], "x": 5.5, "y": 2}, + {"matrix": [8, 7], "x": 6.5, "y": 2}, + {"matrix": [7, 8], "x": 7.5, "y": 2}, + {"matrix": [7, 9], "x": 8.5, "y": 2}, + {"matrix": [7, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 7], "x": 10.5, "y": 2}, + {"matrix": [2, 8], "x": 11.5, "y": 2, "w": 2.25}, + {"matrix": [2, 10], "x": 13.75, "y": 2}, + + {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75}, + {"matrix": [9, 2], "x": 2, "y": 3}, + {"matrix": [9, 3], "x": 3, "y": 3}, + {"matrix": [9, 4], "x": 4, "y": 3}, + {"matrix": [9, 5], "x": 5, "y": 3}, + {"matrix": [9, 6], "x": 6, "y": 3}, + {"matrix": [9, 7], "x": 7, "y": 3}, + {"matrix": [9, 8], "x": 8, "y": 3}, + {"matrix": [8, 9], "x": 9, "y": 3}, + {"matrix": [8, 10], "x": 10, "y": 3}, + {"matrix": [3, 7], "x": 11, "y": 3}, + {"matrix": [3, 8], "x": 12, "y": 3}, + {"matrix": [3, 9], "x": 13, "y": 3}, + {"matrix": [3, 10], "x": 14, "y": 3}, + + {"matrix": [10, 0], "x": 0, "y": 4}, + {"matrix": [10, 1], "x": 1, "y": 4}, + {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25}, + {"matrix": [10, 3], "x": 3.25, "y": 4, "w": 1.25}, + {"matrix": [10, 5], "x": 4.5, "y": 4, "w": 2}, + {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2}, + {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25}, + {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 11, "y": 4}, + {"matrix": [4, 8], "x": 12, "y": 4}, + {"matrix": [4, 9], "x": 13, "y": 4}, + {"matrix": [4, 10], "x": 14, "y": 4} ] }, "LAYOUT_jp": { "layout": [ - {"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"&", "x":6, "y":0}, {"label":"'", "x":7, "y":0}, {"label":"(", "x":8, "y":0}, {"label":")", "x":9, "y":0}, {"label":"", "x":10, "y":0}, {"label":"=", "x":11, "y":0}, {"label":"BS", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"Enter", "x":11.5, "y":1, "w":1.25, "h":2, "r":180, "rx":12.125, "ry":1.5}, {"label":"`", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, - {"label":"Ctrl", "x":0.25, "y":2, "w":1.25}, {"label":"A", "x":1.5, "y":2}, {"label":"S", "x":2.5, "y":2}, {"label":"D", "x":3.5, "y":2}, {"label":"F", "x":4.5, "y":2}, {"label":"G", "x":5.5, "y":2}, {"label":"H", "x":6.5, "y":2}, {"label":"J", "x":7.5, "y":2}, {"label":"K", "x":8.5, "y":2}, {"label":"L", "x":9.5, "y":2}, {"label":"+", "x":10.5, "y":2}, {"label":"*", "x":13, "y":2}, {"label":"}", "x":14, "y":2}, - {"label":"Shift", "x":0.25, "y":3, "w":1.75}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"label":"_", "x":12, "y":3}, {"label":"\u2191", "x":13, "y":3}, {"label":"", "x":14, "y":3}, - {"label":"Rotary", "x":0, "y":4}, {"label":"\u7530", "x":1, "y":4}, {"label":"Alt", "x":2, "y":4, "w":1.25}, {"label":"\u7121\u5909\u63db", "x":3.25, "y":4}, {"label":"Space", "x":4.25, "y":4, "w":2.25}, {"label":"Space", "x":6.5, "y":4, "w":2}, {"label":"\u5909\u63db", "x":8.5, "y":4, "w":1.25}, {"label":"\u30ab\u30ca", "x":9.75, "y":4, "w":1.25}, {"label":"\u76ee", "x":11, "y":4}, {"label":"\u2190", "x":12, "y":4}, {"label":"\u2193", "x":13, "y":4}, {"label":"\u2192", "x":14, "y":4}] + {"matrix": [6, 0], "x": 0, "y": 0}, + {"matrix": [6, 1], "x": 1, "y": 0}, + {"matrix": [6, 2], "x": 2, "y": 0}, + {"matrix": [6, 3], "x": 3, "y": 0}, + {"matrix": [6, 4], "x": 4, "y": 0}, + {"matrix": [6, 5], "x": 5, "y": 0}, + {"matrix": [5, 6], "x": 6, "y": 0}, + {"matrix": [5, 7], "x": 7, "y": 0}, + {"matrix": [5, 8], "x": 8, "y": 0}, + {"matrix": [5, 9], "x": 9, "y": 0}, + {"matrix": [5, 10], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [0, 8], "x": 12, "y": 0}, + {"matrix": [0, 9], "x": 13, "y": 0}, + {"matrix": [0, 10], "x": 14, "y": 0}, + + {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [7, 2], "x": 1.5, "y": 1}, + {"matrix": [7, 3], "x": 2.5, "y": 1}, + {"matrix": [7, 4], "x": 3.5, "y": 1}, + {"matrix": [7, 5], "x": 4.5, "y": 1}, + {"matrix": [7, 6], "x": 5.5, "y": 1}, + {"matrix": [6, 7], "x": 6.5, "y": 1}, + {"matrix": [6, 8], "x": 7.5, "y": 1}, + {"matrix": [6, 9], "x": 8.5, "y": 1}, + {"matrix": [6, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 7], "x": 10.5, "y": 1}, + {"matrix": [1, 9], "x": 11.5, "y": 1, "w": 1.25, "h": 2, "r": 180, "rx": 12.125, "ry": 1.5}, + {"matrix": [1, 10], "x": 12.75, "y": 1}, + {"matrix": [8, 0], "x": 13.75, "y": 1}, + + {"matrix": [8, 2], "x": 0.25, "y": 2, "w": 1.25}, + {"matrix": [8, 3], "x": 1.5, "y": 2}, + {"matrix": [8, 4], "x": 2.5, "y": 2}, + {"matrix": [8, 5], "x": 3.5, "y": 2}, + {"matrix": [8, 6], "x": 4.5, "y": 2}, + {"matrix": [8, 7], "x": 5.5, "y": 2}, + {"matrix": [7, 8], "x": 6.5, "y": 2}, + {"matrix": [7, 9], "x": 7.5, "y": 2}, + {"matrix": [7, 10], "x": 8.5, "y": 2}, + {"matrix": [2, 7], "x": 9.5, "y": 2}, + {"matrix": [2, 8], "x": 10.5, "y": 2}, + {"matrix": [2, 9], "x": 13, "y": 2}, + {"matrix": [2, 10], "x": 14, "y": 2}, + + {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75}, + {"matrix": [9, 2], "x": 2, "y": 3}, + {"matrix": [9, 3], "x": 3, "y": 3}, + {"matrix": [9, 4], "x": 4, "y": 3}, + {"matrix": [9, 5], "x": 5, "y": 3}, + {"matrix": [9, 6], "x": 6, "y": 3}, + {"matrix": [9, 7], "x": 7, "y": 3}, + {"matrix": [9, 8], "x": 8, "y": 3}, + {"matrix": [8, 9], "x": 9, "y": 3}, + {"matrix": [8, 10], "x": 10, "y": 3}, + {"matrix": [3, 7], "x": 11, "y": 3}, + {"matrix": [3, 8], "x": 12, "y": 3}, + {"matrix": [3, 9], "x": 13, "y": 3}, + {"matrix": [3, 10], "x": 14, "y": 3}, + + {"matrix": [10, 0], "x": 0, "y": 4}, + {"matrix": [10, 1], "x": 1, "y": 4}, + {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25}, + {"matrix": [10, 3], "x": 3.25, "y": 4}, + {"matrix": [10, 5], "x": 4.25, "y": 4, "w": 2.25}, + {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2}, + {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25}, + {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 11, "y": 4}, + {"matrix": [4, 8], "x": 12, "y": 4}, + {"matrix": [4, 9], "x": 13, "y": 4}, + {"matrix": [4, 10], "x": 14, "y": 4} + ] }, "LAYOUT_all": { "layout": [ - {"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"", "x":7, "y":0}, {"label":"", "x":8, "y":0}, {"label":"", "x":9, "y":0}, {"label":"", "x":10, "y":0}, {"label":"", "x":11, "y":0}, {"label":"", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"Backspace", "x":11.5, "y":1, "w":1.5}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, - {"label":"Ctrl", "x":0.25, "y":2, "w":1.25}, {"label":"A", "x":1.5, "y":2}, {"label":"S", "x":2.5, "y":2}, {"label":"D", "x":3.5, "y":2}, {"label":"F", "x":4.5, "y":2}, {"label":"G", "x":5.5, "y":2}, {"label":"H", "x":6.5, "y":2}, {"label":"J", "x":7.5, "y":2}, {"label":"K", "x":8.5, "y":2}, {"label":"L", "x":9.5, "y":2}, {"label":":", "x":10.5, "y":2}, {"label":"Enter", "x":11.5, "y":2, "w":1.5}, {"label":"\u201d", "x":13, "y":2}, {"label":"\u201d", "x":14, "y":2}, - {"label":"Shift", "x":0.25, "y":3, "w":1.75}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"label":"Shift", "x":12, "y":3}, {"label":"\u2191", "x":13, "y":3}, {"label":"Fn", "x":14, "y":3}, - {"label":"Rotary", "x":0, "y":4}, {"label":"Caps", "x":1, "y":4}, {"label":"Opt", "x":2, "y":4, "w":1.25}, {"label":"Cmd", "x":3.25, "y":4, "w":1.25}, {"label":"Space & Shift", "x":4.5, "y":4, "w":2}, {"label":"Space & Raise", "x":6.5, "y":4, "w":2}, {"label":"Cmd", "x":8.5, "y":4, "w":1.25}, {"label":"Opt", "x":9.75, "y":4, "w":1.25}, {"label":"Ctrl", "x":11, "y":4}, {"label":"\u2190", "x":12, "y":4}, {"label":"\u2193", "x":13, "y":4}, {"label":"\u2192", "x":14, "y":4} + {"matrix": [6, 0], "x": 0, "y": 0}, + {"matrix": [6, 1], "x": 1, "y": 0}, + {"matrix": [6, 2], "x": 2, "y": 0}, + {"matrix": [6, 3], "x": 3, "y": 0}, + {"matrix": [6, 4], "x": 4, "y": 0}, + {"matrix": [6, 5], "x": 5, "y": 0}, + {"matrix": [5, 6], "x": 6, "y": 0}, + {"matrix": [5, 7], "x": 7, "y": 0}, + {"matrix": [5, 8], "x": 8, "y": 0}, + {"matrix": [5, 9], "x": 9, "y": 0}, + {"matrix": [5, 10], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [0, 8], "x": 12, "y": 0}, + {"matrix": [0, 9], "x": 13, "y": 0}, + {"matrix": [0, 10], "x": 14, "y": 0}, + + {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [7, 2], "x": 1.5, "y": 1}, + {"matrix": [7, 3], "x": 2.5, "y": 1}, + {"matrix": [7, 4], "x": 3.5, "y": 1}, + {"matrix": [7, 5], "x": 4.5, "y": 1}, + {"matrix": [7, 6], "x": 5.5, "y": 1}, + {"matrix": [6, 7], "x": 6.5, "y": 1}, + {"matrix": [6, 8], "x": 7.5, "y": 1}, + {"matrix": [6, 9], "x": 8.5, "y": 1}, + {"matrix": [6, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 7], "x": 10.5, "y": 1}, + {"matrix": [1, 8], "x": 11.5, "y": 1, "w": 1.5}, + {"matrix": [1, 9], "x": 13, "y": 1}, + {"matrix": [1, 10], "x": 14, "y": 1}, + + {"matrix": [8, 0], "x": 0.25, "y": 2, "w": 1.25}, + {"matrix": [8, 2], "x": 1.5, "y": 2}, + {"matrix": [8, 3], "x": 2.5, "y": 2}, + {"matrix": [8, 4], "x": 3.5, "y": 2}, + {"matrix": [8, 5], "x": 4.5, "y": 2}, + {"matrix": [8, 6], "x": 5.5, "y": 2}, + {"matrix": [8, 7], "x": 6.5, "y": 2}, + {"matrix": [7, 8], "x": 7.5, "y": 2}, + {"matrix": [7, 9], "x": 8.5, "y": 2}, + {"matrix": [7, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 7], "x": 10.5, "y": 2}, + {"matrix": [2, 8], "x": 11.5, "y": 2, "w": 1.5}, + {"matrix": [2, 9], "x": 13, "y": 2}, + {"matrix": [2, 10], "x": 14, "y": 2}, + + {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75}, + {"matrix": [9, 2], "x": 2, "y": 3}, + {"matrix": [9, 3], "x": 3, "y": 3}, + {"matrix": [9, 4], "x": 4, "y": 3}, + {"matrix": [9, 5], "x": 5, "y": 3}, + {"matrix": [9, 6], "x": 6, "y": 3}, + {"matrix": [9, 7], "x": 7, "y": 3}, + {"matrix": [9, 8], "x": 8, "y": 3}, + {"matrix": [8, 9], "x": 9, "y": 3}, + {"matrix": [8, 10], "x": 10, "y": 3}, + {"matrix": [3, 7], "x": 11, "y": 3}, + {"matrix": [3, 8], "x": 12, "y": 3}, + {"matrix": [3, 9], "x": 13, "y": 3}, + {"matrix": [3, 10], "x": 14, "y": 3}, + + {"matrix": [10, 0], "x": 0, "y": 4}, + {"matrix": [10, 1], "x": 1, "y": 4}, + {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25}, + {"matrix": [10, 3], "x": 3.25, "y": 4, "w": 1.25}, + {"matrix": [10, 5], "x": 4.5, "y": 4, "w": 2}, + {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2}, + {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25}, + {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 11, "y": 4}, + {"matrix": [4, 8], "x": 12, "y": 4}, + {"matrix": [4, 9], "x": 13, "y": 4}, + {"matrix": [4, 10], "x": 14, "y": 4} ] } } diff --git a/keyboards/jones/v03/v03.h b/keyboards/jones/v03/v03.h deleted file mode 100644 index 38f894c5dd..0000000000 --- a/keyboards/jones/v03/v03.h +++ /dev/null @@ -1,105 +0,0 @@ -/* Copyright 2020 Takeshi Nishio - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -/* -FULL 11x11 ROUND-ROBIN MATRIX for Reference -{ KC_NO, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1 }, \ -{ k12, KC_NO, k32, k42, k52, k62, k72, k82, k92, ka2, kb2 }, \ -{ k13, k23, KC_NO, k43, k53, k63, k73, k83, k93, ka3, kb3 }, \ -{ k14, k24, k34, KC_NO, k54, k64, k74, k84, k94, ka4, kb4 }, \ -{ k15, k25, k35, k45, KC_NO, k65, k75, k85, k95, ka5, kb5 }, \ -{ k16, k26, k36, k46, k56, KC_NO, k76, k86, k96, ka6, kb6 }, \ -{ k17, k27, k37, k47, k57, k67, KC_NO, k87, k97, ka7, kb7 }, \ -{ k18, k28, k38, k48, k58, k68, k78, KC_NO, k98, ka8, kb8 }, \ -{ k19, k29, k39, k49, k59, k69, k79, k89, KC_NO, ka9, kb9 }, \ -{ k1a, k2a, k3a, k4a, k5a, k6a, k7a, k8a, k9a, KC_NO, kba }, \ -{ k1b, k2b, k3b, k4b, k5b, k6b, k7b, k8b, k9b, kab, KC_NO } \ -*/ - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_all( \ - k17, k27, k37, k47, k57, k67, k76, k86, k96, ka6, kb6, k81, k91, ka1, kb1, \ - k18, k38, k48, k58, k68, k78, k87, k97, ka7, kb7, k82, k92, ka2, kb2, \ - k19, k39, k49, k59, k69, k79, k89, k98, ka8, kb8, k83, k93, ka3, kb3, \ - k1a, k3a, k4a, k5a, k6a, k7a, k8a, k9a, ka9, kb9, k84, k94, ka4, kb4, \ - k1b, k2b, k3b, k4b, k6b, k8b, k9b, kab, k85, k95, ka5, kb5 \ -) \ -{ \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k81, k91, ka1, kb1 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k82, k92, ka2, kb2 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k83, k93, ka3, kb3 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k84, k94, ka4, kb4 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k85, k95, ka5, kb5 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k76, k86, k96, ka6, kb6 }, \ - { k17, k27, k37, k47, k57, k67, KC_NO, k87, k97, ka7, kb7 }, \ - { k18, KC_NO, k38, k48, k58, k68, k78, KC_NO, k98, ka8, kb8 }, \ - { k19, KC_NO, k39, k49, k59, k69, k79, k89, KC_NO, ka9, kb9 }, \ - { k1a, KC_NO, k3a, k4a, k5a, k6a, k7a, k8a, k9a, KC_NO, KC_NO }, \ - { k1b, k2b, k3b, k4b, KC_NO, k6b, KC_NO, k8b, k9b, kab, KC_NO } \ -} - -#define LAYOUT_ansi( \ - k17, k27, k37, k47, k57, k67, k76, k86, k96, ka6, kb6, k81, k91, ka1, kb1, \ - k18, k38, k48, k58, k68, k78, k87, k97, ka7, kb7, k82, k92, ka2, kb2, \ - k19, k39, k49, k59, k69, k79, k89, k98, ka8, kb8, k83, k93, kb3, \ - k1a, k3a, k4a, k5a, k6a, k7a, k8a, k9a, ka9, kb9, k84, k94, ka4, kb4, \ - k1b, k2b, k3b, k4b, k6b, k8b, k9b, kab, k85, k95, ka5, kb5 \ -) \ -{ \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k81, k91, ka1, kb1 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k82, k92, ka2, kb2 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k83, k93, KC_NO, kb3 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k84, k94, ka4, kb4 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k85, k95, ka5, kb5 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k76, k86, k96, ka6, kb6 }, \ - { k17, k27, k37, k47, k57, k67, KC_NO, k87, k97, ka7, kb7 }, \ - { k18, KC_NO, k38, k48, k58, k68, k78, KC_NO, k98, ka8, kb8 }, \ - { k19, KC_NO, k39, k49, k59, k69, k79, k89, KC_NO, ka9, kb9 }, \ - { k1a, KC_NO, k3a, k4a, k5a, k6a, k7a, k8a, k9a, KC_NO, KC_NO }, \ - { k1b, k2b, k3b, k4b, KC_NO, k6b, KC_NO, k8b, k9b, kab, KC_NO } \ -} - -#define LAYOUT_jp( \ - k17, k27, k37, k47, k57, k67, k76, k86, k96, ka6, kb6, k81, k91, ka1, kb1, \ - k18, k38, k48, k58, k68, k78, k87, k97, ka7, kb7, k82, ka2, kb2, \ - k19, k39, k49, k59, k69, k79, k89, k98, ka8, kb8, k83, k93, ka3, kb3, \ - k1a, k3a, k4a, k5a, k6a, k7a, k8a, k9a, ka9, kb9, k84, k94, ka4, kb4, \ - k1b, k2b, k3b, k4b, k6b, k8b, k9b, kab, k85, k95, ka5, kb5 \ -) \ -{ \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k81, k91, ka1, kb1 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k82, KC_NO, ka2, kb2 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k83, k93, ka3, kb3 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k84, k94, ka4, kb4 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k85, k95, ka5, kb5 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k76, k86, k96, ka6, kb6 }, \ - { k17, k27, k37, k47, k57, k67, KC_NO, k87, k97, ka7, kb7 }, \ - { k18, KC_NO, k38, k48, k58, k68, k78, KC_NO, k98, ka8, kb8 }, \ - { k19, KC_NO, k39, k49, k59, k69, k79, k89, KC_NO, ka9, kb9 }, \ - { k1a, KC_NO, k3a, k4a, k5a, k6a, k7a, k8a, k9a, KC_NO, KC_NO }, \ - { k1b, k2b, k3b, k4b, KC_NO, k6b, KC_NO, k8b, k9b, kab, KC_NO } \ -} diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/info.json index 96b10e8ac1..d0fec4e571 100644 --- a/keyboards/jones/v03_1/info.json +++ b/keyboards/jones/v03_1/info.json @@ -22,28 +22,231 @@ "layouts": { "LAYOUT_ansi": { "layout": [ - {"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"", "x":7, "y":0}, {"label":"", "x":8, "y":0}, {"label":"", "x":9, "y":0}, {"label":"", "x":10, "y":0}, {"label":"", "x":11, "y":0}, {"label":"", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"Backspace", "x":11.5, "y":1, "w":1.5}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, - {"label":"Ctrl", "x":0.25, "y":2, "w":1.25}, {"label":"A", "x":1.5, "y":2}, {"label":"S", "x":2.5, "y":2}, {"label":"D", "x":3.5, "y":2}, {"label":"F", "x":4.5, "y":2}, {"label":"G", "x":5.5, "y":2}, {"label":"H", "x":6.5, "y":2}, {"label":"J", "x":7.5, "y":2}, {"label":"K", "x":8.5, "y":2}, {"label":"L", "x":9.5, "y":2}, {"label":":", "x":10.5, "y":2}, {"label":"Enter", "x":11.5, "y":2, "w":2.25}, {"label":"\u201d", "x":13.75, "y":2}, - {"label":"Shift", "x":0.25, "y":3, "w":1.75}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"label":"Shift", "x":12, "y":3}, {"label":"\u2191", "x":13, "y":3}, {"label":"Fn", "x":14, "y":3}, - {"label":"Rotary", "x":0, "y":4}, {"label":"Caps", "x":1, "y":4}, {"label":"Opt", "x":2, "y":4, "w":1.25}, {"label":"Cmd", "x":3.25, "y":4, "w":1.25}, {"label":"Space & Shift", "x":4.5, "y":4, "w":2}, {"label":"Space & Raise", "x":6.5, "y":4, "w":2}, {"label":"Cmd", "x":8.5, "y":4, "w":1.25}, {"label":"Opt", "x":9.75, "y":4, "w":1.25}, {"label":"Ctrl", "x":11, "y":4}, {"label":"\u2190", "x":12, "y":4}, {"label":"\u2193", "x":13, "y":4}, {"label":"\u2192", "x":14, "y":4} + {"matrix": [6, 0], "x": 0, "y": 0}, + {"matrix": [6, 1], "x": 1, "y": 0}, + {"matrix": [6, 2], "x": 2, "y": 0}, + {"matrix": [6, 3], "x": 3, "y": 0}, + {"matrix": [6, 4], "x": 4, "y": 0}, + {"matrix": [6, 5], "x": 5, "y": 0}, + {"matrix": [5, 6], "x": 6, "y": 0}, + {"matrix": [5, 7], "x": 7, "y": 0}, + {"matrix": [5, 8], "x": 8, "y": 0}, + {"matrix": [5, 9], "x": 9, "y": 0}, + {"matrix": [5, 10], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [0, 8], "x": 12, "y": 0}, + {"matrix": [0, 9], "x": 13, "y": 0}, + {"matrix": [0, 10], "x": 14, "y": 0}, + + {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [7, 2], "x": 1.5, "y": 1}, + {"matrix": [7, 3], "x": 2.5, "y": 1}, + {"matrix": [7, 4], "x": 3.5, "y": 1}, + {"matrix": [7, 5], "x": 4.5, "y": 1}, + {"matrix": [7, 6], "x": 5.5, "y": 1}, + {"matrix": [6, 7], "x": 6.5, "y": 1}, + {"matrix": [6, 8], "x": 7.5, "y": 1}, + {"matrix": [6, 9], "x": 8.5, "y": 1}, + {"matrix": [6, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 7], "x": 10.5, "y": 1}, + {"matrix": [1, 8], "x": 11.5, "y": 1, "w": 1.5}, + {"matrix": [1, 9], "x": 13, "y": 1}, + {"matrix": [1, 10], "x": 14, "y": 1}, + + {"matrix": [8, 0], "x": 0.25, "y": 2, "w": 1.25}, + {"matrix": [8, 2], "x": 1.5, "y": 2}, + {"matrix": [8, 3], "x": 2.5, "y": 2}, + {"matrix": [8, 4], "x": 3.5, "y": 2}, + {"matrix": [8, 5], "x": 4.5, "y": 2}, + {"matrix": [8, 6], "x": 5.5, "y": 2}, + {"matrix": [8, 7], "x": 6.5, "y": 2}, + {"matrix": [7, 8], "x": 7.5, "y": 2}, + {"matrix": [7, 9], "x": 8.5, "y": 2}, + {"matrix": [7, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 7], "x": 10.5, "y": 2}, + {"matrix": [2, 8], "x": 11.5, "y": 2, "w": 2.25}, + {"matrix": [2, 10], "x": 13.75, "y": 2}, + + {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75}, + {"matrix": [9, 2], "x": 2, "y": 3}, + {"matrix": [9, 3], "x": 3, "y": 3}, + {"matrix": [9, 4], "x": 4, "y": 3}, + {"matrix": [9, 5], "x": 5, "y": 3}, + {"matrix": [9, 6], "x": 6, "y": 3}, + {"matrix": [9, 7], "x": 7, "y": 3}, + {"matrix": [9, 8], "x": 8, "y": 3}, + {"matrix": [8, 9], "x": 9, "y": 3}, + {"matrix": [8, 10], "x": 10, "y": 3}, + {"matrix": [3, 7], "x": 11, "y": 3}, + {"matrix": [3, 8], "x": 12, "y": 3}, + {"matrix": [3, 9], "x": 13, "y": 3}, + {"matrix": [3, 10], "x": 14, "y": 3}, + + {"matrix": [10, 0], "x": 0, "y": 4}, + {"matrix": [10, 1], "x": 1, "y": 4}, + {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25}, + {"matrix": [10, 3], "x": 3.25, "y": 4, "w": 1.25}, + {"matrix": [10, 5], "x": 4.5, "y": 4, "w": 2}, + {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2}, + {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25}, + {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 11, "y": 4}, + {"matrix": [4, 8], "x": 12, "y": 4}, + {"matrix": [4, 9], "x": 13, "y": 4}, + {"matrix": [4, 10], "x": 14, "y": 4} ] }, "LAYOUT_jp": { "layout": [ - {"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"&", "x":6, "y":0}, {"label":"'", "x":7, "y":0}, {"label":"(", "x":8, "y":0}, {"label":")", "x":9, "y":0}, {"label":"", "x":10, "y":0}, {"label":"=", "x":11, "y":0}, {"label":"BS", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"Enter", "x":11.5, "y":1, "w":1.25, "h":2, "r":180, "rx":12.125, "ry":1.5}, {"label":"`", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, - {"label":"Ctrl", "x":0.25, "y":2, "w":1.25}, {"label":"A", "x":1.5, "y":2}, {"label":"S", "x":2.5, "y":2}, {"label":"D", "x":3.5, "y":2}, {"label":"F", "x":4.5, "y":2}, {"label":"G", "x":5.5, "y":2}, {"label":"H", "x":6.5, "y":2}, {"label":"J", "x":7.5, "y":2}, {"label":"K", "x":8.5, "y":2}, {"label":"L", "x":9.5, "y":2}, {"label":"+", "x":10.5, "y":2}, {"label":"*", "x":13, "y":2}, {"label":"}", "x":14, "y":2}, - {"label":"Shift", "x":0.25, "y":3, "w":1.75}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"label":"_", "x":12, "y":3}, {"label":"\u2191", "x":13, "y":3}, {"label":"", "x":14, "y":3}, - {"label":"Rotary", "x":0, "y":4}, {"label":"\u7530", "x":1, "y":4}, {"label":"Alt", "x":2, "y":4, "w":1.25}, {"label":"\u7121\u5909\u63db", "x":3.25, "y":4}, {"label":"Space", "x":4.25, "y":4, "w":2.25}, {"label":"Space", "x":6.5, "y":4, "w":2}, {"label":"\u5909\u63db", "x":8.5, "y":4, "w":1.25}, {"label":"\u30ab\u30ca", "x":9.75, "y":4, "w":1.25}, {"label":"\u76ee", "x":11, "y":4}, {"label":"\u2190", "x":12, "y":4}, {"label":"\u2193", "x":13, "y":4}, {"label":"\u2192", "x":14, "y":4}] + {"matrix": [6, 0], "x": 0, "y": 0}, + {"matrix": [6, 1], "x": 1, "y": 0}, + {"matrix": [6, 2], "x": 2, "y": 0}, + {"matrix": [6, 3], "x": 3, "y": 0}, + {"matrix": [6, 4], "x": 4, "y": 0}, + {"matrix": [6, 5], "x": 5, "y": 0}, + {"matrix": [5, 6], "x": 6, "y": 0}, + {"matrix": [5, 7], "x": 7, "y": 0}, + {"matrix": [5, 8], "x": 8, "y": 0}, + {"matrix": [5, 9], "x": 9, "y": 0}, + {"matrix": [5, 10], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [0, 8], "x": 12, "y": 0}, + {"matrix": [0, 9], "x": 13, "y": 0}, + {"matrix": [0, 10], "x": 14, "y": 0}, + + {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [7, 2], "x": 1.5, "y": 1}, + {"matrix": [7, 3], "x": 2.5, "y": 1}, + {"matrix": [7, 4], "x": 3.5, "y": 1}, + {"matrix": [7, 5], "x": 4.5, "y": 1}, + {"matrix": [7, 6], "x": 5.5, "y": 1}, + {"matrix": [6, 7], "x": 6.5, "y": 1}, + {"matrix": [6, 8], "x": 7.5, "y": 1}, + {"matrix": [6, 9], "x": 8.5, "y": 1}, + {"matrix": [6, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 7], "x": 10.5, "y": 1}, + {"matrix": [1, 9], "x": 11.5, "y": 1, "w": 1.25, "h": 2, "r": 180, "rx": 12.125, "ry": 1.5}, + {"matrix": [1, 10], "x": 12.75, "y": 1}, + {"matrix": [8, 0], "x": 13.75, "y": 1}, + + {"matrix": [8, 2], "x": 0.25, "y": 2, "w": 1.25}, + {"matrix": [8, 3], "x": 1.5, "y": 2}, + {"matrix": [8, 4], "x": 2.5, "y": 2}, + {"matrix": [8, 5], "x": 3.5, "y": 2}, + {"matrix": [8, 6], "x": 4.5, "y": 2}, + {"matrix": [8, 7], "x": 5.5, "y": 2}, + {"matrix": [7, 8], "x": 6.5, "y": 2}, + {"matrix": [7, 9], "x": 7.5, "y": 2}, + {"matrix": [7, 10], "x": 8.5, "y": 2}, + {"matrix": [2, 7], "x": 9.5, "y": 2}, + {"matrix": [2, 8], "x": 10.5, "y": 2}, + {"matrix": [2, 9], "x": 13, "y": 2}, + {"matrix": [2, 10], "x": 14, "y": 2}, + + {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75}, + {"matrix": [9, 2], "x": 2, "y": 3}, + {"matrix": [9, 3], "x": 3, "y": 3}, + {"matrix": [9, 4], "x": 4, "y": 3}, + {"matrix": [9, 5], "x": 5, "y": 3}, + {"matrix": [9, 6], "x": 6, "y": 3}, + {"matrix": [9, 7], "x": 7, "y": 3}, + {"matrix": [9, 8], "x": 8, "y": 3}, + {"matrix": [8, 9], "x": 9, "y": 3}, + {"matrix": [8, 10], "x": 10, "y": 3}, + {"matrix": [3, 7], "x": 11, "y": 3}, + {"matrix": [3, 8], "x": 12, "y": 3}, + {"matrix": [3, 9], "x": 13, "y": 3}, + {"matrix": [3, 10], "x": 14, "y": 3}, + + {"matrix": [10, 0], "x": 0, "y": 4}, + {"matrix": [10, 1], "x": 1, "y": 4}, + {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25}, + {"matrix": [10, 3], "x": 3.25, "y": 4}, + {"matrix": [10, 5], "x": 4.25, "y": 4, "w": 2.25}, + {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2}, + {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25}, + {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 11, "y": 4}, + {"matrix": [4, 8], "x": 12, "y": 4}, + {"matrix": [4, 9], "x": 13, "y": 4}, + {"matrix": [4, 10], "x": 14, "y": 4} + ] }, "LAYOUT_all": { "layout": [ - {"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"", "x":7, "y":0}, {"label":"", "x":8, "y":0}, {"label":"", "x":9, "y":0}, {"label":"", "x":10, "y":0}, {"label":"", "x":11, "y":0}, {"label":"", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"Backspace", "x":11.5, "y":1, "w":1.5}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, - {"label":"Ctrl", "x":0.25, "y":2, "w":1.25}, {"label":"A", "x":1.5, "y":2}, {"label":"S", "x":2.5, "y":2}, {"label":"D", "x":3.5, "y":2}, {"label":"F", "x":4.5, "y":2}, {"label":"G", "x":5.5, "y":2}, {"label":"H", "x":6.5, "y":2}, {"label":"J", "x":7.5, "y":2}, {"label":"K", "x":8.5, "y":2}, {"label":"L", "x":9.5, "y":2}, {"label":":", "x":10.5, "y":2}, {"label":"Enter", "x":11.5, "y":2, "w":1.5}, {"label":"\u201d", "x":13, "y":2}, {"label":"\u201d", "x":14, "y":2}, - {"label":"Shift", "x":0.25, "y":3, "w":1.75}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"label":"Shift", "x":12, "y":3}, {"label":"\u2191", "x":13, "y":3}, {"label":"Fn", "x":14, "y":3}, - {"label":"Rotary", "x":0, "y":4}, {"label":"Caps", "x":1, "y":4}, {"label":"Opt", "x":2, "y":4, "w":1.25}, {"label":"Cmd", "x":3.25, "y":4, "w":1.25}, {"label":"Space & Shift", "x":4.5, "y":4, "w":2}, {"label":"Space & Raise", "x":6.5, "y":4, "w":2}, {"label":"Cmd", "x":8.5, "y":4, "w":1.25}, {"label":"Opt", "x":9.75, "y":4, "w":1.25}, {"label":"Ctrl", "x":11, "y":4}, {"label":"\u2190", "x":12, "y":4}, {"label":"\u2193", "x":13, "y":4}, {"label":"\u2192", "x":14, "y":4} + {"matrix": [6, 0], "x": 0, "y": 0}, + {"matrix": [6, 1], "x": 1, "y": 0}, + {"matrix": [6, 2], "x": 2, "y": 0}, + {"matrix": [6, 3], "x": 3, "y": 0}, + {"matrix": [6, 4], "x": 4, "y": 0}, + {"matrix": [6, 5], "x": 5, "y": 0}, + {"matrix": [5, 6], "x": 6, "y": 0}, + {"matrix": [5, 7], "x": 7, "y": 0}, + {"matrix": [5, 8], "x": 8, "y": 0}, + {"matrix": [5, 9], "x": 9, "y": 0}, + {"matrix": [5, 10], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [0, 8], "x": 12, "y": 0}, + {"matrix": [0, 9], "x": 13, "y": 0}, + {"matrix": [0, 10], "x": 14, "y": 0}, + + {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [7, 2], "x": 1.5, "y": 1}, + {"matrix": [7, 3], "x": 2.5, "y": 1}, + {"matrix": [7, 4], "x": 3.5, "y": 1}, + {"matrix": [7, 5], "x": 4.5, "y": 1}, + {"matrix": [7, 6], "x": 5.5, "y": 1}, + {"matrix": [6, 7], "x": 6.5, "y": 1}, + {"matrix": [6, 8], "x": 7.5, "y": 1}, + {"matrix": [6, 9], "x": 8.5, "y": 1}, + {"matrix": [6, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 7], "x": 10.5, "y": 1}, + {"matrix": [1, 8], "x": 11.5, "y": 1, "w": 1.5}, + {"matrix": [1, 9], "x": 13, "y": 1}, + {"matrix": [1, 10], "x": 14, "y": 1}, + + {"matrix": [8, 0], "x": 0.25, "y": 2, "w": 1.25}, + {"matrix": [8, 2], "x": 1.5, "y": 2}, + {"matrix": [8, 3], "x": 2.5, "y": 2}, + {"matrix": [8, 4], "x": 3.5, "y": 2}, + {"matrix": [8, 5], "x": 4.5, "y": 2}, + {"matrix": [8, 6], "x": 5.5, "y": 2}, + {"matrix": [8, 7], "x": 6.5, "y": 2}, + {"matrix": [7, 8], "x": 7.5, "y": 2}, + {"matrix": [7, 9], "x": 8.5, "y": 2}, + {"matrix": [7, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 7], "x": 10.5, "y": 2}, + {"matrix": [2, 8], "x": 11.5, "y": 2, "w": 1.5}, + {"matrix": [2, 9], "x": 13, "y": 2}, + {"matrix": [2, 10], "x": 14, "y": 2}, + + {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75}, + {"matrix": [9, 2], "x": 2, "y": 3}, + {"matrix": [9, 3], "x": 3, "y": 3}, + {"matrix": [9, 4], "x": 4, "y": 3}, + {"matrix": [9, 5], "x": 5, "y": 3}, + {"matrix": [9, 6], "x": 6, "y": 3}, + {"matrix": [9, 7], "x": 7, "y": 3}, + {"matrix": [9, 8], "x": 8, "y": 3}, + {"matrix": [8, 9], "x": 9, "y": 3}, + {"matrix": [8, 10], "x": 10, "y": 3}, + {"matrix": [3, 7], "x": 11, "y": 3}, + {"matrix": [3, 8], "x": 12, "y": 3}, + {"matrix": [3, 9], "x": 13, "y": 3}, + {"matrix": [3, 10], "x": 14, "y": 3}, + + {"matrix": [10, 0], "x": 0, "y": 4}, + {"matrix": [10, 1], "x": 1, "y": 4}, + {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25}, + {"matrix": [10, 3], "x": 3.25, "y": 4, "w": 1.25}, + {"matrix": [10, 5], "x": 4.5, "y": 4, "w": 2}, + {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2}, + {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25}, + {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 11, "y": 4}, + {"matrix": [4, 8], "x": 12, "y": 4}, + {"matrix": [4, 9], "x": 13, "y": 4}, + {"matrix": [4, 10], "x": 14, "y": 4} ] } } diff --git a/keyboards/jones/v03_1/v03_1.c b/keyboards/jones/v03_1/v03_1.c index 33ff0051a6..f09b801a3e 100644 --- a/keyboards/jones/v03_1/v03_1.c +++ b/keyboards/jones/v03_1/v03_1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "v03_1.h" +#include "quantum.h" #if defined(AUDIO_ENABLE) && defined(MUSIC_MAP) const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_all( diff --git a/keyboards/jones/v03_1/v03_1.h b/keyboards/jones/v03_1/v03_1.h deleted file mode 100644 index 38f894c5dd..0000000000 --- a/keyboards/jones/v03_1/v03_1.h +++ /dev/null @@ -1,105 +0,0 @@ -/* Copyright 2020 Takeshi Nishio - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -/* -FULL 11x11 ROUND-ROBIN MATRIX for Reference -{ KC_NO, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1 }, \ -{ k12, KC_NO, k32, k42, k52, k62, k72, k82, k92, ka2, kb2 }, \ -{ k13, k23, KC_NO, k43, k53, k63, k73, k83, k93, ka3, kb3 }, \ -{ k14, k24, k34, KC_NO, k54, k64, k74, k84, k94, ka4, kb4 }, \ -{ k15, k25, k35, k45, KC_NO, k65, k75, k85, k95, ka5, kb5 }, \ -{ k16, k26, k36, k46, k56, KC_NO, k76, k86, k96, ka6, kb6 }, \ -{ k17, k27, k37, k47, k57, k67, KC_NO, k87, k97, ka7, kb7 }, \ -{ k18, k28, k38, k48, k58, k68, k78, KC_NO, k98, ka8, kb8 }, \ -{ k19, k29, k39, k49, k59, k69, k79, k89, KC_NO, ka9, kb9 }, \ -{ k1a, k2a, k3a, k4a, k5a, k6a, k7a, k8a, k9a, KC_NO, kba }, \ -{ k1b, k2b, k3b, k4b, k5b, k6b, k7b, k8b, k9b, kab, KC_NO } \ -*/ - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_all( \ - k17, k27, k37, k47, k57, k67, k76, k86, k96, ka6, kb6, k81, k91, ka1, kb1, \ - k18, k38, k48, k58, k68, k78, k87, k97, ka7, kb7, k82, k92, ka2, kb2, \ - k19, k39, k49, k59, k69, k79, k89, k98, ka8, kb8, k83, k93, ka3, kb3, \ - k1a, k3a, k4a, k5a, k6a, k7a, k8a, k9a, ka9, kb9, k84, k94, ka4, kb4, \ - k1b, k2b, k3b, k4b, k6b, k8b, k9b, kab, k85, k95, ka5, kb5 \ -) \ -{ \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k81, k91, ka1, kb1 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k82, k92, ka2, kb2 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k83, k93, ka3, kb3 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k84, k94, ka4, kb4 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k85, k95, ka5, kb5 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k76, k86, k96, ka6, kb6 }, \ - { k17, k27, k37, k47, k57, k67, KC_NO, k87, k97, ka7, kb7 }, \ - { k18, KC_NO, k38, k48, k58, k68, k78, KC_NO, k98, ka8, kb8 }, \ - { k19, KC_NO, k39, k49, k59, k69, k79, k89, KC_NO, ka9, kb9 }, \ - { k1a, KC_NO, k3a, k4a, k5a, k6a, k7a, k8a, k9a, KC_NO, KC_NO }, \ - { k1b, k2b, k3b, k4b, KC_NO, k6b, KC_NO, k8b, k9b, kab, KC_NO } \ -} - -#define LAYOUT_ansi( \ - k17, k27, k37, k47, k57, k67, k76, k86, k96, ka6, kb6, k81, k91, ka1, kb1, \ - k18, k38, k48, k58, k68, k78, k87, k97, ka7, kb7, k82, k92, ka2, kb2, \ - k19, k39, k49, k59, k69, k79, k89, k98, ka8, kb8, k83, k93, kb3, \ - k1a, k3a, k4a, k5a, k6a, k7a, k8a, k9a, ka9, kb9, k84, k94, ka4, kb4, \ - k1b, k2b, k3b, k4b, k6b, k8b, k9b, kab, k85, k95, ka5, kb5 \ -) \ -{ \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k81, k91, ka1, kb1 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k82, k92, ka2, kb2 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k83, k93, KC_NO, kb3 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k84, k94, ka4, kb4 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k85, k95, ka5, kb5 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k76, k86, k96, ka6, kb6 }, \ - { k17, k27, k37, k47, k57, k67, KC_NO, k87, k97, ka7, kb7 }, \ - { k18, KC_NO, k38, k48, k58, k68, k78, KC_NO, k98, ka8, kb8 }, \ - { k19, KC_NO, k39, k49, k59, k69, k79, k89, KC_NO, ka9, kb9 }, \ - { k1a, KC_NO, k3a, k4a, k5a, k6a, k7a, k8a, k9a, KC_NO, KC_NO }, \ - { k1b, k2b, k3b, k4b, KC_NO, k6b, KC_NO, k8b, k9b, kab, KC_NO } \ -} - -#define LAYOUT_jp( \ - k17, k27, k37, k47, k57, k67, k76, k86, k96, ka6, kb6, k81, k91, ka1, kb1, \ - k18, k38, k48, k58, k68, k78, k87, k97, ka7, kb7, k82, ka2, kb2, \ - k19, k39, k49, k59, k69, k79, k89, k98, ka8, kb8, k83, k93, ka3, kb3, \ - k1a, k3a, k4a, k5a, k6a, k7a, k8a, k9a, ka9, kb9, k84, k94, ka4, kb4, \ - k1b, k2b, k3b, k4b, k6b, k8b, k9b, kab, k85, k95, ka5, kb5 \ -) \ -{ \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k81, k91, ka1, kb1 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k82, KC_NO, ka2, kb2 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k83, k93, ka3, kb3 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k84, k94, ka4, kb4 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k85, k95, ka5, kb5 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k76, k86, k96, ka6, kb6 }, \ - { k17, k27, k37, k47, k57, k67, KC_NO, k87, k97, ka7, kb7 }, \ - { k18, KC_NO, k38, k48, k58, k68, k78, KC_NO, k98, ka8, kb8 }, \ - { k19, KC_NO, k39, k49, k59, k69, k79, k89, KC_NO, ka9, kb9 }, \ - { k1a, KC_NO, k3a, k4a, k5a, k6a, k7a, k8a, k9a, KC_NO, KC_NO }, \ - { k1b, k2b, k3b, k4b, KC_NO, k6b, KC_NO, k8b, k9b, kab, KC_NO } \ -} -- cgit v1.2.3