From 8bb4cba7b04571d75674f8f3f19462adef015060 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 5 Apr 2023 15:53:45 +1000 Subject: Move TKL layouts to data driven (#20337) --- keyboards/acheron/apollo/87h/delta/delta.c | 2 +- keyboards/acheron/apollo/87h/delta/delta.h | 38 - keyboards/acheron/apollo/87h/delta/info.json | 108 +- keyboards/acheron/apollo/87h/gamma/gamma.c | 2 +- keyboards/acheron/apollo/87h/gamma/gamma.h | 38 - keyboards/acheron/apollo/87h/gamma/info.json | 108 +- keyboards/acheron/apollo/87h/info.json | 98 -- keyboards/acheron/apollo/87htsc/87htsc.c | 2 +- keyboards/acheron/apollo/87htsc/87htsc.h | 39 - keyboards/acheron/apollo/87htsc/info.json | 180 +-- keyboards/ai03/andromeda/andromeda.h | 35 - keyboards/ai03/andromeda/info.json | 100 +- keyboards/aliceh66/pianoforte_hs/info.json | 203 +-- keyboards/aliceh66/pianoforte_hs/pianoforte_hs.h | 43 - keyboards/aos/tkl/info.json | 183 +-- keyboards/aos/tkl/tkl.h | 46 - keyboards/baion_808/baion_808.c | 2 +- keyboards/baion_808/baion_808.h | 164 --- keyboards/baion_808/info.json | 938 +++++++++++- .../bpiphany/frosty_flake/20130602/20130602.c | 2 +- .../bpiphany/frosty_flake/20140521/20140521.c | 2 +- keyboards/bpiphany/frosty_flake/frosty_flake.h | 136 -- keyboards/bpiphany/frosty_flake/info.json | 604 ++++---- keyboards/bpiphany/pegasushoof/2013/2013.h | 75 - keyboards/bpiphany/pegasushoof/2013/info.json | 571 +++---- keyboards/bpiphany/pegasushoof/2015/2015.h | 95 -- keyboards/bpiphany/pegasushoof/2015/info.json | 760 +++++----- keyboards/bpiphany/unloved_bastard/info.json | 314 +++- .../bpiphany/unloved_bastard/unloved_bastard.h | 77 - keyboards/capsunlocked/cu80/v1/info.json | 212 ++- keyboards/capsunlocked/cu80/v1/v1.h | 65 - keyboards/capsunlocked/cu80/v2_ansi/info.json | 187 +-- keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.c | 2 +- keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.h | 46 - keyboards/capsunlocked/cu80/v2_iso/info.json | 189 +-- keyboards/capsunlocked/cu80/v2_iso/v2_iso.c | 3 +- keyboards/capsunlocked/cu80/v2_iso/v2_iso.h | 46 - keyboards/cherrybstudio/cb87/cb87.h | 73 - keyboards/cherrybstudio/cb87/info.json | 577 ++++---- keyboards/coseyfannitutti/mysterium/info.json | 800 +++++----- keyboards/coseyfannitutti/mysterium/mysterium.h | 89 -- keyboards/duck/orion/v3/info.json | 103 +- keyboards/duck/orion/v3/v3.c | 2 +- keyboards/duck/orion/v3/v3.h | 36 - keyboards/durgod/k320/info.json | 582 ++++---- keyboards/durgod/k320/k320.h | 56 - keyboards/dztech/endless80/endless80.h | 87 -- keyboards/dztech/endless80/info.json | 576 ++++---- keyboards/eniigmakeyboards/ek87/ek87.h | 150 -- keyboards/eniigmakeyboards/ek87/info.json | 774 +++++++++- keyboards/epoch80/epoch80.h | 157 -- keyboards/epoch80/info.json | 1494 ++++++++++--------- keyboards/evyd13/eon87/eon87.h | 79 - keyboards/evyd13/eon87/info.json | 605 ++++---- keyboards/evyd13/nt750/info.json | 582 ++++---- keyboards/evyd13/nt750/nt750.h | 80 - keyboards/evyd13/quackfire/info.json | 399 ++--- keyboards/evyd13/quackfire/quackfire.h | 69 - keyboards/fjlabs/kf87/info.json | 182 +-- keyboards/fjlabs/kf87/kf87.h | 34 - keyboards/fjlabs/peaker/info.json | 151 +- keyboards/fjlabs/peaker/peaker.h | 32 - keyboards/ft/mars80/info.json | 208 ++- keyboards/ft/mars80/mars80.h | 63 - keyboards/ggkeyboards/genesis/hotswap/hotswap.h | 36 - keyboards/ggkeyboards/genesis/hotswap/info.json | 182 +-- keyboards/ggkeyboards/genesis/solder/info.json | 388 ++--- keyboards/ggkeyboards/genesis/solder/solder.h | 51 - keyboards/gon/nerdtkl/info.json | 193 +-- keyboards/gon/nerdtkl/nerdtkl.h | 24 - keyboards/gopolar/gg86/gg86.c | 2 +- keyboards/gopolar/gg86/gg86.h | 116 -- keyboards/gopolar/gg86/info.json | 576 ++++---- keyboards/handwired/meck_tkl/info.json | 182 +-- keyboards/handwired/meck_tkl/meck_tkl.h | 38 - keyboards/hardlineworks/otd_plus/info.json | 185 +-- keyboards/hardlineworks/otd_plus/otd_plus.h | 35 - keyboards/hineybush/h87a/h87a.c | 2 +- keyboards/hineybush/h87a/h87a.h | 90 -- keyboards/hineybush/h87a/info.json | 313 +++- keyboards/hineybush/h88/h88.c | 2 +- keyboards/hineybush/h88/h88.h | 90 -- keyboards/hineybush/h88/info.json | 319 +++- keyboards/hnahkb/freyr/freyr.h | 81 - keyboards/hnahkb/freyr/info.json | 610 ++++---- keyboards/hnahkb/stella/info.json | 610 ++++---- keyboards/hnahkb/stella/stella.h | 81 - .../horrortroll/handwired_k552/handwired_k552.c | 2 +- .../horrortroll/handwired_k552/handwired_k552.h | 54 - keyboards/horrortroll/handwired_k552/info.json | 182 +-- keyboards/idobao/id87/v1/info.json | 187 +-- keyboards/idobao/id87/v1/v1.h | 40 - keyboards/input_club/k_type/info.json | 177 +-- keyboards/input_club/k_type/k_type.c | 3 +- keyboards/input_club/k_type/k_type.h | 42 - keyboards/j80/info.json | 874 ++++++----- keyboards/j80/j80.h | 115 -- keyboards/kbdfans/kbd8x/info.json | 216 ++- keyboards/kbdfans/kbd8x/kbd8x.h | 39 - keyboards/kbdfans/kbd8x_mk2/info.json | 569 +++---- keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.h | 95 -- keyboards/kineticlabs/emu/hotswap/hotswap.h | 37 - keyboards/kineticlabs/emu/hotswap/info.json | 187 +-- keyboards/kineticlabs/emu/soldered/info.json | 561 +++---- keyboards/kineticlabs/emu/soldered/soldered.h | 69 - keyboards/kira80/info.json | 413 +++++- keyboards/kira80/kira80.h | 95 -- keyboards/kkatano/bakeneko80/bakeneko80.h | 44 - keyboards/kkatano/bakeneko80/info.json | 103 +- keyboards/kkatano/wallaby/info.json | 187 +-- keyboards/kkatano/wallaby/wallaby.c | 2 +- keyboards/kkatano/wallaby/wallaby.h | 44 - keyboards/kkatano/yurei/info.json | 187 +-- keyboards/kkatano/yurei/yurei.c | 2 +- keyboards/kkatano/yurei/yurei.h | 44 - keyboards/kmac/info.json | 368 ++--- keyboards/kmac/kmac.c | 2 +- keyboards/kmac/kmac.h | 56 - keyboards/kprepublic/bm80hsrgb/bm80hsrgb.c | 2 +- keyboards/kprepublic/bm80hsrgb/bm80hsrgb.h | 43 - keyboards/kprepublic/bm80hsrgb/info.json | 187 +-- keyboards/kprepublic/bm80v2/bm80v2.c | 2 +- keyboards/kprepublic/bm80v2/bm80v2.h | 34 - keyboards/kprepublic/bm80v2/info.json | 182 +-- keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c | 2 +- keyboards/kprepublic/bm80v2_iso/bm80v2_iso.h | 36 - keyboards/kprepublic/bm80v2_iso/info.json | 184 +-- keyboards/linworks/fave87/fave87.h | 129 -- keyboards/linworks/fave87/info.json | 985 +++++++------ keyboards/linworks/fave87h/fave87h.c | 2 +- keyboards/linworks/fave87h/fave87h.h | 69 - keyboards/linworks/fave87h/info.json | 386 ++--- keyboards/lucid/kbd8x_hs/info.json | 576 ++++---- keyboards/lucid/kbd8x_hs/kbd8x_hs.h | 67 - keyboards/lucid/scarlet/info.json | 182 +-- keyboards/lucid/scarlet/scarlet.h | 34 - keyboards/masterworks/classy_tkl/rev_a/info.json | 555 +++---- keyboards/masterworks/classy_tkl/rev_a/rev_a.c | 2 +- keyboards/masterworks/classy_tkl/rev_a/rev_a.h | 79 - keyboards/matrix/abelx/abelx.h | 35 - keyboards/matrix/abelx/info.json | 206 ++- keyboards/matrix/m12og/rev2/info.json | 304 +++- keyboards/matrix/m12og/rev2/rev2.c | 2 +- keyboards/matrix/m12og/rev2/rev2.h | 57 - keyboards/matrix/m20add/info.json | 205 ++- keyboards/matrix/m20add/m20add.h | 35 - keyboards/matrix/me/info.json | 303 +++- keyboards/matrix/me/me.h | 70 - keyboards/mechlovin/olly/orion/info.json | 317 +++- keyboards/mechlovin/olly/orion/orion.c | 2 +- keyboards/mechlovin/olly/orion/orion.h | 67 - keyboards/melgeek/mach80/info.json | 378 ++--- keyboards/melgeek/mach80/mach80.h | 53 - keyboards/melgeek/mach80/rev1/rev1.c | 2 +- keyboards/melgeek/mach80/rev2/rev2.c | 2 +- keyboards/mode/m80v1/m80h/info.json | 189 +-- keyboards/mode/m80v1/m80h/m80h.h | 32 - keyboards/mode/m80v2/m80v2h/info.json | 189 +-- keyboards/mode/m80v2/m80v2h/m80v2h.h | 39 - keyboards/monstargear/xo87/rgb/info.json | 107 +- keyboards/monstargear/xo87/rgb/rgb.h | 34 - keyboards/moon/info.json | 929 ++++++------ keyboards/moon/moon.h | 121 -- keyboards/nightly_boards/n87/info.json | 569 +++---- keyboards/nightly_boards/n87/n87.h | 93 -- keyboards/nix_studio/oxalys80/info.json | 1340 +++++++++-------- keyboards/nix_studio/oxalys80/oxalys80.c | 2 +- keyboards/nix_studio/oxalys80/oxalys80.h | 201 --- keyboards/percent/skog_lite/info.json | 555 +++---- keyboards/percent/skog_lite/skog_lite.h | 75 - keyboards/phage_studio/pila87/info.json | 182 +-- keyboards/phage_studio/pila87/pila87.c | 2 +- keyboards/phage_studio/pila87/pila87.h | 55 - keyboards/phantom/info.json | 1236 ++++++++-------- keyboards/phantom/phantom.h | 123 -- keyboards/playkbtw/helen80/helen80.h | 35 - keyboards/playkbtw/helen80/info.json | 187 +-- keyboards/poker87c/info.json | 390 ++--- keyboards/poker87c/poker87c.h | 53 - keyboards/poker87d/info.json | 392 ++--- keyboards/poker87d/poker87d.h | 53 - keyboards/projectkb/signature87/info.json | 417 +++++- keyboards/projectkb/signature87/signature87.h | 93 -- keyboards/skeletn87/hotswap/hotswap.h | 43 - keyboards/skeletn87/hotswap/info.json | 187 +-- keyboards/skeletn87/soldered/info.json | 752 +++++----- keyboards/skeletn87/soldered/soldered.h | 109 -- keyboards/specskeys/info.json | 182 +-- keyboards/specskeys/specskeys.h | 44 - keyboards/superuser/frl/frl.h | 32 - keyboards/superuser/frl/info.json | 84 +- keyboards/superuser/tkl/info.json | 968 ++++++------ keyboards/superuser/tkl/tkl.h | 116 -- keyboards/tgr/jane/v2/info.json | 541 ++++++- keyboards/tgr/jane/v2/v2.h | 113 -- keyboards/utd80/info.json | 100 +- keyboards/utd80/utd80.h | 37 - keyboards/wavtype/p01_ultra/info.json | 1552 ++++++++++---------- keyboards/wavtype/p01_ultra/p01_ultra.h | 176 --- keyboards/xbows/ranger/info.json | 184 +-- keyboards/xbows/ranger/ranger.c | 4 +- keyboards/xbows/ranger/ranger.h | 33 - keyboards/xelus/ninjin/info.json | 180 +-- keyboards/xelus/ninjin/ninjin.c | 2 +- keyboards/xelus/ninjin/ninjin.h | 37 - keyboards/xelus/pachi/rgb/rev1/info.json | 180 +-- keyboards/xelus/pachi/rgb/rev1/rev1.c | 2 +- keyboards/xelus/pachi/rgb/rev1/rev1.h | 36 - keyboards/xelus/pachi/rgb/rev2/info.json | 180 +-- keyboards/xelus/pachi/rgb/rev2/rev2.h | 24 - keyboards/xiaomi/mk02/info.json | 174 +-- keyboards/xiaomi/mk02/mk02.c | 2 +- keyboards/xiaomi/mk02/mk02.h | 20 - keyboards/xiudi/xd87/info.json | 578 ++++---- keyboards/xiudi/xd87/xd87.h | 69 - keyboards/xmmx/info.json | 946 ++++++------ keyboards/xmmx/xmmx.h | 89 -- 217 files changed, 23029 insertions(+), 21173 deletions(-) delete mode 100644 keyboards/acheron/apollo/87h/delta/delta.h delete mode 100644 keyboards/acheron/apollo/87h/gamma/gamma.h delete mode 100644 keyboards/acheron/apollo/87htsc/87htsc.h delete mode 100644 keyboards/ai03/andromeda/andromeda.h delete mode 100644 keyboards/aliceh66/pianoforte_hs/pianoforte_hs.h delete mode 100644 keyboards/aos/tkl/tkl.h delete mode 100644 keyboards/baion_808/baion_808.h delete mode 100644 keyboards/bpiphany/frosty_flake/frosty_flake.h delete mode 100644 keyboards/bpiphany/pegasushoof/2013/2013.h delete mode 100644 keyboards/bpiphany/pegasushoof/2015/2015.h delete mode 100644 keyboards/bpiphany/unloved_bastard/unloved_bastard.h delete mode 100644 keyboards/capsunlocked/cu80/v1/v1.h delete mode 100644 keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.h delete mode 100644 keyboards/capsunlocked/cu80/v2_iso/v2_iso.h delete mode 100644 keyboards/cherrybstudio/cb87/cb87.h delete mode 100644 keyboards/coseyfannitutti/mysterium/mysterium.h delete mode 100644 keyboards/duck/orion/v3/v3.h delete mode 100644 keyboards/dztech/endless80/endless80.h delete mode 100644 keyboards/eniigmakeyboards/ek87/ek87.h delete mode 100644 keyboards/epoch80/epoch80.h delete mode 100644 keyboards/evyd13/eon87/eon87.h delete mode 100644 keyboards/evyd13/nt750/nt750.h delete mode 100644 keyboards/evyd13/quackfire/quackfire.h delete mode 100644 keyboards/fjlabs/kf87/kf87.h delete mode 100644 keyboards/fjlabs/peaker/peaker.h delete mode 100644 keyboards/ft/mars80/mars80.h delete mode 100644 keyboards/ggkeyboards/genesis/hotswap/hotswap.h delete mode 100644 keyboards/ggkeyboards/genesis/solder/solder.h delete mode 100644 keyboards/gon/nerdtkl/nerdtkl.h delete mode 100644 keyboards/gopolar/gg86/gg86.h delete mode 100644 keyboards/handwired/meck_tkl/meck_tkl.h delete mode 100644 keyboards/hardlineworks/otd_plus/otd_plus.h delete mode 100644 keyboards/hineybush/h87a/h87a.h delete mode 100644 keyboards/hineybush/h88/h88.h delete mode 100644 keyboards/hnahkb/freyr/freyr.h delete mode 100644 keyboards/hnahkb/stella/stella.h delete mode 100644 keyboards/horrortroll/handwired_k552/handwired_k552.h delete mode 100644 keyboards/idobao/id87/v1/v1.h delete mode 100644 keyboards/input_club/k_type/k_type.h delete mode 100644 keyboards/j80/j80.h delete mode 100644 keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.h delete mode 100644 keyboards/kineticlabs/emu/hotswap/hotswap.h delete mode 100644 keyboards/kineticlabs/emu/soldered/soldered.h delete mode 100644 keyboards/kira80/kira80.h delete mode 100644 keyboards/kkatano/bakeneko80/bakeneko80.h delete mode 100644 keyboards/kkatano/wallaby/wallaby.h delete mode 100644 keyboards/kkatano/yurei/yurei.h delete mode 100644 keyboards/kmac/kmac.h delete mode 100644 keyboards/kprepublic/bm80hsrgb/bm80hsrgb.h delete mode 100644 keyboards/kprepublic/bm80v2/bm80v2.h delete mode 100644 keyboards/kprepublic/bm80v2_iso/bm80v2_iso.h delete mode 100644 keyboards/linworks/fave87/fave87.h delete mode 100644 keyboards/linworks/fave87h/fave87h.h delete mode 100644 keyboards/lucid/kbd8x_hs/kbd8x_hs.h delete mode 100644 keyboards/lucid/scarlet/scarlet.h delete mode 100644 keyboards/masterworks/classy_tkl/rev_a/rev_a.h delete mode 100644 keyboards/matrix/m12og/rev2/rev2.h delete mode 100644 keyboards/matrix/me/me.h delete mode 100644 keyboards/mechlovin/olly/orion/orion.h delete mode 100755 keyboards/melgeek/mach80/mach80.h delete mode 100644 keyboards/mode/m80v1/m80h/m80h.h delete mode 100644 keyboards/mode/m80v2/m80v2h/m80v2h.h delete mode 100644 keyboards/monstargear/xo87/rgb/rgb.h delete mode 100644 keyboards/moon/moon.h delete mode 100644 keyboards/nightly_boards/n87/n87.h delete mode 100644 keyboards/nix_studio/oxalys80/oxalys80.h delete mode 100644 keyboards/percent/skog_lite/skog_lite.h delete mode 100644 keyboards/phage_studio/pila87/pila87.h delete mode 100644 keyboards/phantom/phantom.h delete mode 100644 keyboards/playkbtw/helen80/helen80.h delete mode 100644 keyboards/poker87c/poker87c.h delete mode 100644 keyboards/poker87d/poker87d.h delete mode 100644 keyboards/projectkb/signature87/signature87.h delete mode 100644 keyboards/skeletn87/hotswap/hotswap.h delete mode 100644 keyboards/skeletn87/soldered/soldered.h delete mode 100644 keyboards/specskeys/specskeys.h delete mode 100644 keyboards/superuser/frl/frl.h delete mode 100644 keyboards/superuser/tkl/tkl.h delete mode 100644 keyboards/tgr/jane/v2/v2.h delete mode 100644 keyboards/utd80/utd80.h delete mode 100644 keyboards/wavtype/p01_ultra/p01_ultra.h delete mode 100644 keyboards/xbows/ranger/ranger.h delete mode 100644 keyboards/xelus/ninjin/ninjin.h delete mode 100644 keyboards/xelus/pachi/rgb/rev1/rev1.h delete mode 100644 keyboards/xiaomi/mk02/mk02.h delete mode 100644 keyboards/xiudi/xd87/xd87.h delete mode 100644 keyboards/xmmx/xmmx.h (limited to 'keyboards') diff --git a/keyboards/acheron/apollo/87h/delta/delta.c b/keyboards/acheron/apollo/87h/delta/delta.c index d55880d482..1e79584a9c 100644 --- a/keyboards/acheron/apollo/87h/delta/delta.c +++ b/keyboards/acheron/apollo/87h/delta/delta.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "delta.h" +#include "quantum.h" void board_init(void) { setPinInput(B9); diff --git a/keyboards/acheron/apollo/87h/delta/delta.h b/keyboards/acheron/apollo/87h/delta/delta.h deleted file mode 100644 index c3f5f6c22e..0000000000 --- a/keyboards/acheron/apollo/87h/delta/delta.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2022 Álvaro "Gondolindrim" Volpato - -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 - -#define LAYOUT_tkl_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ - K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4F, \ - K50, K51, K52, K56, K59, K5A, K5B, K5C, K5E, K5F, K5G \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F, K0G }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, ___, ___, ___ }, \ - { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \ - { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, K5C, ___, K5E, K5F, K5G } \ -} diff --git a/keyboards/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/info.json index 0ad176f451..5e1f6f4c12 100644 --- a/keyboards/acheron/apollo/87h/delta/info.json +++ b/keyboards/acheron/apollo/87h/delta/info.json @@ -10,5 +10,111 @@ }, "diode_direction": "COL2ROW", "processor": "STM32F401", - "bootloader": "stm32-dfu" + "bootloader": "stm32-dfu", + "layouts": { + "LAYOUT_tkl_ansi": { + "layout": [ + {"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": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + } + } } diff --git a/keyboards/acheron/apollo/87h/gamma/gamma.c b/keyboards/acheron/apollo/87h/gamma/gamma.c index 89eed483c1..fb381f52ce 100644 --- a/keyboards/acheron/apollo/87h/gamma/gamma.c +++ b/keyboards/acheron/apollo/87h/gamma/gamma.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "gamma.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/acheron/apollo/87h/gamma/gamma.h b/keyboards/acheron/apollo/87h/gamma/gamma.h deleted file mode 100644 index 97342016f2..0000000000 --- a/keyboards/acheron/apollo/87h/gamma/gamma.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2022 Álvaro "Gondolindrim" Volpato - -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 - -#define LAYOUT_tkl_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K4F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K4E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ - K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, \ - K50, K51, K52, K56, K59, K5A, K5B, K5C, K5D, K5E, K5F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, ___, ___ }, \ - { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \ - { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, K5C, K5D, K5E, K5F } \ -} diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/info.json index 424f64405d..3074aeb68e 100644 --- a/keyboards/acheron/apollo/87h/gamma/info.json +++ b/keyboards/acheron/apollo/87h/gamma/info.json @@ -10,5 +10,111 @@ }, "diode_direction": "COL2ROW", "processor": "STM32F411", - "bootloader": "stm32-dfu" + "bootloader": "stm32-dfu", + "layouts": { + "LAYOUT_tkl_ansi": { + "layout": [ + {"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": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + + {"matrix": [0, 13], "x": 15.25, "y": 0}, + {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [0, 15], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [4, 15], "x": 17.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [4, 14], "x": 17.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 13], "x": 16.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 13], "x": 15.25, "y": 5.25}, + {"matrix": [5, 14], "x": 16.25, "y": 5.25}, + {"matrix": [5, 15], "x": 17.25, "y": 5.25} + ] + } + } } diff --git a/keyboards/acheron/apollo/87h/info.json b/keyboards/acheron/apollo/87h/info.json index 7dbd896a18..ac47f594b5 100644 --- a/keyboards/acheron/apollo/87h/info.json +++ b/keyboards/acheron/apollo/87h/info.json @@ -4,103 +4,5 @@ "maintainer": "Gondolindrim", "usb": { "vid": "0x4150" - }, - "layouts": { - "LAYOUT_tkl_ansi": { - "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":"1!", "x":1, "y":1.25}, - {"label":"2@", "x":2, "y":1.25}, - {"label":"3#", "x":3, "y":1.25}, - {"label":"4$", "x":4, "y":1.25}, - {"label":"5%", "x":5, "y":1.25}, - {"label":"6^", "x":6, "y":1.25}, - {"label":"7&", "x":7, "y":1.25}, - {"label":"8*", "x":8, "y":1.25}, - {"label":"9(", "x":9, "y":1.25}, - {"label":"0)", "x":10, "y":1.25}, - {"label":"-_", "x":11, "y":1.25}, - {"label":"=+", "x":12, "y":1.25}, - {"label":"Backspace", "x":13, "y":1.25, "w":2}, - {"label":"Insert", "x":15.25, "y":1.25}, - {"label":"Home", "x":16.25, "y":1.25}, - {"label":"Page Up", "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":"Page Down", "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":"Enter", "x":12.75, "y":3.25, "w":2.25}, - - {"label":"Shift", "x":0, "y":4.25, "w":2.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":"Shift", "x":12.25, "y":4.25, "w":2.75}, - {"label":"\u2191", "x":16.25, "y":4.25}, - - {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, - {"label":"GUI", "x":1.25, "y":5.25, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, - {"label":"Space", "x":3.75, "y":5.25, "w":6.25}, - {"label":"Alt", "x":10, "y":5.25, "w":1.25}, - {"label":"Fn", "x":11.25, "y":5.25, "w":1.25}, - {"label":"GUI", "x":12.5, "y":5.25, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, - {"label":"\u2190", "x":15.25, "y":5.25}, - {"label":"\u2193", "x":16.25, "y":5.25}, - {"label":"\u2192", "x":17.25, "y":5.25} - ] - } } } diff --git a/keyboards/acheron/apollo/87htsc/87htsc.c b/keyboards/acheron/apollo/87htsc/87htsc.c index a476b7086e..de66897f72 100644 --- a/keyboards/acheron/apollo/87htsc/87htsc.c +++ b/keyboards/acheron/apollo/87htsc/87htsc.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "87htsc.h" +#include "quantum.h" void board_init(void) { setPinInput(B9); diff --git a/keyboards/acheron/apollo/87htsc/87htsc.h b/keyboards/acheron/apollo/87htsc/87htsc.h deleted file mode 100644 index edfb2f4dab..0000000000 --- a/keyboards/acheron/apollo/87htsc/87htsc.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2022 Álvaro "Gondolindrim" Volpato - -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 - -// 87t for 87-key plus tsangan -#define LAYOUT_tkl_ansi_tsangan( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ - K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4F, \ - K50, K51, K52, K56, K5A, K5B, K5C, K5E, K5F, K5G \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F, K0G }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, ___, ___, ___ }, \ - { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \ - { K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, ___, K5E, K5F, K5G } \ -} diff --git a/keyboards/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/info.json index 36897ff86e..7d1b238aa3 100644 --- a/keyboards/acheron/apollo/87htsc/info.json +++ b/keyboards/acheron/apollo/87htsc/info.json @@ -18,97 +18,105 @@ "layouts": { "LAYOUT_tkl_ansi_tsangan": { "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}, + {"matrix": [0, 0], "x": 0, "y": 0}, - {"label":"`~", "x":0, "y":1.25}, - {"label":"1!", "x":1, "y":1.25}, - {"label":"2@", "x":2, "y":1.25}, - {"label":"3#", "x":3, "y":1.25}, - {"label":"4$", "x":4, "y":1.25}, - {"label":"5%", "x":5, "y":1.25}, - {"label":"6^", "x":6, "y":1.25}, - {"label":"7&", "x":7, "y":1.25}, - {"label":"8*", "x":8, "y":1.25}, - {"label":"9(", "x":9, "y":1.25}, - {"label":"0)", "x":10, "y":1.25}, - {"label":"-_", "x":11, "y":1.25}, - {"label":"=+", "x":12, "y":1.25}, - {"label":"Backspace", "x":13, "y":1.25, "w":2}, - {"label":"Insert", "x":15.25, "y":1.25}, - {"label":"Home", "x":16.25, "y":1.25}, - {"label":"Page Up", "x":17.25, "y":1.25}, + {"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}, - {"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":"Page Down", "x":17.25, "y":2.25}, + {"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}, - {"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":"Enter", "x":12.75, "y":3.25, "w":2.25}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, - {"label":"Shift", "x":0, "y":4.25, "w":2.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":"Shift", "x":12.25, "y":4.25, "w":2.75}, - {"label":"\u2191", "x":16.25, "y":4.25}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, - {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, - {"label":"GUI", "x":1.5, "y":5.25}, - {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, - {"label":"Space", "x":4, "y":5.25, "w":7}, - {"label":"Alt", "x":11, "y":5.25, "w":1.5}, - {"label":"GUI", "x":12.5, "y":5.25}, - {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, - {"label":"\u2190", "x":15.25, "y":5.25}, - {"label":"\u2193", "x":16.25, "y":5.25}, - {"label":"\u2192", "x":17.25, "y":5.25} + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} ] } } diff --git a/keyboards/ai03/andromeda/andromeda.h b/keyboards/ai03/andromeda/andromeda.h deleted file mode 100644 index 1fcae4d772..0000000000 --- a/keyboards/ai03/andromeda/andromeda.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2021 Andrew Kannan - -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_tkl_ansi_wkl( \ - K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ - K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K415, \ - K500, K502, K507, K511, K513, K514, K515, K516 \ -) { \ - { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 , K214, K215, K216 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO, KC_NO, KC_NO }, \ - { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, KC_NO, K415, KC_NO }, \ - { K500, KC_NO, K502, KC_NO, KC_NO, KC_NO, KC_NO, K507, KC_NO, KC_NO, KC_NO, K511, KC_NO, K513, K514, K515, K516 } \ -} diff --git a/keyboards/ai03/andromeda/info.json b/keyboards/ai03/andromeda/info.json index e29bb3e121..fb3cf0d78d 100644 --- a/keyboards/ai03/andromeda/info.json +++ b/keyboards/ai03/andromeda/info.json @@ -22,7 +22,105 @@ "bootloader": "stm32-dfu", "layouts": { "LAYOUT_tkl_ansi_wkl": { - "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, "w":2}, {"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":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.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":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"label":"Alt", "x":11, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}] + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] } } } diff --git a/keyboards/aliceh66/pianoforte_hs/info.json b/keyboards/aliceh66/pianoforte_hs/info.json index 42bc824a9f..bfc9f7a839 100644 --- a/keyboards/aliceh66/pianoforte_hs/info.json +++ b/keyboards/aliceh66/pianoforte_hs/info.json @@ -16,102 +16,111 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT_tkl_ansi": { - "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}, -