diff options
Diffstat (limited to 'keyboards/kprepublic/jj50')
-rw-r--r-- | keyboards/kprepublic/jj50/info.json | 120 | ||||
-rw-r--r-- | keyboards/kprepublic/jj50/jj50.h | 36 |
2 files changed, 60 insertions, 96 deletions
diff --git a/keyboards/kprepublic/jj50/info.json b/keyboards/kprepublic/jj50/info.json index 81541075fa..a83d42ab6a 100644 --- a/keyboards/kprepublic/jj50/info.json +++ b/keyboards/kprepublic/jj50/info.json @@ -30,70 +30,70 @@ "layouts": { "LAYOUT_ortho_5x12": { "layout": [ - {"label":"K2B", "x":0, "y":0}, - {"label":"K2A", "x":1, "y":0}, - {"label":"K29", "x":2, "y":0}, - {"label":"K28", "x":3, "y":0}, - {"label":"K24", "x":4, "y":0}, - {"label":"K25", "x":5, "y":0}, - {"label":"K26", "x":6, "y":0}, - {"label":"K27", "x":7, "y":0}, - {"label":"K23", "x":8, "y":0}, - {"label":"K22", "x":9, "y":0}, - {"label":"K21", "x":10, "y":0}, - {"label":"K20", "x":11, "y":0}, + {"matrix": [2, 11], "x": 0, "y": 0}, + {"matrix": [2, 10], "x": 1, "y": 0}, + {"matrix": [2, 9], "x": 2, "y": 0}, + {"matrix": [2, 8], "x": 3, "y": 0}, + {"matrix": [2, 4], "x": 4, "y": 0}, + {"matrix": [2, 5], "x": 5, "y": 0}, + {"matrix": [2, 6], "x": 6, "y": 0}, + {"matrix": [2, 7], "x": 7, "y": 0}, + {"matrix": [2, 3], "x": 8, "y": 0}, + {"matrix": [2, 2], "x": 9, "y": 0}, + {"matrix": [2, 1], "x": 10, "y": 0}, + {"matrix": [2, 0], "x": 11, "y": 0}, - {"label":"K0B", "x":0, "y":1}, - {"label":"K0A", "x":1, "y":1}, - {"label":"K09", "x":2, "y":1}, - {"label":"K08", "x":3, "y":1}, - {"label":"K04", "x":4, "y":1}, - {"label":"K05", "x":5, "y":1}, - {"label":"K06", "x":6, "y":1}, - {"label":"K07", "x":7, "y":1}, - {"label":"K03", "x":8, "y":1}, - {"label":"K02", "x":9, "y":1}, - {"label":"K01", "x":10, "y":1}, - {"label":"K00", "x":11, "y":1}, + {"matrix": [0, 11], "x": 0, "y": 1}, + {"matrix": [0, 10], "x": 1, "y": 1}, + {"matrix": [0, 9], "x": 2, "y": 1}, + {"matrix": [0, 8], "x": 3, "y": 1}, + {"matrix": [0, 4], "x": 4, "y": 1}, + {"matrix": [0, 5], "x": 5, "y": 1}, + {"matrix": [0, 6], "x": 6, "y": 1}, + {"matrix": [0, 7], "x": 7, "y": 1}, + {"matrix": [0, 3], "x": 8, "y": 1}, + {"matrix": [0, 2], "x": 9, "y": 1}, + {"matrix": [0, 1], "x": 10, "y": 1}, + {"matrix": [0, 0], "x": 11, "y": 1}, - {"label":"K1B", "x":0, "y":2}, - {"label":"K1A", "x":1, "y":2}, - {"label":"K19", "x":2, "y":2}, - {"label":"K18", "x":3, "y":2}, - {"label":"K14", "x":4, "y":2}, - {"label":"K15", "x":5, "y":2}, - {"label":"K16", "x":6, "y":2}, - {"label":"K17", "x":7, "y":2}, - {"label":"K13", "x":8, "y":2}, - {"label":"K12", "x":9, "y":2}, - {"label":"K11", "x":10, "y":2}, - {"label":"K10", "x":11, "y":2}, + {"matrix": [1, 11], "x": 0, "y": 2}, + {"matrix": [1, 10], "x": 1, "y": 2}, + {"matrix": [1, 9], "x": 2, "y": 2}, + {"matrix": [1, 8], "x": 3, "y": 2}, + {"matrix": [1, 4], "x": 4, "y": 2}, + {"matrix": [1, 5], "x": 5, "y": 2}, + {"matrix": [1, 6], "x": 6, "y": 2}, + {"matrix": [1, 7], "x": 7, "y": 2}, + {"matrix": [1, 3], "x": 8, "y": 2}, + {"matrix": [1, 2], "x": 9, "y": 2}, + {"matrix": [1, 1], "x": 10, "y": 2}, + {"matrix": [1, 0], "x": 11, "y": 2}, - {"label":"K3B", "x":0, "y":3}, - {"label":"K3A", "x":1, "y":3}, - {"label":"K39", "x":2, "y":3}, - {"label":"K38", "x":3, "y":3}, - {"label":"K34", "x":4, "y":3}, - {"label":"K35", "x":5, "y":3}, - {"label":"K36", "x":6, "y":3}, - {"label":"K37", "x":7, "y":3}, - {"label":"K33", "x":8, "y":3}, - {"label":"K32", "x":9, "y":3}, - {"label":"K31", "x":10, "y":3}, - {"label":"K30", "x":11, "y":3}, + {"matrix": [3, 11], "x": 0, "y": 3}, + {"matrix": [3, 10], "x": 1, "y": 3}, + {"matrix": [3, 9], "x": 2, "y": 3}, + {"matrix": [3, 8], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 3], "x": 8, "y": 3}, + {"matrix": [3, 2], "x": 9, "y": 3}, + {"matrix": [3, 1], "x": 10, "y": 3}, + {"matrix": [3, 0], "x": 11, "y": 3}, - {"label":"K4B", "x":0, "y":4}, - {"label":"K4A", "x":1, "y":4}, - {"label":"K49", "x":2, "y":4}, - {"label":"K48", "x":3, "y":4}, - {"label":"K44", "x":4, "y":4}, - {"label":"K45", "x":5, "y":4}, - {"label":"K46", "x":6, "y":4}, - {"label":"K47", "x":7, "y":4}, - {"label":"K43", "x":8, "y":4}, - {"label":"K42", "x":9, "y":4}, - {"label":"K41", "x":10, "y":4}, - {"label":"K40", "x":11, "y":4} + {"matrix": [4, 11], "x": 0, "y": 4}, + {"matrix": [4, 10], "x": 1, "y": 4}, + {"matrix": [4, 9], "x": 2, "y": 4}, + {"matrix": [4, 8], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 3], "x": 8, "y": 4}, + {"matrix": [4, 2], "x": 9, "y": 4}, + {"matrix": [4, 1], "x": 10, "y": 4}, + {"matrix": [4, 0], "x": 11, "y": 4} ] } } diff --git a/keyboards/kprepublic/jj50/jj50.h b/keyboards/kprepublic/jj50/jj50.h deleted file mode 100644 index a3d42856c8..0000000000 --- a/keyboards/kprepublic/jj50/jj50.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com> -Modified 2017 Andrew Novak <ndrw.nvk@gmail.com> -Modified 2018 Wayne Jones (WarmCatUK) <waynekjones@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_5x12( \ - K2B, K2A, K29, K28, K24, K25, K26, K27, K23, K22, K21, K20, \ - K0B, K0A, K09, K08, K04, K05, K06, K07, K03, K02, K01, K00, \ - K1B, K1A, K19, K18, K14, K15, K16, K17, K13, K12, K11, K10, \ - K3B, K3A, K39, K38, K34, K35, K36, K37, K33, K32, K31, K30, \ - K4B, K4A, K49, K48, K44, K45, K46, K47, K43, K42, K41, K40 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B } \ -} |