From 172a40686b84af7f887350a20c526855c7f7649c Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 15 Apr 2023 21:08:15 +1000 Subject: Move single `LAYOUT_all`s to data driven (#20430) --- keyboards/cherrybstudio/cb1800/cb1800.h | 38 ----- keyboards/cherrybstudio/cb1800/info.json | 242 ++++++++++++++++-------------- keyboards/cherrybstudio/cb65/cb65.h | 35 ----- keyboards/cherrybstudio/cb65/info.json | 145 +++++++++--------- keyboards/cherrybstudio/cb87rgb/cb87rgb.c | 2 +- keyboards/cherrybstudio/cb87rgb/cb87rgb.h | 37 ----- keyboards/cherrybstudio/cb87rgb/info.json | 207 +++++++++++++------------ keyboards/cherrybstudio/cb87v2/cb87v2.h | 36 ----- keyboards/cherrybstudio/cb87v2/info.json | 200 ++++++++++++------------ 9 files changed, 421 insertions(+), 521 deletions(-) delete mode 100644 keyboards/cherrybstudio/cb1800/cb1800.h delete mode 100644 keyboards/cherrybstudio/cb65/cb65.h delete mode 100644 keyboards/cherrybstudio/cb87rgb/cb87rgb.h delete mode 100644 keyboards/cherrybstudio/cb87v2/cb87v2.h (limited to 'keyboards/cherrybstudio') diff --git a/keyboards/cherrybstudio/cb1800/cb1800.h b/keyboards/cherrybstudio/cb1800/cb1800.h deleted file mode 100644 index 990bc5cfd6..0000000000 --- a/keyboards/cherrybstudio/cb1800/cb1800.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -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" - -#define LAYOUT_all( \ - K000, K001, K002, K003, K004,K005, K006, K007, K008, K009, K010, K100, K101, K909, K102, K103, K104, K105, \ - K106, K107, K108, K109, \ - K110, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K300, K301, K302, K303, K304, K305, K306, \ - K307, K308, K309, K310, K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K500, K501, K502, \ - K503, K504, K505, K506, K507, K508, K509, K510, K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, \ - K610, K700, K701, K702, K703, K704, K705, K706, K707, K708, K709, K710, K800, K801, K802, K803, K804, K805, \ - K806, K807, K808, K809, K810, K900, K901, K902, K903, K904, K905, K906, K907, K908 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410 }, \ - { K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510 }, \ - { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610 }, \ - { K700, K701, K702, K703, K704, K705, K706, K707, K708, K709, K710 }, \ - { K800, K801, K802, K803, K804, K805, K806, K807, K808, K809, K810 }, \ - { K900, K901, K902, K903, K904, K905, K906, K907, K908, K909, KC_NO } \ -} - diff --git a/keyboards/cherrybstudio/cb1800/info.json b/keyboards/cherrybstudio/cb1800/info.json index 8be7721b0f..f4c85b0b1f 100644 --- a/keyboards/cherrybstudio/cb1800/info.json +++ b/keyboards/cherrybstudio/cb1800/info.json @@ -27,121 +27,133 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1.25, "y":0}, - {"label":"F2", "x":2.25, "y":0}, - {"label":"F3", "x":3.25, "y":0}, - {"label":"F4", "x":4.25, "y":0}, - {"label":"F5", "x":5.5, "y":0}, - {"label":"F6", "x":6.5, "y":0}, - {"label":"F7", "x":7.5, "y":0}, - {"label":"F8", "x":8.5, "y":0}, - {"label":"F9", "x":9.75, "y":0}, - {"label":"F10", "x":10.75, "y":0}, - {"label":"F11", "x":11.75, "y":0}, - {"label":"F12", "x":12.75, "y":0}, - {"label":"Esc", "x":14, "y":0}, - {"label":"Insert", "x":15.5, "y":0}, - {"label":"Home", "x":16.5, "y":0}, - {"label":"PgUp", "x":17.5, "y":0}, - {"label":"PrtSc", "x":18.5, "y":0}, - - {"label":"Delete", "x":15.5, "y":1}, - {"label":"End", "x":16.5, "y":1}, - {"label":"PgDn", "x":17.5, "y":1}, - {"label":"Scroll Lock", "x":18.5, "y":1}, - - {"label":"~", "x":0, "y":2}, - {"label":"!", "x":1, "y":2}, - {"label":"@", "x":2, "y":2}, - {"label":"#", "x":3, "y":2}, - {"label":"$", "x":4, "y":2}, - {"label":"%", "x":5, "y":2}, - {"label":"^", "x":6, "y":2}, - {"label":"&", "x":7, "y":2}, - {"label":"*", "x":8, "y":2}, - {"label":"(", "x":9, "y":2}, - {"label":")", "x":10, "y":2}, - {"label":"_", "x":11, "y":2}, - {"label":"+", "x":12, "y":2}, - {"x":13, "y":2}, - {"label":"Backspace", "x":14, "y":2}, - {"label":"Num Lock", "x":15.5, "y":2}, - {"label":"/", "x":16.5, "y":2}, - {"label":"*", "x":17.5, "y":2}, - {"label":"Pause", "x":18.5, "y":2}, - - {"label":"Tab", "x":0, "y":3, "w":1.5}, - {"label":"Q", "x":1.5, "y":3}, - {"label":"W", "x":2.5, "y":3}, - {"label":"E", "x":3.5, "y":3}, - {"label":"R", "x":4.5, "y":3}, - {"label":"T", "x":5.5, "y":3}, - {"label":"Y", "x":6.5, "y":3}, - {"label":"U", "x":7.5, "y":3}, - {"label":"I", "x":8.5, "y":3}, - {"label":"O", "x":9.5, "y":3}, - {"label":"P", "x":10.5, "y":3}, - {"label":"{", "x":11.5, "y":3}, - {"label":"}", "x":12.5, "y":3}, - {"label":"|", "x":13.5, "y":3, "w":1.5}, - {"label":"7", "x":15.5, "y":3}, - {"label":"8", "x":16.5, "y":3}, - {"label":"9", "x":17.5, "y":3}, - {"label":"-", "x":18.5, "y":3}, - - {"label":"Caps Lock", "x":0, "y":4, "w":1.75}, - {"label":"A", "x":1.75, "y":4}, - {"label":"S", "x":2.75, "y":4}, - {"label":"D", "x":3.75, "y":4}, - {"label":"F", "x":4.75, "y":4}, - {"label":"G", "x":5.75, "y":4}, - {"label":"H", "x":6.75, "y":4}, - {"label":"J", "x":7.75, "y":4}, - {"label":"K", "x":8.75, "y":4}, - {"label":"L", "x":9.75, "y":4}, - {"label":":", "x":10.75, "y":4}, - {"label":"\"", "x":11.75, "y":4}, - {"label":"ISO~", "x":12.75, "y":4}, - {"label":"Enter", "x":13.75, "y":4, "w":1.25}, - {"label":"4", "x":15.5, "y":4}, - {"label":"5", "x":16.5, "y":4}, - {"label":"6", "x":17.5, "y":4}, - {"label":"+", "x":18.5, "y":4}, - - {"label":"Shift", "x":0, "y":5, "w":1.25}, - {"label":"ISO|", "x":1.25, "y":5}, - {"label":"Z", "x":2.25, "y":5}, - {"label":"X", "x":3.25, "y":5}, - {"label":"C", "x":4.25, "y":5}, - {"label":"V", "x":5.25, "y":5}, - {"label":"B", "x":6.25, "y":5}, - {"label":"N", "x":7.25, "y":5}, - {"label":"M", "x":8.25, "y":5}, - {"label":"<", "x":9.25, "y":5}, - {"label":">", "x":10.25, "y":5}, - {"label":"?", "x":11.25, "y":5}, - {"label":"Shift", "x":12.25, "y":5, "w":1.75}, - {"label":"Up", "x":14.25, "y":5.25}, - {"label":"1", "x":15.5, "y":5}, - {"label":"2", "x":16.5, "y":5}, - {"label":"3", "x":17.5, "y":5}, - {"label":"Enter", "x":18.5, "y":5}, - - {"label":"LCtrl", "x":0, "y":6}, - {"label":"LGui", "x":1, "y":6}, - {"label":"LAlt", "x":2, "y":6}, - {"label":"Space", "x":3, "y":6, "w":6}, - {"label":"RAlt", "x":9, "y":6}, - {"label":"RGui", "x":10, "y":6}, - {"label":"Menu", "x":11, "y":6}, - {"label":"LCtrl", "x":12, "y":6}, - {"label":"Left", "x":13.25, "y":6.25}, - {"label":"Down", "x":14.25, "y":6.25}, - {"label":"Right", "x":15.25, "y":6.25}, - {"label":"0", "x":16.5, "y":6}, - {"label":".", "x":17.5, "y":6}, - {"label":"Enter", "x":18.5, "y":6} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [1, 0], "x": 11.75, "y": 0}, + {"matrix": [1, 1], "x": 12.75, "y": 0}, + + {"matrix": [9, 9], "x": 14, "y": 0}, + + {"matrix": [1, 2], "x": 15.5, "y": 0}, + {"matrix": [1, 3], "x": 16.5, "y": 0}, + {"matrix": [1, 4], "x": 17.5, "y": 0}, + {"matrix": [1, 5], "x": 18.5, "y": 0}, + + {"matrix": [1, 6], "x": 15.5, "y": 1}, + {"matrix": [1, 7], "x": 16.5, "y": 1}, + {"matrix": [1, 8], "x": 17.5, "y": 1}, + {"matrix": [1, 9], "x": 18.5, "y": 1}, + + {"matrix": [1, 10], "x": 0, "y": 2}, + {"matrix": [2, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 8, "y": 2}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2}, + {"matrix": [2, 10], "x": 11, "y": 2}, + {"matrix": [3, 0], "x": 12, "y": 2}, + {"matrix": [3, 1], "x": 13, "y": 2}, + {"matrix": [3, 2], "x": 14, "y": 2}, + + {"matrix": [3, 3], "x": 15.5, "y": 2}, + {"matrix": [3, 4], "x": 16.5, "y": 2}, + {"matrix": [3, 5], "x": 17.5, "y": 2}, + {"matrix": [3, 6], "x": 18.5, "y": 2}, + + {"matrix": [3, 7], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 8], "x": 1.5, "y": 3}, + {"matrix": [3, 9], "x": 2.5, "y": 3}, + {"matrix": [3, 10], "x": 3.5, "y": 3}, + {"matrix": [4, 0], "x": 4.5, "y": 3}, + {"matrix": [4, 1], "x": 5.5, "y": 3}, + {"matrix": [4, 2], "x": 6.5, "y": 3}, + {"matrix": [4, 3], "x": 7.5, "y": 3}, + {"matrix": [4, 4], "x": 8.5, "y": 3}, + {"matrix": [4, 5], "x": 9.5, "y": 3}, + {"matrix": [4, 6], "x": 10.5, "y": 3}, + {"matrix": [4, 7], "x": 11.5, "y": 3}, + {"matrix": [4, 8], "x": 12.5, "y": 3}, + {"matrix": [4, 9], "x": 13.5, "y": 3, "w": 1.5}, + + {"matrix": [4, 10], "x": 15.5, "y": 3}, + {"matrix": [5, 0], "x": 16.5, "y": 3}, + {"matrix": [5, 1], "x": 17.5, "y": 3}, + {"matrix": [5, 2], "x": 18.5, "y": 3}, + + {"matrix": [5, 3], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [5, 4], "x": 1.75, "y": 4}, + {"matrix": [5, 5], "x": 2.75, "y": 4}, + {"matrix": [5, 6], "x": 3.75, "y": 4}, + {"matrix": [5, 7], "x": 4.75, "y": 4}, + {"matrix": [5, 8], "x": 5.75, "y": 4}, + {"matrix": [5, 9], "x": 6.75, "y": 4}, + {"matrix": [5, 10], "x": 7.75, "y": 4}, + {"matrix": [6, 0], "x": 8.75, "y": 4}, + {"matrix": [6, 1], "x": 9.75, "y": 4}, + {"matrix": [6, 2], "x": 10.75, "y": 4}, + {"matrix": [6, 3], "x": 11.75, "y": 4}, + {"matrix": [6, 4], "x": 12.75, "y": 4}, + {"matrix": [6, 5], "x": 13.75, "y": 4, "w": 1.25}, + + {"matrix": [6, 6], "x": 15.5, "y": 4}, + {"matrix": [6, 7], "x": 16.5, "y": 4}, + {"matrix": [6, 8], "x": 17.5, "y": 4}, + {"matrix": [6, 9], "x": 18.5, "y": 4}, + + {"matrix": [6, 10], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [7, 0], "x": 1.25, "y": 5}, + {"matrix": [7, 1], "x": 2.25, "y": 5}, + {"matrix": [7, 2], "x": 3.25, "y": 5}, + {"matrix": [7, 3], "x": 4.25, "y": 5}, + {"matrix": [7, 4], "x": 5.25, "y": 5}, + {"matrix": [7, 5], "x": 6.25, "y": 5}, + {"matrix": [7, 6], "x": 7.25, "y": 5}, + {"matrix": [7, 7], "x": 8.25, "y": 5}, + {"matrix": [7, 8], "x": 9.25, "y": 5}, + {"matrix": [7, 9], "x": 10.25, "y": 5}, + {"matrix": [7, 10], "x": 11.25, "y": 5}, + {"matrix": [8, 0], "x": 12.25, "y": 5, "w": 1.75}, + + {"matrix": [8, 1], "x": 14.25, "y": 5.25}, + + {"matrix": [8, 2], "x": 15.5, "y": 5}, + {"matrix": [8, 3], "x": 16.5, "y": 5}, + {"matrix": [8, 4], "x": 17.5, "y": 5}, + {"matrix": [8, 5], "x": 18.5, "y": 5}, + + {"matrix": [8, 6], "x": 0, "y": 6}, + {"matrix": [8, 7], "x": 1, "y": 6}, + {"matrix": [8, 8], "x": 2, "y": 6}, + {"matrix": [8, 9], "x": 3, "y": 6, "w": 6}, + {"matrix": [8, 10], "x": 9, "y": 6}, + {"matrix": [9, 0], "x": 10, "y": 6}, + {"matrix": [9, 1], "x": 11, "y": 6}, + {"matrix": [9, 2], "x": 12, "y": 6}, + + {"matrix": [9, 3], "x": 13.25, "y": 6.25}, + {"matrix": [9, 4], "x": 14.25, "y": 6.25}, + {"matrix": [9, 5], "x": 15.25, "y": 6.25}, + + {"matrix": [9, 6], "x": 16.5, "y": 6}, + {"matrix": [9, 7], "x": 17.5, "y": 6}, + {"matrix": [9, 8], "x": 18.5, "y": 6} ] } } diff --git a/keyboards/cherrybstudio/cb65/cb65.h b/keyboards/cherrybstudio/cb65/cb65.h deleted file mode 100644 index c17df211da..0000000000 --- a/keyboards/cherrybstudio/cb65/cb65.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -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" - -#define LAYOUT_all( \ - K000, K001, K002, K003, K004, K005, K006, K007, K100, K101, K102, K103, K104, K105, K106, K107, \ - K200, K201, K202, K203, K204, K205, K206, K207, K300, K301, K302, K303, K304, K305, K306, \ - K307, K400, K401, K402, K403, K404, K405, K406, K407, K500, K501, K502, K503, K504, K505, \ - K506, K507, K600, K601, K602, K603, K604, K605, K606, K607, K700, K701, K702, K703, K704, \ - K705, K706, K707, K800, K801, K802, K803, K804, K805 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407 }, \ - { K500, K501, K502, K503, K504, K505, K506, K507 }, \ - { K600, K601, K602, K603, K604, K605, K606, K607 }, \ - { K700, K701, K702, K703, K704, K705, K706, K707 }, \ - { K800, K801, K802, K803, K804, K805 } \ -} - diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json index 8360bf3a06..2d3ce3a2b7 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/info.json @@ -26,76 +26,81 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15, "y":0}, - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - {"x":15, "y":1}, - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - {"x":13.75, "y":2, "w":1.25}, - {"x":15, "y":2}, - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, - {"x":15, "y":3}, - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":13, "y":4}, - {"x":14, "y":4}, - {"x":15, "y":4} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [1, 0], "x": 8, "y": 0}, + {"matrix": [1, 1], "x": 9, "y": 0}, + {"matrix": [1, 2], "x": 10, "y": 0}, + {"matrix": [1, 3], "x": 11, "y": 0}, + {"matrix": [1, 4], "x": 12, "y": 0}, + {"matrix": [1, 5], "x": 13, "y": 0}, + {"matrix": [1, 6], "x": 14, "y": 0}, + {"matrix": [1, 7], "x": 15, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 1}, + {"matrix": [2, 2], "x": 2.5, "y": 1}, + {"matrix": [2, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 4], "x": 4.5, "y": 1}, + {"matrix": [2, 5], "x": 5.5, "y": 1}, + {"matrix": [2, 6], "x": 6.5, "y": 1}, + {"matrix": [2, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 0], "x": 8.5, "y": 1}, + {"matrix": [3, 1], "x": 9.5, "y": 1}, + {"matrix": [3, 2], "x": 10.5, "y": 1}, + {"matrix": [3, 3], "x": 11.5, "y": 1}, + {"matrix": [3, 4], "x": 12.5, "y": 1}, + {"matrix": [3, 5], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [3, 6], "x": 15, "y": 1}, + + {"matrix": [3, 7], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [4, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [4, 2], "x": 3.75, "y": 2}, + {"matrix": [4, 3], "x": 4.75, "y": 2}, + {"matrix": [4, 4], "x": 5.75, "y": 2}, + {"matrix": [4, 5], "x": 6.75, "y": 2}, + {"matrix": [4, 6], "x": 7.75, "y": 2}, + {"matrix": [4, 7], "x": 8.75, "y": 2}, + {"matrix": [5, 0], "x": 9.75, "y": 2}, + {"matrix": [5, 1], "x": 10.75, "y": 2}, + {"matrix": [5, 2], "x": 11.75, "y": 2}, + {"matrix": [5, 3], "x": 12.75, "y": 2}, + {"matrix": [5, 4], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [5, 5], "x": 15, "y": 2}, + + {"matrix": [5, 6], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [5, 7], "x": 1.25, "y": 3}, + {"matrix": [6, 0], "x": 2.25, "y": 3}, + {"matrix": [6, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [6, 3], "x": 5.25, "y": 3}, + {"matrix": [6, 4], "x": 6.25, "y": 3}, + {"matrix": [6, 5], "x": 7.25, "y": 3}, + {"matrix": [6, 6], "x": 8.25, "y": 3}, + {"matrix": [6, 7], "x": 9.25, "y": 3}, + {"matrix": [7, 0], "x": 10.25, "y": 3}, + {"matrix": [7, 1], "x": 11.25, "y": 3}, + {"matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [7, 3], "x": 14, "y": 3}, + {"matrix": [7, 4], "x": 15, "y": 3}, + + {"matrix": [7, 5], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [7, 6], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [7, 7], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [8, 0], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [8, 1], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [8, 2], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [8, 3], "x": 13, "y": 4}, + {"matrix": [8, 4], "x": 14, "y": 4}, + {"matrix": [8, 5], "x": 15, "y": 4} ] } } diff --git a/keyboards/cherrybstudio/cb87rgb/cb87rgb.c b/keyboards/cherrybstudio/cb87rgb/cb87rgb.c index 6c9d30c6ef..5c2480f3fb 100644 --- a/keyboards/cherrybstudio/cb87rgb/cb87rgb.c +++ b/keyboards/cherrybstudio/cb87rgb/cb87rgb.c @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "cb87rgb.h" +#include "quantum.h" //x = 224 / (NUMBER_OF_COLS - 1) * COL_POSITION //y = 64 / (NUMBER_OF_ROWS - 1) * ROW_POSITION diff --git a/keyboards/cherrybstudio/cb87rgb/cb87rgb.h b/keyboards/cherrybstudio/cb87rgb/cb87rgb.h deleted file mode 100644 index 16702e516b..0000000000 --- a/keyboards/cherrybstudio/cb87rgb/cb87rgb.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -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" - -#define LAYOUT_all( \ - K000, K001, K002, K003,K004, K005, K006, K007,K008, K009, K100, K101, K102, K901, K103, K104, K105, \ - K106, K107, K108, K109, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K300, K301, K302, K303, \ - K304, K305, K306, K307, K308, K309, K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K500, \ - K501, K502, K503, K504, K505, K506, K507, K508, K509, K600, K601, K602, K603, K604, \ - K605, K606, K607, K608, K609, K700, K701, K702, K703, K704, K705, K706, K707, K708, K709, \ - K800, K801, K802, K803, K804, K805, K806, K807, K808, K809, K900 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, }, \ - { K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, }, \ - { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, }, \ - { K700, K701, K702, K703, K704, K705, K706, K707, K708, K709, }, \ - { K800, K801, K802, K803, K804, K805, K806, K807, K808, K809, }, \ - { K900, K901 } \ -} - diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index bbdbfde9a9..ee44b895ef 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -21,101 +21,116 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT_all": { - "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1.25, "y":0}, - {"label":"F2", "x":2.25, "y":0}, - {"label":"F3", "x":3.25, "y":0}, - {"label":"F4", "x":4.25, "y":0}, - {"label":"F5", "x":5.5, "y":0}, - {"label":"F6", "x":6.5, "y":0}, - {"label":"F7", "x":7.5, "y":0}, - {"label":"F8", "x":8.5, "y":0}, - {"label":"F9", "x":9.75, "y":0}, - {"label":"F10", "x":10.75, "y":0}, - {"label":"F11", "x":11.75, "y":0}, - {"label":"F12", "x":12.75, "y":0}, - {"label":"Esc", "x":14, "y":0}, - {"label":"PrtSc", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - {"label":"~", "x":0, "y":1.5}, - {"label":"!", "x":1, "y":1.5}, - {"label":"@", "x":2, "y":1.5}, - {"label":"#", "x":3, "y":1.5}, - {"label":"$", "x":4, "y":1.5}, - {"label":"%", "x":5, "y":1.5}, - {"label":"^", "x":6, "y":1.5}, - {"label":"&", "x":7, "y":1.5}, - {"label":"*", "x":8, "y":1.5}, - {"label":"(", "x":9, "y":1.5}, - {"label":")", "x":10, "y":1.5}, - {"label":"_", "x":11, "y":1.5}, - {"label":"+", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5}, - {"label":"Backspace", "x":14, "y":1.5}, - {"label":"Insert", "x":15.25, "y":1.5}, - {"label":"Home", "x":16.25, "y":1.5}, - {"label":"PgUp", "x":17.25, "y":1.5}, - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"{", "x":11.5, "y":2.5}, - {"label":"}", "x":12.5, "y":2.5}, - {"label":"|", "x":13.5, "y":2.5, "w":1.5}, - {"label":"Delete", "x":15.25, "y":2.5}, - {"label":"End", "x":16.25, "y":2.5}, - {"label":"PgDn", "x":17.25, "y":2.5}, - {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":":", "x":10.75, "y":3.5}, - {"label":"\"", "x":11.75, "y":3.5}, - {"label":"ISO~", "x":12.75, "y":3.5}, - {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, - {"label":"LShift", "x":0, "y":4.5, "w":1.25}, - {"label":"ISO|", "x":1.25, "y":4.5}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":"<", "x":9.25, "y":4.5}, - {"label":">", "x":10.25, "y":4.5}, - {"label":"?", "x":11.25, "y":4.5}, - {"label":"RShift", "x":12.25, "y":4.5, "w":1.75}, - {"label":"RShift", "x":14, "y":4.5}, - {"label":"Up", "x":16.25, "y":4.5}, - {"label":"LCtrl", "x":0, "y":5.5, "w":1.25}, - {"label":"LWin", "x":1.25, "y":5.5, "w":1.25}, - {"label":"LAlt", "x":2.5, "y":5.5, "w":1.25}, - {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, - {"label":"RAlt", "x":10, "y":5.5, "w":1.25}, - {"label":"RWin", "x":11.25, "y":5.5, "w":1.25}, - {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, - {"label":"RCtrl", "x":13.75, "y":5.5, "w":1.25}, - {"label":"Left", "x":15.25, "y":5.5}, - {"label":"Down", "x":16.25, "y":5.5}, - {"label":"Right", "x":17.25, "y":5.5}] - } + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [1, 0], "x": 10.75, "y": 0}, + {"matrix": [1, 1], "x": 11.75, "y": 0}, + {"matrix": [1, 2], "x": 12.75, "y": 0}, + + {"matrix": [9, 1], "x": 14, "y": 0}, + + {"matrix": [1, 3], "x": 15.25, "y": 0}, + {"matrix": [1, 4], "x": 16.25, "y": 0}, + {"matrix": [1, 5], "x": 17.25, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1.5}, + {"matrix": [1, 7], "x": 1, "y": 1.5}, + {"matrix": [1, 8], "x": 2, "y": 1.5}, + {"matrix": [1, 9], "x": 3, "y": 1.5}, + {"matrix": [2, 0], "x": 4, "y": 1.5}, + {"matrix": [2, 1], "x": 5, "y": 1.5}, + {"matrix": [2, 2], "x": 6, "y": 1.5}, + {"matrix": [2, 3], "x": 7, "y": 1.5}, + {"matrix": [2, 4], "x": 8, "y": 1.5}, + {"matrix": [2, 5], "x": 9, "y": 1.5}, + {"matrix": [2, 6], "x": 10, "y": 1.5}, + {"matrix": [2, 7], "x": 11, "y": 1.5}, + {"matrix": [2, 8], "x": 12, "y": 1.5}, + {"matrix": [2, 9], "x": 13, "y": 1.5}, + {"matrix": [3, 0], "x": 14, "y": 1.5}, + + {"matrix": [3, 1], "x": 15.25, "y": 1.5}, + {"matrix": [3, 2], "x": 16.25, "y": 1.5}, + {"matrix": [3, 3], "x": 17.25, "y": 1.5}, + + {"matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [3, 5], "x": 1.5, "y": 2.5}, + {"matrix": [3, 6], "x": 2.5, "y": 2.5}, + {"matrix": [3, 7], "x": 3.5, "y": 2.5}, + {"matrix": [3, 8], "x": 4.5, "y": 2.5}, + {"matrix": [3, 9], "x": 5.5, "y": 2.5}, + {"matrix": [4, 0], "x": 6.5, "y": 2.5}, + {"matrix": [4, 1], "x": 7.5, "y": 2.5}, + {"matrix": [4, 2], "x": 8.5, "y": 2.5}, + {"matrix": [4, 3], "x": 9.5, "y": 2.5}, + {"matrix": [4, 4], "x": 10.5, "y": 2.5}, + {"matrix": [4, 5], "x": 11.5, "y": 2.5}, + {"matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"matrix": [4, 7], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [4, 8], "x": 15.25, "y": 2.5}, + {"matrix": [4, 9], "x": 16.25, "y": 2.5}, + {"matrix": [5, 0], "x": 17.25, "y": 2.5}, + + {"matrix": [5, 1], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [5, 2], "x": 1.75, "y": 3.5}, + {"matrix": [5, 3], "x": 2.75, "y": 3.5}, + {"matrix": [5, 4], "x": 3.75, "y": 3.5}, + {"matrix": [5, 5], "x": 4.75, "y": 3.5}, + {"matrix": [5, 6], "x": 5.75, "y": 3.5}, + {"matrix": [5, 7], "x": 6.75, "y": 3.5}, + {"matrix": [5, 8], "x": 7.75, "y": 3.5}, + {"matrix": [5, 9], "x": 8.75, "y": 3.5}, + {"matrix": [6, 0], "x": 9.75, "y": 3.5}, + {"matrix": [6, 1], "x": 10.75, "y": 3.5}, + {"matrix": [6, 2], "x": 11.75, "y": 3.5}, + {"matrix": [6, 3], "x": 12.75, "y": 3.5}, + {"matrix": [6, 4], "x": 13.75, "y": 3.5, "w": 1.25}, + + {"matrix": [6, 5], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [6, 6], "x": 1.25, "y": 4.5}, + {"matrix": [6, 7], "x": 2.25, "y": 4.5}, + {"matrix": [6, 8], "x": 3.25, "y": 4.5}, + {"matrix": [6, 9], "x": 4.25, "y": 4.5}, + {"matrix": [7, 0], "x": 5.25, "y": 4.5}, + {"matrix": [7, 1], "x": 6.25, "y": 4.5}, + {"matrix": [7, 2], "x": 7.25, "y": 4.5}, + {"matrix": [7, 3], "x": 8.25, "y": 4.5}, + {"matrix": [7, 4], "x": 9.25, "y": 4.5}, + {"matrix": [7, 5], "x": 10.25, "y": 4.5}, + {"matrix": [7, 6], "x": 11.25, "y": 4.5}, + {"matrix": [7, 7], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [7, 8], "x": 14, "y": 4.5}, + + {"matrix": [7, 9], "x": 16.25, "y": 4.5}, + + {"matrix": [8, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [8, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [8, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [8, 3], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [8, 4], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [8, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [8, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [8, 7], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [8, 8], "x": 15.25, "y": 5.5}, + {"matrix": [8, 9], "x": 16.25, "y": 5.5}, + {"matrix": [9, 0], "x": 17.25, "y": 5.5} + ] } } +} diff --git a/keyboards/cherrybstudio/cb87v2/cb87v2.h b/keyboards/cherrybstudio/cb87v2/cb87v2.h deleted file mode 100644 index 9f60aa6b51..0000000000 --- a/keyboards/cherrybstudio/cb87v2/cb87v2.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -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" - -#define LAYOUT_all( \ - K000, K001, K002, K003,K004, K005, K006, K007,K008, K009, K100, K101, K102, K103, K104, K105, \ - K106, K107, K108, K109, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K300, K301, K302, K303, \ - K304, K305, K306, K307, K308, K309, K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K500, \ - K501, K502, K503, K504, K505, K506, K507, K508, K509, K600, K601, K602, K603, K604, \ - K605, K606, K607, K608, K609, K700, K701, K702, K703, K704, K705, K706, K707, K708, K709, \ - K800, K801, K802, K803, K804, K805, K806, K807, K808, K809, K900, K901, K902 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, }, \ - { K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, }, \ - { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, }, \ - { K700, K701, K702, K703, K704, K705, K706, K707, K708, K709, }, \ - { K800, K801, K802, K803, K804, K805, K806, K807, K808, K809, }, \ - { K900, K901, K902 } \ -} diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index 63872a922b..a356a47df1 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -29,99 +29,113 @@ "layouts": { "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":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - {"label":"F11", "x":13, "y":0}, - {"label":"F12", "x":14, "y":0}, - {"label":"PrtSc", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - {"label":"~", "x":0, "y":1.25}, - {"label":"!", "x":1, "y":1.25}, - {"label":"@", "x":2, "y":1.25}, - {"label":"#", "x":3, "y":1.25}, - {"label":"$", "x":4, "y":1.25}, - {"label":"%", "x":5, "y":1.25}, - {"label":"^", "x":6, "y":1.25}, - {"label":"&", "x":7, "y":1.25}, - {"label":"*", "x":8, "y":1.25}, - {"label":"(", "x":9, "y":1.25}, - {"label":")", "x":10, "y":1.25}, - {"label":"_", "x":11, "y":1.25}, - {"label":"+", "x":12, "y":1.25}, - {"label":"Backspace", "x":13, "y":1.25}, - {"label":"Backspace", "x":14, "y":1.25}, - {"label":"Insert", "x":15.25, "y":1.25}, - {"label":"Home", "x":16.25, "y":1.25}, - {"label":"PgUp", "x":17.25, "y":1.25}, - {"label":"Tab", "x":0, "y":2.25, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.25}, - {"label":"W", "x":2.5, "y":2.25}, - {"label":"E", "x":3.5, "y":2.25}, - {"label":"R", "x":4.5, "y":2.25}, - {"label":"T", "x":5.5, "y":2.25}, - {"label":"Y", "x":6.5, "y":2.25}, - {"label":"U", "x":7.5, "y":2.25}, - {"label":"I", "x":8.5, "y":2.25}, - {"label":"O", "x":9.5, "y":2.25}, - {"label":"P", "x":10.5, "y":2.25}, - {"label":"{", "x":11.5, "y":2.25}, - {"label":"}", "x":12.5, "y":2.25}, - {"label":"|", "x":13.5, "y":2.25, "w":1.5}, - {"label":"Delete", "x":15.25, "y":2.25}, - {"label":"End", "x":16.25, "y":2.25}, - {"label":"PgDn", "x":17.25, "y":2.25}, - {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, - {"label":"A", "x":1.75, "y":3.25}, - {"label":"S", "x":2.75, "y":3.25}, - {"label":"D", "x":3.75, "y":3.25}, - {"label":"F", "x":4.75, "y":3.25}, - {"label":"G", "x":5.75, "y":3.25}, - {"label":"H", "x":6.75, "y":3.25}, - {"label":"J", "x":7.75, "y":3.25}, - {"label":"K", "x":8.75, "y":3.25}, - {"label":"L", "x":9.75, "y":3.25}, - {"label":":", "x":10.75, "y":3.25}, - {"label":"\"", "x":11.75, "y":3.25}, - {"label":"ISO~", "x":12.75, "y":3.25}, - {"label":"Enter", "x":13.75, "y":3.25, "w":1.25}, - {"label":"lShift", "x":0, "y":4.25, "w":1.25}, - {"label":"ISO|", "x":1.25, "y":4.25}, - {"label":"Z", "x":2.25, "y":4.25}, - {"label":"X", "x":3.25, "y":4.25}, - {"label":"C", "x":4.25, "y":4.25}, - {"label":"V", "x":5.25, "y":4.25}, - {"label":"B", "x":6.25, "y":4.25}, - {"label":"N", "x":7.25, "y":4.25}, - {"label":"M", "x":8.25, "y":4.25}, - {"label":"<", "x":9.25, "y":4.25}, - {"label":">", "x":10.25, "y":4.25}, - {"label":"?", "x":11.25, "y":4.25}, - {"label":"rShift", "x":12.25, "y":4.25, "w":1.75}, - {"label":"rshift", "x":14, "y":4.25}, - {"label":"up", "x":16.25, "y":4.25}, - {"label":"lCtrl", "x":0, "y":5.25, "w":1.25}, - {"label":"lWin", "x":1.25, "y":5.25, "w":1.25}, - {"label":"lAlt", "x":2.5, "y":5.25, "w":1.25}, - {"label":"space", "x":3.75, "y":5.25, "w":2.25}, - {"label":"space", "x":6, "y":5.25, "w":1.25}, - {"label":"space", "x":7.25, "y":5.25, "w":2.75}, - {"label":"rAlt", "x":10, "y":5.25, "w":1.25}, - {"label":"rWin", "x":11.25, "y":5.25, "w":1.25}, - {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, - {"label":"rCtrl", "x":13.75, "y":5.25, "w":1.25}, - {"label":"left", "x":15.25, "y":5.25}, - {"label":"down", "x":16.25, "y":5.25}, - {"label":"right", "x":17.25, "y":5.25}] + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [1, 0], "x": 12, "y": 0}, + {"matrix": [1, 1], "x": 13, "y": 0}, + {"matrix": [1, 2], "x": 14, "y": 0}, + + {"matrix": [1, 3], "x": 15.25, "y": 0}, + {"matrix": [1, 4], "x": 16.25, "y": 0}, + {"matrix": [1, 5], "x": 17.25, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1.25}, + {"matrix": [1, 7], "x": 1, "y": 1.25}, + {"matrix": [1, 8], "x": 2, "y": 1.25}, + {"matrix": [1, 9], "x": 3, "y": 1.25}, + {"matrix": [2, 0], "x": 4, "y": 1.25}, + {"matrix": [2, 1], "x": 5, "y": 1.25}, + {"matrix": [2, 2], "x": 6, "y": 1.25}, + {"matrix": [2, 3], "x": 7, "y": 1.25}, + {"matrix": [2, 4], "x": 8, "y": 1.25}, + {"matrix": [2, 5], "x": 9, "y": 1.25}, + {"matrix": [2, 6], "x": 10, "y": 1.25}, + {"matrix": [2, 7], "x": 11, "y": 1.25}, + {"matrix": [2, 8], "x": 12, "y": 1.25}, + {"matrix": [2, 9], "x": 13, "y": 1.25}, + {"matrix": [3, 0], "x": 14, "y": 1.25}, + + {"matrix": [3, 1], "x": 15.25, "y": 1.25}, + {"matrix": [3, 2], "x": 16.25, "y": 1.25}, + {"matrix": [3, 3], "x": 17.25, "y": 1.25}, + + {"matrix": [3, 4], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [3, 5], "x": 1.5, "y": 2.25}, + {"matrix": [3, 6], "x": 2.5, "y": 2.25}, + {"matrix": [3, 7], "x": 3.5, "y": 2.25}, + {"matrix": [3, 8], "x": 4.5, "y": 2.25}, + {"matrix": [3, 9], "x": 5.5, "y": 2.25}, + {"matrix": [4, 0], "x": 6.5, "y": 2.25}, + {"matrix": [4, 1], "x": 7.5, "y": 2.25}, + {"matrix": [4, 2], "x": 8.5, "y": 2.25}, + {"matrix": [4, 3], "x": 9.5, "y": 2.25}, + {"matrix": [4, 4], "x": 10.5, "y": 2.25}, + {"matrix": [4, 5], "x": 11.5, "y": 2.25}, + {"matrix": [4, 6], "x": 12.5, "y": 2.25}, + {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [4, 8], "x": 15.25, "y": 2.25}, + {"matrix": [4, 9], "x": 16.25, "y": 2.25}, + {"matrix": [5, 0], "x": 17.25, "y": 2.25}, + + {"matrix": [5, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [5, 2], "x": 1.75, "y": 3.25}, + {"matrix": [5, 3], "x": 2.75, "y": 3.25}, + {"matrix": [5, 4], "x": 3.75, "y": 3.25}, + {"matrix": [5, 5], "x": 4.75, "y": 3.25}, + {"matrix": [5, 6], "x": 5.75, "y": 3.25}, + {"matrix": [5, 7], "x": 6.75, "y": 3.25}, + {"matrix": [5, 8], "x": 7.75, "y": 3.25}, + {"matrix": [5, 9], "x": 8.75, "y": 3.25}, + {"matrix": [6, 0], "x": 9.75, "y": 3.25}, + {"matrix": [6, 1], "x": 10.75, "y": 3.25}, + {"matrix": [6, 2], "x": 11.75, "y": 3.25}, + {"matrix": [6, 3], "x": 12.75, "y": 3.25}, + {"matrix": [6, 4], "x": 13.75, "y": 3.25, "w": 1.25}, + + {"matrix": [6, 5], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [6, 6], "x": 1.25, "y": 4.25}, + {"matrix": [6, 7], "x": 2.25, "y": 4.25}, + {"matrix": [6, 8], "x": 3.25, "y": 4.25}, + {"matrix": [6, 9], "x": 4.25, "y": 4.25}, + {"matrix": [7, 0], "x": 5.25, "y": 4.25}, + {"matrix": [7, 1], "x": 6.25, "y": 4.25}, + {"matrix": [7, 2], "x": 7.25, "y": 4.25}, + {"matrix": [7, 3], "x": 8.25, "y": 4.25}, + {"matrix": [7, 4], "x": 9.25, "y": 4.25}, + {"matrix": [7, 5], "x": 10.25, "y": 4.25}, + {"matrix": [7, 6], "x": 11.25, "y": 4.25}, + {"matrix": [7, 7], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [7, 8], "x": 14, "y": 4.25}, + + {"matrix": [7, 9], "x": 16.25, "y": 4.25}, + + {"matrix": [8, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [8, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [8, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [8, 3], "x": 3.75, "y": 5.25, "w": 2.25}, + {"matrix": [8, 4], "x": 6, "y": 5.25, "w": 1.25}, + {"matrix": [8, 5], "x": 7.25, "y": 5.25, "w": 2.75}, + {"matrix": [8, 6], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [8, 7], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [8, 8], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [8, 9], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [9, 0], "x": 15.25, "y": 5.25}, + {"matrix": [9, 1], "x": 16.25, "y": 5.25}, + {"matrix": [9, 2], "x": 17.25, "y": 5.25} + ] } } } -- cgit v1.2.3