From 5bd68e3695a82ff504c358c33445b4530c2a327f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 12 Apr 2023 13:42:51 +1000 Subject: Move single `LAYOUT`s to data driven (#20365) --- keyboards/gmmk/pro/rev2/ansi/ansi.c | 2 +- keyboards/gmmk/pro/rev2/ansi/ansi.h | 52 --------- keyboards/gmmk/pro/rev2/ansi/info.json | 197 +++++++++++++++++---------------- 3 files changed, 100 insertions(+), 151 deletions(-) delete mode 100644 keyboards/gmmk/pro/rev2/ansi/ansi.h (limited to 'keyboards/gmmk/pro/rev2/ansi') diff --git a/keyboards/gmmk/pro/rev2/ansi/ansi.c b/keyboards/gmmk/pro/rev2/ansi/ansi.c index c22fbc796d..ccdcd42726 100644 --- a/keyboards/gmmk/pro/rev2/ansi/ansi.c +++ b/keyboards/gmmk/pro/rev2/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "ansi.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE // clang-format off diff --git a/keyboards/gmmk/pro/rev2/ansi/ansi.h b/keyboards/gmmk/pro/rev2/ansi/ansi.h deleted file mode 100644 index b4a67dfd18..0000000000 --- a/keyboards/gmmk/pro/rev2/ansi/ansi.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2021 Glorious, LLC - * - * 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 ___ KC_NO - -// ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Prt Rotary(Mute) -// ` 1 2 3 4 5 6 7 8 9 0 - = BSpc Del -// Tab Q W E R T Y U I O P [ ] \ PgUp -// Caps A S D F G H J K L ; ' Enter PgDn -// Sh_L Z X C V B N M , . / Sh_R Up End -// Ct_L Win_L Alt_L SPACE Alt_R FN Ct_R Left Down Right - -// clang-format off -#define LAYOUT( \ - k13, k26, k36, k31, k33, k07, k63, k71, k76, ka6, ka7, ka3, ka5, k97, k01, \ - k16, k17, k27, k37, k47, k46, k56, k57, k67, k77, k87, k86, k66, ka1, k65, \ - k11, k10, k20, k30, k40, k41, k51, k50, k60, k70, k80, k81, k61, ka2, k15, \ - k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83, ka4, k25, \ - k00, k14, k24, k34, k44, k45, k55, k54, k64, k74, k85, k91, k35, k75, \ - k06, k90, k93, k94, k95, k92, k04, k03, k73, k05 \ -) \ -{ \ - { k00, k01, ___, k03, k04, k05, k06, k07}, \ - { k10, k11, k12, k13, k14, k15, k16, k17}, \ - { k20, k21, k22, ___, k24, k25, k26, k27}, \ - { k30, k31, k32, k33, k34, k35, k36, k37}, \ - { k40, k41, k42, k43, k44, k45, k46, k47}, \ - { k50, k51, k52, k53, k54, k55, k56, k57}, \ - { k60, k61, k62, k63, k64, k65, k66, k67}, \ - { k70, k71, k72, k73, k74, k75, k76, k77}, \ - { k80, k81, k82, k83, ___, k85, k86, k87}, \ - { k90, k91, k92, k93, k94, k95, ___, k97}, \ - { ___, ka1, ka2, ka3, ka4, ka5, ka6, ka7} \ -} -// clang-format on diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json index 44b68750be..ff693e3573 100644 --- a/keyboards/gmmk/pro/rev2/ansi/info.json +++ b/keyboards/gmmk/pro/rev2/ansi/info.json @@ -29,104 +29,105 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0}, - - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - - {"x":9.75, "y":0}, - {"x":10.75, "y":0}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0}, - - {"x":14, "y":0}, - {"x":15.5, "y":0}, - - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4, "y":1.25}, - {"x":5, "y":1.25}, - {"x":6, "y":1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13, "y":1.25, "w":2}, - - {"x":15.5, "y":1.25}, - - {"x":0, "y":2.25, "w":1.5}, - {"x":1.5, "y":2.25}, - {"x":2.5, "y":2.25}, - {"x":3.5, "y":2.25}, - {"x":4.5, "y":2.25}, - {"x":5.5, "y":2.25}, - {"x":6.5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.25}, - {"x":9.5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2.25}, - {"x":13.5, "y":2.25, "w":1.5}, - - {"x":15.5, "y":2.25}, - - {"x":0, "y":3.25, "w":1.75}, - {"x":1.75, "y":3.25}, - {"x":2.75, "y":3.25}, - {"x":3.75, "y":3.25}, - {"x":4.75, "y":3.25}, - {"x":5.75, "y":3.25}, - {"x":6.75, "y":3.25}, - {"x":7.75, "y":3.25}, - {"x":8.75, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":12.75, "y":3.25, "w":2.25}, - - {"x":15.5, "y":3.25}, - - {"x":0, "y":4.25, "w":2.25}, - {"x":2.25, "y":4.25}, - {"x":3.25, "y":4.25}, - {"x":4.25, "y":4.25}, - {"x":5.25, "y":4.25}, - {"x":6.25, "y":4.25}, - {"x":7.25, "y":4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":4.25}, - {"x":10.25, "y":4.25}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25, "w":1.75}, - - {"x":14.25, "y":4.5}, - - {"x":15.5, "y":4.25}, - - {"x":0, "y":5.25, "w":1.25}, - {"x":1.25, "y":5.25, "w":1.25}, - {"x":2.5, "y":5.25, "w":1.25}, - {"x":3.75, "y":5.25, "w":6.25}, - {"x":10, "y":5.25}, - {"x":11, "y":5.25}, - {"x":12, "y":5.25}, - - {"x":13.25, "y":5.5}, - {"x":14.25, "y":5.5}, - {"x":15.25, "y":5.5} + {"matrix": [1, 3], "x": 0, "y": 0}, + + {"matrix": [2, 6], "x": 1.25, "y": 0}, + {"matrix": [3, 6], "x": 2.25, "y": 0}, + {"matrix": [3, 1], "x": 3.25, "y": 0}, + {"matrix": [3, 3], "x": 4.25, "y": 0}, + + {"matrix": [0, 7], "x": 5.5, "y": 0}, + {"matrix": [6, 3], "x": 6.5, "y": 0}, + {"matrix": [7, 1], "x": 7.5, "y": 0}, + {"matrix": [7, 6], "x": 8.5, "y": 0}, + + {"matrix": [10, 6], "x": 9.75, "y": 0}, + {"matrix": [10, 7], "x": 10.75, "y": 0}, + {"matrix": [10, 3], "x": 11.75, "y": 0}, + {"matrix": [10, 5], "x": 12.75, "y": 0}, + + {"matrix": [9, 7], "x": 14, "y": 0}, + + {"matrix": [0, 1], "x": 15.5, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1.25}, + {"matrix": [1, 7], "x": 1, "y": 1.25}, + {"matrix": [2, 7], "x": 2, "y": 1.25}, + {"matrix": [3, 7], "x": 3, "y": 1.25}, + {"matrix": [4, 7], "x": 4, "y": 1.25}, + {"matrix": [4, 6], "x": 5, "y": 1.25}, + {"matrix": [5, 6], "x": 6, "y": 1.25}, + {"matrix": [5, 7], "x": 7, "y": 1.25}, + {"matrix": [6, 7], "x": 8, "y": 1.25}, + {"matrix": [7, 7], "x": 9, "y": 1.25}, + {"matrix": [8, 7], "x": 10, "y": 1.25}, + {"matrix": [8, 6], "x": 11, "y": 1.25}, + {"matrix": [6, 6], "x": 12, "y": 1.25}, + {"matrix": [10, 1], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [6, 5], "x": 15.5, "y": 1.25}, + + {"matrix": [1, 1], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [1, 0], "x": 1.5, "y": 2.25}, + {"matrix": [2, 0], "x": 2.5, "y": 2.25}, + {"matrix": [3, 0], "x": 3.5, "y": 2.25}, + {"matrix": [4, 0], "x": 4.5, "y": 2.25}, + {"matrix": [4, 1], "x": 5.5, "y": 2.25}, + {"matrix": [5, 1], "x": 6.5, "y": 2.25}, + {"matrix": [5, 0], "x": 7.5, "y": 2.25}, + {"matrix": [6, 0], "x": 8.5, "y": 2.25}, + {"matrix": [7, 0], "x": 9.5, "y": 2.25}, + {"matrix": [8, 0], "x": 10.5, "y": 2.25}, + {"matrix": [8, 1], "x": 11.5, "y": 2.25}, + {"matrix": [6, 1], "x": 12.5, "y": 2.25}, + {"matrix": [10, 2], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [1, 5], "x": 15.5, "y": 2.25}, + + {"matrix": [2, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [1, 2], "x": 1.75, "y": 3.25}, + {"matrix": [2, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 2], "x": 3.75, "y": 3.25}, + {"matrix": [4, 2], "x": 4.75, "y": 3.25}, + {"matrix": [4, 3], "x": 5.75, "y": 3.25}, + {"matrix": [5, 3], "x": 6.75, "y": 3.25}, + {"matrix": [5, 2], "x": 7.75, "y": 3.25}, + {"matrix": [6, 2], "x": 8.75, "y": 3.25}, + {"matrix": [7, 2], "x": 9.75, "y": 3.25}, + {"matrix": [8, 2], "x": 10.75, "y": 3.25}, + {"matrix": [8, 3], "x": 11.75, "y": 3.25}, + {"matrix": [10, 4], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [2, 5], "x": 15.5, "y": 3.25}, + + {"matrix": [0, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [1, 4], "x": 2.25, "y": 4.25}, + {"matrix": [2, 4], "x": 3.25, "y": 4.25}, + {"matrix": [3, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"matrix": [5, 5], "x": 7.25, "y": 4.25}, + {"matrix": [5, 4], "x": 8.25, "y": 4.25}, + {"matrix": [6, 4], "x": 9.25, "y": 4.25}, + {"matrix": [7, 4], "x": 10.25, "y": 4.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4.25}, + {"matrix": [9, 1], "x": 12.25, "y": 4.25, "w": 1.75}, + + {"matrix": [3, 5], "x": 14.25, "y": 4.5}, + + {"matrix": [7, 5], "x": 15.5, "y": 4.25}, + + {"matrix": [0, 6], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [9, 3], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [9, 4], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [9, 5], "x": 10, "y": 5.25}, + {"matrix": [9, 2], "x": 11, "y": 5.25}, + {"matrix": [0, 4], "x": 12, "y": 5.25}, + + {"matrix": [0, 3], "x": 13.25, "y": 5.5}, + {"matrix": [7, 3], "x": 14.25, "y": 5.5}, + {"matrix": [0, 5], "x": 15.25, "y": 5.5} ] } } -- cgit v1.2.3